storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[w3m-dev 04073] Re: run configure in another directory

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@@ -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
@@ -8453,4 +8466,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
$Id: ChangeLog,v 1.921 2004/04/22 16:34:08 ukai Exp $
$Id: ChangeLog,v 1.922 2004/04/26 17:00:37 ukai Exp $

8
Makefile.in
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))

2
libwc/Makefile.in
View File

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

5
w3mimg/Makefile.in
View File

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

7
w3mimg/fb/Makefile.in
View File

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

3
w3mimg/x11/Makefile.in
View File

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