storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XMakefile (w3mimg/w3mimg): added

Browse Source 
(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>
This commit is contained in:
Fumitoshi UKAI
2002-07-18 06:07:25 +00:00
parent 5ec6225f49
commit c4c0f87fce
5 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -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> 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) * [w3m-dev 03272] Re: w3m-img for framebuffer merged (Re: Re: w3m-img for framebuffer)
@@ -3593,4 +3601,4 @@
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.405 2002/07/18 05:59:06 ukai Exp $ $Id: ChangeLog,v 1.406 2002/07/18 06:07:25 ukai Exp $

11
XMakefile
View File

@@ -1,4 +1,4 @@
# $Id: XMakefile,v 1.26 2002/07/18 05:59:06 ukai Exp $ # $Id: XMakefile,v 1.27 2002/07/18 06:07:25 ukai Exp $
SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \ 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\ form.c map.c frame.c rc.c menu.c mailcap.c image.c\
func.c cookie.c history.c backend.c $(KEYBIND_SRC) func.c cookie.c history.c backend.c $(KEYBIND_SRC)
@@ -106,17 +106,20 @@ w3mimgdisplay.o: w3mimgdisplay.c
w3mimgsize.o: w3mimgsize.c w3mimgsize.o: w3mimgsize.c
$(CC) $(CFLAGS) $(IMGCFLAGS) -c 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 w3mimg/x11/x11_w3mimg.o: w3mimg/x11/x11_w3mimg.c
cd w3mimg/x11 && $(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c x11_w3mimg.c cd w3mimg/x11 && $(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c x11_w3mimg.c
w3mimg/fb/fb_w3mimg.o: w3mimg/fb/fb_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 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 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: gc/gc.a:
cd gc; $(MAKE) base_lib gc.a CC='$(CC)' CFLAGS='$(GCCFLAGS) $(GC_CFLAGS)' SPECIALCFLAGS='-I./\$(srcdir)/include $(GC_CFLAGS)' cd gc; $(MAKE) base_lib gc.a CC='$(CC)' CFLAGS='$(GCCFLAGS) $(GC_CFLAGS)' SPECIALCFLAGS='-I./\$(srcdir)/include $(GC_CFLAGS)'

4
configure vendored
View File

@@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# $Id: configure,v 1.71 2002/07/18 05:55:22 ukai Exp $ # $Id: configure,v 1.72 2002/07/18 06:07:25 ukai Exp $
# Configuration. # Configuration.
# #
@@ -2046,7 +2046,7 @@ imgx11cflags=''
imgfbcflags='' imgfbcflags=''
imgx11ldflags='' imgx11ldflags=''
imgfbldflags='' imgfbldflags=''
imbobjs='' imgobjs='w3mimg/w3mimg.o'
if [ "$use_image" = y ]; then if [ "$use_image" = y ]; then
if [ "$use_w3mimg_x11" = y ]; then if [ "$use_w3mimg_x11" = y ]; then

17
w3mimg/w3mimg.c Normal file
View File

@@ -0,0 +1,17 @@
/* $Id: w3mimg.c,v 1.1 2002/07/18 06:07:39 ukai Exp $ */
#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;
}

19
w3mimg/w3mimg.h
View File

@@ -1,4 +1,4 @@
/* $Id: w3mimg.h,v 1.1 2002/07/17 20:58:48 ukai Exp $ */ /* $Id: w3mimg.h,v 1.2 2002/07/18 06:07:25 ukai Exp $ */
#include "config.h" #include "config.h"
#ifdef USE_W3MIMG_FB #ifdef USE_W3MIMG_FB
@@ -32,21 +32,10 @@ typedef struct _w3mimg_op {
} w3mimg_op; } w3mimg_op;
#ifdef USE_W3MIMG_X11 #ifdef USE_W3MIMG_X11
w3mimg_op *w3mimg_x11open(); extern w3mimg_op *w3mimg_x11open();
#endif #endif
#ifdef USE_W3MIMG_FB #ifdef USE_W3MIMG_FB
w3mimg_op *w3mimg_fbopen(); extern w3mimg_op *w3mimg_fbopen();
#endif #endif
static w3mimg_op *w3mimg_open() { extern 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;
}