This patch will help to build w3m with paralle make enabled diff -urN w3m-0.5.3.patched/Makefile.in w3m-0.5.3/Makefile.in --- w3m-0.5.3.patched/Makefile.in 2012-12-21 19:27:52.768916831 +0530 +++ w3m-0.5.3/Makefile.in 2012-12-24 18:13:07.660895921 +0530 @@ -34,6 +34,7 @@ RC_DIR = @RC_DIR@ ETC_DIR = $(sysconfdir) CONF_DIR = $(sysconfdir)/$(PACKAGE) +DOCDIRS = @DOCDIRS@ CFLAGS = $(OPTS) -I. -I$(top_srcdir) @CFLAGS@ $(CPPFLAGS) $(DEFS) WCCFLAGS = @WCCFLAGS@ @@ -50,6 +51,7 @@ W3M_LIBS = @W3M_LIBS@ WCTARGET = @WCTARGET@ NLSTARGET = @NLSTARGET@ +HELP_TARGETS = w3mhelp-funcname.pl w3mhelp-funcdesc-stamp MAKE_ARGS = PERL='$(PERL)' MKDIR='$(MKDIR)' \ BIN_DIR='$(bindir)' AUXBIN_DIR='$(AUXBIN_DIR)' \ @@ -124,7 +126,7 @@ SUBDIRS = $(SCRIPTSUBDIRS) w3mimg libwc po .PHONY: $(SUBDIRS) -all: $(TARGETS) all-scripts $(NLSTARGET) +all: funcname.tab $(TARGETS) all-scripts $(NLSTARGET) $(HELP_TARGETS) $(TARGET): $(ALLOBJS) $(ALIB) $(WCTARGET) $(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LDFLAGS) $(LIBS) $(EXT_LIBS) $(W3M_LIBS) @@ -176,6 +178,31 @@ ./mktable$(EXT) 100 functable.tab > $@ -rm -f functable.tab +w3mhelp-funcname.pl: scripts/w3mhelp-funcname.pl.in funcname.tab $(top_srcdir)/doc/keymap.default $(top_srcdir)/doc/keymap.lynx + @echo "generating w3mhelp-funcname.pl..." + @echo '%funcname = (' > scripts/w3mhelp-funcname.pl + @sed -ne "/^[a-zA-Z@]/s/\([a-zA-Z@][a-zA-Z0-9@_]*\)[ ][ ]*\([^ ]*\)/'\1', '\2',/p" < $(top_srcdir)/funcname.tab >> scripts/w3mhelp-funcname.pl + @echo ');' >> scripts/w3mhelp-funcname.pl + @echo '%keyfunc = (' >> scripts/w3mhelp-funcname.pl + @case "$(KEYBIND_SRC)" in *lynx*) keymap=keymap.lynx;; *) keymap=keymap.default;; esac; \ + sed -ne "/^keymap/s/^keymap[ ][ ]*\([^ ]*\)[ ][ ]*\([a-zA-Z@][a-zA-Z0-9@_]*\)/'\1', '\2', /p" < $(top_srcdir)/doc/$$keymap >> scripts/w3mhelp-funcname.pl + @echo ');' >> scripts/w3mhelp-funcname.pl + @cat scripts/w3mhelp-funcname.pl.in >> scripts/w3mhelp-funcname.pl + @echo "done" + +w3mhelp-funcdesc-stamp: $(top_srcdir)/doc/README.func $(top_srcdir)/doc-jp/README.func scripts/w3mhelp-funcdesc.en.pl.in scripts/w3mhelp-funcdesc.ja.pl.in + @echo "generating w3mhelp-funcdesc*.pl..." + @for dirlang in $(DOCDIRS); do \ + dir=`expr "$$dirlang" : "\(.*\):.*"`; \ + lang=`expr "$$dirlang" : ".*:\(.*\)_.*"`; \ + echo '%funcdesc = (' > scripts/w3mhelp-funcdesc.$$lang.pl; \ + sed -ne "/^[a-zA-Z@]/s/\([a-zA-Z@][a-zA-Z0-9@_]*\)[ ][ ]*\(.*\)/'\1', '\2',/p" < $(top_srcdir)/$$dir/README.func >> scripts/w3mhelp-funcdesc.$$lang.pl; \ + echo ');' >> scripts/w3mhelp-funcdesc.$$lang.pl; \ + cat scripts/w3mhelp-funcdesc.$$lang.pl.in >> scripts/w3mhelp-funcdesc.$$lang.pl; \ + done + @echo done + @touch scripts/w3mhelp-funcdesc-stamp + mktable$(EXT): mktable.o dummy.o Str.o hash.o myctype.o $(CC) $(CFLAGS) -o mktable mktable.o dummy.o Str.o hash.o myctype.o $(LDFLAGS) $(LIBS) $(GC_LIBS) @@ -213,7 +240,7 @@ install: install-core install-scripts install-po -install-core: $(TARGETS) +install-core: $(TARGETS) $(HELP_TARGETS) -$(MKDIR) $(DESTDIR)$(bindir) -$(MKDIR) $(DESTDIR)$(AUXBIN_DIR) -$(MKDIR) $(DESTDIR)$(CGIBIN_DIR) @@ -236,6 +263,10 @@ do \ $(INSTALL_PROGRAM) $$file $(DESTDIR)$(CGIBIN_DIR)/$$file; \ done + for file in scripts/w3mhelp-*.pl; \ + do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(HELP_DIR); \ + done install-helpfile: -$(MKDIR) $(DESTDIR)$(HELP_DIR) @@ -277,6 +308,10 @@ do \ $(RM) -f $(HELP_DIR)/$$file; \ done + -for file in scripts/w3mhelp-*.pl; \ + do \ + rm -f $(HELP_DIR)/$$file; \ + done -$(RM) -f $(HELP_DIR)/$(HELP_TARGET) -$(RM) -f $(mandir)/man1/$(MAN1_TARGET) -$(RM) -f $(mandir)/ja/man1/$(MAN1_TARGET) @@ -289,6 +324,7 @@ -$(RM) -f *.o *.a $(TARGETS) mktable$(EXT) -$(RM) -f funcname.tab -$(RM) -f funcname.c funcname1.h funcname2.h tagtable.c functable.c + -rm -f $(HELP_TARGETS) w3mhelp-*.pl -for dir in w3mimg libwc; \ do \ (cd $$dir && $(MAKE) clean RM="$(RM)"); \ diff -urN w3m-0.5.3.patched/scripts/Makefile.in w3m-0.5.3/scripts/Makefile.in --- w3m-0.5.3.patched/scripts/Makefile.in 2011-01-04 14:52:28.000000000 +0530 +++ w3m-0.5.3/scripts/Makefile.in 2012-12-24 18:18:36.546170726 +0530 @@ -31,11 +31,9 @@ RC_DIR = @RC_DIR@ ETC_DIR = $(sysconfdir) CONF_DIR = $(sysconfdir)/$(PACKAGE) -DOCDIRS = @DOCDIRS@ AUXBIN_TARGETS = xface2xpm LIB_TARGETS = dirlist.cgi w3mhelp.cgi w3mmail.cgi -HELP_TARGETS = w3mhelp-funcname.pl w3mhelp-funcdesc-stamp SUBDIRS = multipart w3mman .PHONY: $(SUBDIRS) @@ -46,32 +44,7 @@ PERL = @PERL@ -all: $(LIB_TARGETS) $(AUXBIN_TARGETS) $(HELP_TARGETS) $(SUBDIRS) - -w3mhelp-funcname.pl: w3mhelp-funcname.pl.in ../funcname.tab $(top_srcdir)/doc/keymap.default $(top_srcdir)/doc/keymap.lynx - @echo "generating w3mhelp-funcname.pl..." - @echo '%funcname = (' > w3mhelp-funcname.pl - @sed -ne "/^[a-zA-Z@]/s/\([a-zA-Z@][a-zA-Z0-9@_]*\)[ ][ ]*\([^ ]*\)/'\1', '\2',/p" < ../funcname.tab >> w3mhelp-funcname.pl - @echo ');' >> w3mhelp-funcname.pl - @echo '%keyfunc = (' >> w3mhelp-funcname.pl - @case "$(KEYBIND_SRC)" in *lynx*) keymap=keymap.lynx;; *) keymap=keymap.default;; esac; \ - sed -ne "/^keymap/s/^keymap[ ][ ]*\([^ ]*\)[ ][ ]*\([a-zA-Z@][a-zA-Z0-9@_]*\)/'\1', '\2', /p" < $(top_srcdir)/doc/$$keymap >> w3mhelp-funcname.pl - @echo ');' >> w3mhelp-funcname.pl - @cat $(srcdir)/w3mhelp-funcname.pl.in >> w3mhelp-funcname.pl - @echo "done" - -w3mhelp-funcdesc-stamp: $(top_srcdir)/doc/README.func $(top_srcdir)/doc-jp/README.func w3mhelp-funcdesc.en.pl.in w3mhelp-funcdesc.ja.pl.in - @echo "generating w3mhelp-funcdesc*.pl..." - @for dirlang in $(DOCDIRS); do \ - dir=`expr "$$dirlang" : "\(.*\):.*"`; \ - lang=`expr "$$dirlang" : ".*:\(.*\)_.*"`; \ - echo '%funcdesc = (' > w3mhelp-funcdesc.$$lang.pl; \ - sed -ne "/^[a-zA-Z@]/s/\([a-zA-Z@][a-zA-Z0-9@_]*\)[ ][ ]*\(.*\)/'\1', '\2',/p" < $(top_srcdir)/$$dir/README.func >> w3mhelp-funcdesc.$$lang.pl; \ - echo ');' >> w3mhelp-funcdesc.$$lang.pl; \ - cat $(srcdir)/w3mhelp-funcdesc.$$lang.pl.in >> w3mhelp-funcdesc.$$lang.pl; \ - done - @echo done - @touch w3mhelp-funcdesc-stamp +all: $(LIB_TARGETS) $(AUXBIN_TARGETS) $(SUBDIRS) $(SUBDIRS): for subdir in $(SUBDIRS); \ @@ -82,7 +55,6 @@ install: $(LIB_TARGETS) $(HELP_TARGETS) -$(MKDIR) $(DESTDIR)$(AUXBIN_DIR) -$(MKDIR) $(DESTDIR)$(CGIBIN_DIR) - -$(MKDIR) $(DESTDIR)$(HELP_DIR) for file in $(AUXBIN_TARGETS); \ do \ $(INSTALL_SCRIPT) $$file $(DESTDIR)$(AUXBIN_DIR); \ @@ -91,10 +63,6 @@ do \ $(INSTALL_SCRIPT) $$file $(DESTDIR)$(CGIBIN_DIR); \ done - for file in w3mhelp-*.pl; \ - do \ - $(INSTALL_DATA) $$file $(DESTDIR)$(HELP_DIR); \ - done for subdir in $(SUBDIRS); \ do \ (cd $$subdir && $(MAKE) install); \ @@ -109,17 +77,12 @@ do \ rm -f $(LIB_DIR)/$$file; \ done - -for file in w3mhelp-*.pl; \ - do \ - rm -f $(HELP_DIR)/$$file; \ - done -for subdir in $(SUBDIRS); \ do \ (cd $$subdir && $(MAKE) uninstall); \ done clean: - -rm -f $(HELP_TARGETS) w3mhelp-*.pl -for subdir in $(SUBDIRS); \ do \ (cd $$subdir && $(MAKE) clean); \ diff -urN w3m-0.5.3.patched/w3mimg/Makefile.in w3m-0.5.3/w3mimg/Makefile.in --- w3m-0.5.3.patched/w3mimg/Makefile.in 2011-01-04 14:52:28.000000000 +0530 +++ w3m-0.5.3/w3mimg/Makefile.in 2012-12-24 18:14:49.836980207 +0530 @@ -18,6 +18,8 @@ .PHONY: $(SUBDIRS) all: @IMGTARGETS@ w3mimg.a +$(IMGOBJS): @IMGTARGETS@ + w3mimg.a: $(IMGOBJS) $(AR) rv $@ $(IMGOBJS) $(RANLIB) $@