aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@debian.org>2013-10-15 12:11:41 +0000
committerTatsuya Kinoshita <tats@debian.org>2013-10-15 12:11:41 +0000
commitc762459c9344570319d2aa1aa557d4a2a9e77e33 (patch)
tree18295e5a1efbf56d4ec2f5b0217d288b052afd6b
parentMerge branch 'bug/605761' (diff)
parentDepend on funcname.tab to fix parallel make issue of scripts (diff)
downloadw3m-c762459c9344570319d2aa1aa557d4a2a9e77e33.tar.gz
w3m-c762459c9344570319d2aa1aa557d4a2a9e77e33.zip
Merge branch 'bug/parallel-make'
-rw-r--r--Makefile.in2
-rw-r--r--w3mimg/Makefile.in6
2 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index 4b9fcbb..8fa799e 100644
--- 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)); \
diff --git a/w3mimg/Makefile.in b/w3mimg/Makefile.in
index 0a964a1..8e2ad73 100644
--- 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 $<