w3m

commit 71700f5276935e334fd7bcd32ac3441fc4240f7a
parent 80eea2bf51f633e61ce0fdbe39e82896fa7a23a8
Author: ukai <ukai>
Date:   Mon, 26 Apr 2004 17:00:37 +0000

[w3m-dev 04073] Re: run configure in another directory
* Makefile.in (CFLAGS): include dir here
	(DEFS): delete include dirs
	(libwc/libwc.a): pass OPTS only
	(w3mimg/w3mimg.a): pass OPTS only
* libwc/Makefile.in (CFLAGS): fixed
* w3mimg/Makefile.in (CFLAGS): added
	(fb x11): pass OPTS only
* w3mimg/fb/Makefile.in (CFLAGS): added
* w3mimg/x11/Makefile.in (CFLAGS): added
From: Fumitoshi UKAI  <ukai@debian.or.jp>

Diffstat:
M
ChangeLog
 | 
13
+++++++++++++
M
Makefile.in
 | 
8
++++----
M
libwc/Makefile.in
 | 
2
+-
M
w3mimg/Makefile.in
 | 
5
+++--
M
w3mimg/fb/Makefile.in
 | 
7
++++---
M
w3mimg/x11/Makefile.in
 | 
3
++-

6 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,16 @@
+2004-04-27  Fumitoshi UKAI  <ukai@debian.or.jp>
+
+	* [w3m-dev 04073] Re: run configure in another directory
+	* Makefile.in (CFLAGS): include dir here
+		(DEFS): delete include dirs
+		(libwc/libwc.a): pass OPTS only
+		(w3mimg/w3mimg.a): pass OPTS only
+	* libwc/Makefile.in (CFLAGS): fixed
+	* w3mimg/Makefile.in (CFLAGS): added
+		(fb x11): pass OPTS only
+	* w3mimg/fb/Makefile.in (CFLAGS): added
+	* w3mimg/x11/Makefile.in (CFLAGS): added
+
 2004-04-23  SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp>
 
 	* [w3m-dev 04066] --disable-color
diff --git a/Makefile.in b/Makefile.in
@@ -35,10 +35,10 @@ RC_DIR = @RC_DIR@
 ETC_DIR = $(sysconfdir)
 CONF_DIR = $(sysconfdir)/$(PACKAGE)
 
-CFLAGS = $(OPTS) @CFLAGS@ $(CPPFLAGS) $(DEFS)
+CFLAGS = $(OPTS) -I. -I$(top_srcdir) @CFLAGS@ $(CPPFLAGS) $(DEFS)
 WCCFLAGS = @WCCFLAGS@
 CPPFLAGS = @CPPFLAGS@
-DEFS = @DEFS@ -I. -I$(top_srcdir) -DAUXBIN_DIR=\"$(AUXBIN_DIR)\" \
+DEFS = @DEFS@ -DAUXBIN_DIR=\"$(AUXBIN_DIR)\" \
 	-DCGIBIN_DIR=\"$(CGIBIN_DIR)\" -DHELP_DIR=\"$(HELP_DIR)\" \
 	-DETC_DIR=\"$(ETC_DIR)\" -DCONF_DIR=\"$(CONF_DIR)\" \
 	-DRC_DIR=\"$(RC_DIR)\" \
@@ -183,7 +183,7 @@ inflate.o: inflate.c
 	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/inflate.c
 
 libwc/libwc.a:
-	(cd libwc && $(MAKE) CC='$(CC0)' TOP_CFLAGS='$(CFLAGS)')
+	(cd libwc && $(MAKE) CC='$(CC0)' OPTS='$(OPTS)')
  
 dummy.o: entity.c
 	$(CC) $(CFLAGS) -DDUMMY -c -o $@ $?
@@ -195,7 +195,7 @@ w3mimgdisplay.o: w3mimgdisplay.c w3mimg/w3mimg.h
 	$(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c $(srcdir)/w3mimgdisplay.c
 
 w3mimg/w3mimg.a:
-	(cd w3mimg && $(MAKE) CC="$(CC0)" CFLAGS="$(CFLAGS)")
+	(cd w3mimg && $(MAKE) CC="$(CC0)" OPTS="$(OPTS)")
 
 po:
 	(cd $@ && $(MAKE))
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 = $(OPTS) -I.. -I$(top_srcdir) -I$(srcdir) @CFLAGS@ @WCCFLAGS@ @DEFS@
 AR=ar
 RANLIB=@RANLIB@
 RM=rm
diff --git a/w3mimg/Makefile.in b/w3mimg/Makefile.in
@@ -6,6 +6,7 @@ SHELL=@SHELL@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = $(srcdir):.
+CFLAGS=$(OPTS) -I.. -I$(top_srcdir) -I$(srcdir) @CFLAGS@ @CPPFLAGS@ @DEFS@ $(IMGCFLAGS)
 AR=ar
 RANLIB=@RANLIB@
 RM=rm
@@ -21,10 +22,10 @@ w3mimg.a: $(IMGOBJS)
 	$(RANLIB) $@
 
 w3mimg.o: w3mimg.c
-	$(CC) $(CFLAGS) $(IMGCFLAGS) -I.. -I$(top_srcdir) -I$(srcdir) -c $<
+	$(CC) $(CFLAGS) -c $<
 
 fb x11:
-	cd $@ && $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)"
+	cd $@ && $(MAKE) CC="$(CC)" OPTS="$(OPTS)"
 
 clean:
 	@-$(RM) -f *.o
diff --git a/w3mimg/fb/Makefile.in b/w3mimg/fb/Makefile.in
@@ -7,6 +7,7 @@ SHELL=@SHELL@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = $(srcdir):.
+CFLAGS=$(OPTS) -I../.. -I$(top_srcdir) -I$(srcdir) @CFLAGS@ @CPPFLAGS@ @DEFS@ $(IMGCFLAGS)
 RM=rm
 
 IMGCFLAGS=@IMGFBCFLAGS@
@@ -15,13 +16,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../.. -I$(top_srcdir) -I$(srcdir) -c $<
+	$(CC) $(CFLAGS) -c $<
 
 fb.o: fb.c
-	$(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -I$(top_srcdir) -I$(srcdir) -c $<
+	$(CC) $(CFLAGS) -c $<
 
 fb_img.o: fb_img.c fb_gdkpixbuf.c fb_imlib2.c
-	$(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -I$(top_srcdir) -I$(srcdir) -c $<
+	$(CC) $(CFLAGS) -c $<
 
 clean:
 	@-$(RM) -f *.o
diff --git a/w3mimg/x11/Makefile.in b/w3mimg/x11/Makefile.in
@@ -7,6 +7,7 @@ SHELL=@SHELL@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = $(srcdir):.
+CFLAGS=$(OPTS) -I../.. -I$(top_srcdir) -I$(srcdir) @CFLAGS@ @CPPFLAGS@ @DEFS@ $(IMGCFLAGS)
 RM=rm
 
 IMGCFLAGS=@IMGX11CFLAGS@
@@ -15,7 +16,7 @@ OBJS=x11_w3mimg.o
 all: x11_w3mimg.o
 
 x11_w3mimg.o: x11_w3mimg.c
-	$(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -I$(top_srcdir) -I$(srcdir) -c $<
+	$(CC) $(CFLAGS) -c $<
 
 clean:
 	@-$(RM) -f *.o