commit 4c99d08071f2970f94bb4990530c951e58a8826d
parent ad7ba8e196f44e9d32335fc3fe3ccb378c061be5
Author: ukai <ukai>
Date: Thu, 18 Jul 2002 06:07:25 +0000
XMakefile (w3mimg/w3mimg): added
(w3img/fb) fixed
* w3mimg/w3mimg.h (w3mimg_open): deleted to avoid compilation warnings
* w3mimg/w3mimg.c: added
* configure (imgobjs): add w3mimg/w3mimg.o
From: Fumitoshi UKAI <ukai@debian.or.jp>
Diffstat:
5 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2002-07-18 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * XMakefile (w3mimg/w3mimg): added
+ (w3img/fb) fixed
+ * w3mimg/w3mimg.h (w3mimg_open): deleted to avoid compilation warnings
+ * w3mimg/w3mimg.c: added
+ * configure (imgobjs): add w3mimg/w3mimg.o
+
2002-07-18 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03272] Re: w3m-img for framebuffer merged (Re: Re: w3m-img for framebuffer)
diff --git a/XMakefile b/XMakefile
@@ -106,17 +106,20 @@ w3mimgdisplay.o: w3mimgdisplay.c
w3mimgsize.o: w3mimgsize.c
$(CC) $(CFLAGS) $(IMGCFLAGS) -c w3mimgsize.c
+w3mimg/w3mimg.o: w3mimg/w3mimg.c
+ cd w3mimg && $(CC) $(CFLAGS) $(IMGCFLAGS) -I.. -c w3mimg.c
+
w3mimg/x11/x11_w3mimg.o: w3mimg/x11/x11_w3mimg.c
cd w3mimg/x11 && $(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c x11_w3mimg.c
w3mimg/fb/fb_w3mimg.o: w3mimg/fb/fb_w3mimg.c
- cd w3mimg/fb && $(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c w3mimg/fb/fb_w3mimg.c
+ cd w3mimg/fb && $(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c fb_w3mimg.c
w3mimg/fb/fb.o: w3mimg/fb/fb.c
- cd w3mimg/fb && $(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c w3mimg/fb/fb.c
+ cd w3mimg/fb && $(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c fb.c
w3mimg/fb/fb_img.o: w3mimg/fb/fb_img.c w3mimg/fb/fb_gdkpixbuf.c w3mimg/fb/fb_imlib2.c
- cd w3mimg/fb && $(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c w3mimg/fb/fb_img.c
+ cd w3mimg/fb && $(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c 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)'
diff --git a/configure b/configure
@@ -2046,7 +2046,7 @@ imgx11cflags=''
imgfbcflags=''
imgx11ldflags=''
imgfbldflags=''
-imbobjs=''
+imgobjs='w3mimg/w3mimg.o'
if [ "$use_image" = y ]; then
if [ "$use_w3mimg_x11" = y ]; then
diff --git a/w3mimg/w3mimg.c b/w3mimg/w3mimg.c
@@ -0,0 +1,17 @@
+/* $Id$ */
+
+#include "w3mimg/w3mimg.h"
+
+w3mimg_op *w3mimg_open() {
+ w3mimg_op *w_op = NULL;
+#ifdef USE_W3MIMG_X11
+ if (w_op == NULL)
+ w_op = w3mimg_x11open();
+#endif
+#ifdef USE_W3MIMG_FB
+ if (w_op == NULL)
+ w_op = w3mimg_fbopen();
+#endif
+ return w_op;
+}
+
diff --git a/w3mimg/w3mimg.h b/w3mimg/w3mimg.h
@@ -32,21 +32,10 @@ typedef struct _w3mimg_op {
} w3mimg_op;
#ifdef USE_W3MIMG_X11
-w3mimg_op *w3mimg_x11open();
+extern w3mimg_op *w3mimg_x11open();
#endif
#ifdef USE_W3MIMG_FB
-w3mimg_op *w3mimg_fbopen();
+extern w3mimg_op *w3mimg_fbopen();
#endif
-static w3mimg_op *w3mimg_open() {
- w3mimg_op *w_op = NULL;
-#ifdef USE_W3MIMG_X11
- if (w_op == NULL)
- w_op = w3mimg_x11open();
-#endif
-#ifdef USE_W3MIMG_FB
- if (w_op == NULL)
- w_op = w3mimg_fbopen();
-#endif
- return w_op;
-}
+extern w3mimg_op *w3mimg_open();