w3m

commit d863b461a04ad945ba4e134f85978e9b678996c6
parent 8fdab010bb0009792bef615c55833e847edd22dc
Author: ukai <ukai>
Date:   Sun, 27 Oct 2002 17:16:36 +0000

[w3m-dev-en 00796]
* configure: expand here. ($var in Makefile is $v + ar)
* XMakefile: clean w3mimg/**/*.o
From: Fumitoshi UKAI  <ukai@debian.or.jp>

Diffstat:
M
ChangeLog
 | 
6
++++++
M
XMakefile
 | 
1
+
M
configure
 | 
16
++++++++--------

3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,11 @@
 2002-10-28  Fumitoshi UKAI  <ukai@debian.or.jp>
 
+	* [w3m-dev-en 00796]
+	* configure: expand here. ($var in Makefile is $v + ar)
+	* XMakefile: clean w3mimg/**/*.o
+
+2002-10-28  Fumitoshi UKAI  <ukai@debian.or.jp>
+
 	* [w3m-dev-en 00795]
 	* configure: IMLIB_CONFIG, IMLIB2_CONFIG, GDKPIXBUF_CONFIG
 	* rc.c (CMT_DISP_IMAGE): need if not defined USE_IMAGE
diff --git a/XMakefile b/XMakefile
@@ -182,6 +182,7 @@ uninstall:
 clean: sweep
 	-rm -f *.o *.a $(TARGETS) mktable$(EXT)
 	-rm -f funcname.c funcname1.h funcname2.h tagtable.c functable.c
+	-rm -f w3mimg/*.o w3mimg/*/*.o 
 	-for dir in $(SCRIPTSUBDIRS);	\
 	do	\
 		(cd $$dir; $(MAKE) clean); \
diff --git a/configure b/configure
@@ -2143,14 +2143,14 @@ if [ "$use_image" = y ]; then
 	  def_use_w3mimg_x11="#define USE_W3MIMG_X11"
 	  def_use_gdkpixbuf='#define USE_GDKPIXBUF'
 	  imgobjs="$imgobjs w3mimg/x11/x11_w3mimg.o"
-	  imgx11cflags='`$GDKPIXBUF_CONFIG --cflags`'
-	  imgx11ldflags='`$GDKPIXBUF_CONFIG --libs` -lgdk_pixbuf_xlib'
+	  imgx11cflags="`${GDKPIXBUF_CONFIG} --cflags`"
+	  imgx11ldflags="`${GDKPIXBUF_CONFIG} --libs` -lgdk_pixbuf_xlib"
       elif find_imlib; then
 	  def_use_w3mimg_x11="#define USE_W3MIMG_X11"
 	  def_use_imlib='#define USE_IMLIB'
 	  imgobjs="$imgobjs w3mimg/x11/x11_w3mimg.o"
-	  imgx11cflags='`$IMLIB_CONFIG --cflags`'
-	  imgx11ldflags='`$IMLIB_CONFIG --libs`'
+	  imgx11cflags="`${IMLIB_CONFIG} --cflags`"
+	  imgx11ldflags="`${IMLIB_CONFIG} --libs`"
       else
 	  use_w3mimg_x11=n
 	  echo "Disable X11 inline image"
@@ -2161,14 +2161,14 @@ if [ "$use_image" = y ]; then
 	  def_use_w3mimg_fb="#define USE_W3MIMG_FB"
 	  imgobjs="$imgobjs w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
 	  def_use_gdkpixbuf='#define USE_GDKPIXBUF'
-	  imgfbcflags='`$GDKPIXBUF_CONFIG --cflags`'
-	  imgfbldflags='`$GDKPIXBUF_CONFIG --libs`'
+	  imgfbcflags="`${GDKPIXBUF_CONFIG} --cflags`"
+	  imgfbldflags="`${GDKPIXBUF_CONFIG} --libs`"
       elif find_imlib2; then
 	  def_use_imlib2='#define USE_IMLIB2'
 	  imgobjs="$imgobjs w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
 	  def_use_imlib2='#define USE_IMLIB2'
-	  imgfbcflags='`$IMLIB2_CONFIG --cflags`'
-	  imgfbldflags='`$IMLIB2_CONFIG --libs`'
+	  imgfbcflags="`${IMLIB2_CONFIG} --cflags`"
+	  imgfbldflags="`${IMLIB2_CONFIG} --libs`"
       else
 	  use_w3mimg_fb=n
 	  echo "Disable Linux framebuffer inline image"