[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>
This commit is contained in:
Fumitoshi UKAI
2004-04-26 17:00:37 +00:00
parent b0e00c1c8f
commit 8d410b5b46
6 changed files with 28 additions and 12 deletions

View File

@@ -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))