aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--Makefile.in5
-rw-r--r--w3mimg/Makefile.in2
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5049fa3..6a9625d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-09 YONETANI Tomokazu <qhwt@myrealbox.com>
+
+ * [w3m-dev 04022] $^
+ * Makefile.in (DEFUNS): added
+ funcname.tab: don't use $^
+ * w3mimg/Makefile.in (w3mimg.a): don't use $^
+
2003-12-09 Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
* [w3m-dev 04021] Deeply nested table
@@ -8266,4 +8273,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.892 2003/12/08 16:08:01 ukai Exp $
+$Id: ChangeLog,v 1.893 2003/12/08 16:15:17 ukai Exp $
diff --git a/Makefile.in b/Makefile.in
index 81f7da0..5d659a2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -115,6 +115,7 @@ HELP_TARGET=w3mhelp.html
HELP_ALLFILES=w3mhelp-w3m_en.html w3mhelp-w3m_ja.html \
w3mhelp-lynx_en.html w3mhelp-lynx_ja.html
+DEFUNS=main.c menu.c
SCRIPTSUBDIRS= scripts
SUBDIRS = $(SCRIPTSUBDIRS) w3mimg libwc po
.PHONY: $(SUBDIRS)
@@ -139,9 +140,9 @@ keybind.o: funcname2.h
keybind_lynx.o: funcname2.h
parsetagx.o: html.c
-funcname.tab: main.c menu.c
+funcname.tab: $(DEFUNS)
(echo '#define DEFUN(x,y,z) x y';\
- sed -ne '/^DEFUN/{p;n;/^[ ]/p;}' $^) | $(CPP) - | \
+ sed -ne '/^DEFUN/{p;n;/^[ ]/p;}' $(DEFUNS)) | $(CPP) - | \
awk '$$1 ~ /^[_A-Za-z]/ { \
for (i=2;i<=NF;i++) { print $$i, $$1} \
}' > $@
diff --git a/w3mimg/Makefile.in b/w3mimg/Makefile.in
index ab6b269..d11ab96 100644
--- a/w3mimg/Makefile.in
+++ b/w3mimg/Makefile.in
@@ -17,7 +17,7 @@ IMGOBJS=@IMGOBJS@
all: @IMGTARGETS@ w3mimg.a
w3mimg.a: $(IMGOBJS)
- $(AR) rv $@ $^
+ $(AR) rv $@ $(IMGOBJS)
$(RANLIB) $@
w3mimg.o: w3mimg.c