aboutsummaryrefslogtreecommitdiffstats
path: root/XMakefile
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2002-07-17 20:58:48 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2002-07-17 20:58:48 +0000
commita12c96b4923d05b04f4bd9351028e444be58c7cb (patch)
tree9afc10209e987b339e4bbc846b72591e51616b36 /XMakefile
parent[w3m-dev 03263] fix lastA segfault (diff)
downloadw3m-a12c96b4923d05b04f4bd9351028e444be58c7cb.tar.gz
w3m-a12c96b4923d05b04f4bd9351028e444be58c7cb.zip
merge w3m-img for framebuffer support
* w3mimg/w3mimg.h: created * w3mimg/x11/x11_w3mimg.c: created * w3mimg/fb/fb_w3mimg.c: created * w3mimgsize.c w3mimgdisplay.c: modified * configure: modified * XMakefile: modified * config.h.dist: updated From: Fumitoshi UKAI <ukai@debian.or.jp> w3m-img for framebuffer support * http://homepage3.nifty.com/slokar/fb/ * w3mimg/fb/fb.c w3mimg/fb/fb.h w3mimg/fb/fb_img.c w3mimg/fb/fb_img.h w3mimg/fb/fb_gdkpixbuf.c w3mimg/fb/fb_gdkpixbuf.h w3mimg/fb/fb_imlib2.c w3mimg/fb/fb_imlib.h w3mimg/fb/readme.txt w3mimg/fb/license.txt: added From: Hiroshi Kawashima <kei@sm.sony.co.jp>
Diffstat (limited to 'XMakefile')
-rw-r--r--XMakefile30
1 files changed, 21 insertions, 9 deletions
diff --git a/XMakefile b/XMakefile
index 6386ed7..46631c9 100644
--- a/XMakefile
+++ b/XMakefile
@@ -1,4 +1,4 @@
-# $Id: XMakefile,v 1.24 2002/06/18 04:59:09 inu Exp $
+# $Id: XMakefile,v 1.25 2002/07/17 20:58:48 ukai Exp $
SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \
form.c map.c frame.c rc.c menu.c mailcap.c image.c\
func.c cookie.c history.c backend.c $(KEYBIND_SRC)
@@ -92,19 +92,31 @@ $(INFLATE): inflate.o
inflate.o: inflate.c
$(CC) $(CFLAGS) $(Z_CFLAGS) -c inflate.c
-$(IMGDISPLAY): w3mimgdisplay.o
- $(CC) $(CFLAGS) `imlib-config --cflags` $(LDFLAGS) -o $(IMGDISPLAY) \
- w3mimgdisplay.o `imlib-config --libs`
+$(IMGDISPLAY): w3mimgdisplay.o $(IMGOBJS)
+ $(CC) $(CFLAGS) $(IMGCFLAGS) $(LDFLAGS) -o $(IMGDISPLAY) \
+ w3mimgdisplay.o $(IMGOBJS) $(IMGLDFLAGS)
-$(IMGSIZE): w3mimgsize.o
- $(CC) $(CFLAGS) `imlib-config --cflags` $(LDFLAGS) -o $(IMGSIZE) \
- w3mimgsize.o `imlib-config --libs`
+$(IMGSIZE): w3mimgsize.o $(IMGOBJS)
+ $(CC) $(CFLAGS) $(IMGCFLAGS) $(LDFLAGS) -o $(IMGSIZE) \
+ w3mimgsize.o $(IMGOBJS) $(IMGLDFLAGS)
w3mimgdisplay.o: w3mimgdisplay.c
- $(CC) $(CFLAGS) `imlib-config --cflags` -c w3mimgdisplay.c
+ $(CC) $(CFLAGS) $(IMGCFLAGS) -c w3mimgdisplay.c
w3mimgsize.o: w3mimgsize.c
- $(CC) $(CFLAGS) `imlib-config --cflags` -c w3mimgsize.c
+ $(CC) $(CFLAGS) $(IMGCFLAGS) -c w3mimgsize.c
+
+w3mimg/x11/x11_w3mimg.o: w3mimg/x11/x11_w3mimg.c
+ $(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c w3mimg/x11/x11_w3mimg.c
+
+w3mimg/fb/fb_w3mimg.o: w3mimg/fb/fb_w3mimg.c
+ $(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c w3mimg/fb/fb_w3mimg.c
+
+w3mimg/fb/fb.o: w3mimg/fb/fb.c
+ $(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c w3mimg/fb/fb.c
+
+w3mimg/fb/fb_img.o: w3mimg/fb/fb_img.c w3mimg/fb/fb_gdkpixbuf.c w3mimg/fb/fb_imlib2.c
+ $(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c w3mimg/fb/fb_img.c
gc/gc.a:
cd gc; $(MAKE) base_lib gc.a CC='$(CC)' CFLAGS='$(GCCFLAGS) $(GC_CFLAGS)' SPECIALCFLAGS='-I./\$(srcdir)/include $(GC_CFLAGS)'