w3m

commit f327b9a3f9ea6b9fd33732abd80f443b0c153109
parent 9e91874dd10433429174bc15bc741ea146af2221
Author: ukai <ukai>
Date:   Mon, 22 Sep 2003 23:12:56 +0000

fix top_srcdir

Diffstat:
M
Makefile.in
 | 
12
++++++------
M
libwc/Makefile.in
 | 
2
+-
M
w3mimg/Makefile.in
 | 
2
+-
M
w3mimg/fb/Makefile.in
 | 
6
+++---
M
w3mimg/x11/Makefile.in
 | 
2
+-

5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Makefile.in b/Makefile.in
@@ -108,10 +108,10 @@ HELP_TARGET=w3mhelp.html
 HELP_ALLFILES=w3mhelp-w3m_en.html w3mhelp-w3m_ja.html \
 	w3mhelp-lynx_en.html w3mhelp-lynx_ja.html
 
-SCRIPTSUBDIRS= scripts scripts/multipart scripts/w3mman
-SUBDIRS = $(SCRIPTSUBDIRS)
+SCRIPTSUBDIRS= scripts
+SUBDIRS = $(SCRIPTSUBDIRS) w3mimg libwc
 
-.PHONY: w3mimg libwc
+.PHONY: $(SUBDIRS)
 
 all: $(TARGETS) all-scripts
 
@@ -212,14 +212,14 @@ install-helpfile:
 all-scripts:
 	for dir in $(SCRIPTSUBDIRS);	\
 	do	\
-		(cd $(top_srcdir)/$$dir && $(MAKE) $(MAKE_ARGS)); \
+		(cd $$dir && $(MAKE) $(MAKE_ARGS)); \
 	done
 
 install-scripts: all-scripts
 	topdir=`pwd`; \
 	for dir in $(SCRIPTSUBDIRS);	\
 	do	\
-		(cd $(top_srcdir)/$$dir && $(MAKE) $(MAKE_ARGS) install); \
+		(cd $$dir && $(MAKE) $(MAKE_ARGS) install); \
 	done
 
 uninstall:
@@ -241,7 +241,7 @@ uninstall:
 	-$(RM) -f $(mandir)/ja/man1/$(MAN1_TARGET)
 	-for dir in $(SCRIPTSUBDIRS);	\
 	do	\
-		(cd $(top_srcdir)/$$dir && $(MAKE) $(MAKE_ARGS) uninstall); \
+		(cd $$dir && $(MAKE) $(MAKE_ARGS) uninstall); \
 	done
 
 clean: sweep
diff --git a/libwc/Makefile.in b/libwc/Makefile.in
@@ -6,7 +6,7 @@ top_srcdir=@top_srcdir@
 VPATH=$(srcdir):.
 LIBRARY = libwc.a
 CC=@CC@
-CFLAGS = $(TOP_CFLAGS) @WCCFLAGS@
+CFLAGS = $(TOP_CFLAGS) @WCCFLAGS@ 
 AR=ar
 RANLIB=@RANLIB@
 RM=rm
diff --git a/w3mimg/Makefile.in b/w3mimg/Makefile.in
@@ -14,7 +14,7 @@ IMGCFLAGS=@IMGX11CFLAGS@ @IMGFBCFLAGS@
 all: w3mimg.o fb x11
 
 w3mimg.o: w3mimg.c
-	$(CC) $(CFLAGS) $(IMGCFLAGS) -I$(top_srcdir) -c $<
+	$(CC) $(CFLAGS) $(IMGCFLAGS) -I.. -I$(top_srcdir) -I$(srcdir) -c $<
 
 fb x11:
 	cd $@ && $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)"
diff --git a/w3mimg/fb/Makefile.in b/w3mimg/fb/Makefile.in
@@ -15,13 +15,13 @@ OBJS=fb.o fb_img.o
 all: fb_w3mimg.o fb.o fb_img.o
 
 fb_w3mimg.o: fb_w3mimg.c
-	$(CC) $(CFLAGS) $(IMGCFLAGS) -I$(top_srcdir) -c $<
+	$(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -I$(top_srcdir) -I$(srcdir) -c $<
 
 fb.o: fb.c
-	$(CC) $(CFLAGS) $(IMGCFLAGS) -I$(top_srcdir) -c $<
+	$(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -I$(top_srcdir) -I$(srcdir) -c $<
 
 fb_img.o: fb_img.c fb_gdkpixbuf.c fb_imlib2.c
-	$(CC) $(CFLAGS) $(IMGCFLAGS) -I$(top_srcdir) -c $<
+	$(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -I$(top_srcdir) -I$(srcdir) -c $<
 
 clean:
 	@-$(RM) -f *.o
diff --git a/w3mimg/x11/Makefile.in b/w3mimg/x11/Makefile.in
@@ -15,7 +15,7 @@ OBJS=x11_w3mimg.o
 all: x11_w3mimg.o
 
 x11_w3mimg.o: x11_w3mimg.c
-	$(CC) $(CFLAGS) $(IMGCFLAGS) -I$(top_srcdir) -c $<
+	$(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -I$(top_srcdir) -I$(srcdir) -c $<
 
 clean:
 	@-$(RM) -f *.o