[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:
		@@ -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,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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user