aboutsummaryrefslogtreecommitdiffstats
path: root/w3mimg
diff options
context:
space:
mode:
Diffstat (limited to 'w3mimg')
-rw-r--r--w3mimg/Makefile.in5
-rw-r--r--w3mimg/fb/Makefile.in7
-rw-r--r--w3mimg/x11/Makefile.in3
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