From 5ec6225f49413ca0ea8cf4e313395141d74cc622 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Thu, 18 Jul 2002 05:59:06 +0000 Subject: [w3m-dev 03272] Re: w3m-img for framebuffer merged (Re: Re: w3m-img for framebuffer) * XMakefile (w3mimg/x11): chdir (w3mimg/fb): chdir From: Hironori SAKAMOTO --- ChangeLog | 8 +++++++- XMakefile | 10 +++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index dd19a13..87ea891 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-07-18 Hironori SAKAMOTO + + * [w3m-dev 03272] Re: w3m-img for framebuffer merged (Re: Re: w3m-img for framebuffer) + * XMakefile (w3mimg/x11): chdir + (w3mimg/fb): chdir + 2002-07-18 Fumitoshi UKAI * [w3m-dev 03273] Re: w3m-img for framebuffer merged @@ -3587,4 +3593,4 @@ * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.404 2002/07/18 05:55:22 ukai Exp $ +$Id: ChangeLog,v 1.405 2002/07/18 05:59:06 ukai Exp $ diff --git a/XMakefile b/XMakefile index 46631c9..782715c 100644 --- a/XMakefile +++ b/XMakefile @@ -1,4 +1,4 @@ -# $Id: XMakefile,v 1.25 2002/07/17 20:58:48 ukai Exp $ +# $Id: XMakefile,v 1.26 2002/07/18 05:59:06 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) @@ -107,16 +107,16 @@ w3mimgsize.o: 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 + cd w3mimg/x11 && $(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c x11_w3mimg.c w3mimg/fb/fb_w3mimg.o: w3mimg/fb/fb_w3mimg.c - $(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c w3mimg/fb/fb_w3mimg.c + cd w3mimg/fb && $(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c w3mimg/fb/fb_w3mimg.c w3mimg/fb/fb.o: w3mimg/fb/fb.c - $(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c w3mimg/fb/fb.c + cd w3mimg/fb && $(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -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 + cd w3mimg/fb && $(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -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)' -- cgit v1.2.3