diff options
| author | Fumitoshi UKAI <ukai@debian.or.jp> | 2004-04-26 17:00:37 +0000 |
|---|---|---|
| committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2004-04-26 17:00:37 +0000 |
| commit | 8d410b5b46191a982bf9dc2e764e6f6d0356f3c5 (patch) | |
| tree | b2ec81ea0006d2dc378d24e945306f2a12f7f1ef /w3mimg | |
| parent | [w3m-dev 04066] --disable-color (diff) | |
| download | w3m-8d410b5b46191a982bf9dc2e764e6f6d0356f3c5.tar.gz w3m-8d410b5b46191a982bf9dc2e764e6f6d0356f3c5.zip | |
[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 (limited to '')
| -rw-r--r-- | w3mimg/Makefile.in | 5 | ||||
| -rw-r--r-- | w3mimg/fb/Makefile.in | 7 | ||||
| -rw-r--r-- | w3mimg/x11/Makefile.in | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/w3mimg/Makefile.in b/w3mimg/Makefile.in index 7c70164..a197352 100644 --- 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 index be74aab..d3ee2e1 100644 --- 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 index 79bb786..fb30e3a 100644 --- 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 |