Merge branch 'bug/parallel-make'

2013-10-15 21:11:41 +09:00
parent a71bf49c66 2a8828bc6a
commit c762459c93
2 changed files with 3 additions and 5 deletions
--- a/Makefile.in
+++ b/Makefile.in
@@ -250,7 +250,7 @@ install-po:
 	 (cd $$subdir && $(MAKE) install); \
 	done

-all-scripts:
+all-scripts: funcname.tab
 	for dir in $(SCRIPTSUBDIRS);	\
 	do	\
 		(cd $$dir && $(MAKE) $(MAKE_ARGS)); \
--- a/w3mimg/Makefile.in
+++ b/w3mimg/Makefile.in
@@ -16,14 +16,12 @@ IMGCFLAGS=@IMGX11CFLAGS@ @IMGFBCFLAGS@ @IMGWINCFLAGS@
 IMGOBJS=@IMGOBJS@

 .PHONY: $(SUBDIRS)
-all: @IMGTARGETS@ w3mimg.a
+all: w3mimg.a

-w3mimg.a: $(IMGOBJS)
+w3mimg.a: w3mimg.o @IMGTARGETS@
 	$(AR) rv $@ $(IMGOBJS)
 	$(RANLIB) $@

-$(IMGOBJS): @IMGTARGETS@
-
 w3mimg.o: w3mimg.c
 	$(CC) $(CFLAGS) -c $<