commit ca180900699ea7658ca43803df404ce14b1e3daa
parent fefc2d2a99b05e6a015e406736b6b35a6dc517eb
Author: ukai <ukai>
Date: Fri, 10 Oct 2003 16:33:13 +0000
* scripts/Makefile.in (w3mhelp-funcname.pl): depends ../funcname.tab
* Makefile.in (IMGOBJS): deleted
(indep.o): depends on fm.h funcname1.h
(IMGDISPLAY): depends on w3mimg/w3mimg.a
(w3mimg/w3mimg.a): renamed from w3mimg
* acinclude.m4 (AC_W3M_IMAGE): modify IMBOBJS
* w3mimg/Makefile.in (AR): added
(RANLIB): added
(IMGOBJS): added
(w3mimg.a): added
From: Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev 03990] Re: post-m17n merge problem?
* Makefile.in (MAN1): need $(top_srcdir)
(MAN1_JA): ditto
(LOBJS): depends on fm.h funcname1.h
(INFLATE): depends on $(ALIB)
(libwc/libwc.a): renamed from libwc
(IMGDISPLAY): depends on $(IMGOBJS) instead of w3mimg
depends on $(ALIB)
(w3mimgdisplay.o): depends on w3mimg/w3mimg.h
* acinclude.m4 (AC_W3M_M17N): WCTARGET is libwc/libwc.a
* configure.in (HELP_DIR): expand ${prefix}
From: qhwt@myrealbox.com
Diffstat:
8 files changed, 74 insertions(+), 40 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,30 @@
+2003-10-11 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * scripts/Makefile.in (w3mhelp-funcname.pl): depends ../funcname.tab
+ * Makefile.in (IMGOBJS): deleted
+ (indep.o): depends on fm.h funcname1.h
+ (IMGDISPLAY): depends on w3mimg/w3mimg.a
+ (w3mimg/w3mimg.a): renamed from w3mimg
+ * acinclude.m4 (AC_W3M_IMAGE): modify IMBOBJS
+ * w3mimg/Makefile.in (AR): added
+ (RANLIB): added
+ (IMGOBJS): added
+ (w3mimg.a): added
+
+2003-10-11 qhwt@myrealbox.com
+
+ * [w3m-dev 03990] Re: post-m17n merge problem?
+ * Makefile.in (MAN1): need $(top_srcdir)
+ (MAN1_JA): ditto
+ (LOBJS): depends on fm.h funcname1.h
+ (INFLATE): depends on $(ALIB)
+ (libwc/libwc.a): renamed from libwc
+ (IMGDISPLAY): depends on $(IMGOBJS) instead of w3mimg
+ depends on $(ALIB)
+ (w3mimgdisplay.o): depends on w3mimg/w3mimg.h
+ * acinclude.m4 (AC_W3M_M17N): WCTARGET is libwc/libwc.a
+ * configure.in (HELP_DIR): expand ${prefix}
+
2003-10-08 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03985] Re: support for 307 Temporary Redirect
diff --git a/Makefile.in b/Makefile.in
@@ -96,7 +96,6 @@ LLOBJS=version.o
ALIBOBJS=Str.o indep.o regex.o textlist.o parsetag.o myctype.o hash.o
ALIB=libindep.a
ALLOBJS=$(OBJS) $(LOBJS) $(LLOBJS)
-IMGOBJS=@IMGOBJS@
EXT=@EXEEXT@
@@ -106,8 +105,8 @@ HELPER=w3mhelperpanel$(EXT)
INFLATE=inflate$(EXT)
IMGDISPLAY=w3mimgdisplay$(EXT)
MAN1_TARGET=$(PACKAGE).1
-MAN1=doc/w3m.1
-MAN1_JA=doc-jp/w3m.1
+MAN1=$(top_srcdir)/doc/w3m.1
+MAN1_JA=$(top_srcdir)/doc-jp/w3m.1
LIB_TARGETS=$(BOOKMARKER) $(HELPER)
AUXBIN_TARGETS=@AUXBIN_TARGETS@
@@ -129,11 +128,12 @@ $(ALIB): $(ALIBOBJS)
$(AR) rv $(ALIB) $(ALIBOBJS)
$(RANLIB) $(ALIB)
-$(OBJS): fm.h funcname1.h
+$(OBJS) $(LOBJS): fm.h funcname1.h
tagtable.c: tagtable.tab mktable$(EXT) html.h
./mktable$(EXT) 100 $(srcdir)/tagtable.tab > $@
+indep.o: indep.c fm.h funcname1.h
func.o: funcname.c functable.c funcname1.h
keybind.o: funcname2.h
keybind_lynx.o: funcname2.h
@@ -168,25 +168,25 @@ $(BOOKMARKER): w3mbookmark.o dummy.o $(ALIB)
$(HELPER): w3mhelperpanel.o dummy.o $(ALIB)
$(CC) $(CFLAGS) -o $(HELPER) w3mhelperpanel.o dummy.o $(LDFLAGS) $(LIBS)
-$(INFLATE): inflate.o
+$(INFLATE): inflate.o $(ALIB)
$(CC) $(CFLAGS) -o $(INFLATE) inflate.o $(LDFLAGS) $(LIBS) -lz
inflate.o: inflate.c
$(CC) $(CFLAGS) -o $@ -c $(srcdir)/inflate.c
-libwc:
+libwc/libwc.a:
(cd libwc && $(MAKE) CC='$(CC0)' TOP_CFLAGS='$(CFLAGS)')
dummy.o: entity.c
$(CC) $(CFLAGS) -DDUMMY -c -o $@ $?
-$(IMGDISPLAY): w3mimgdisplay.o w3mimg
- $(CC) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o $(IMGOBJS) $(LDFLAGS) $(LIBS) $(IMGLDFLAGS)
+$(IMGDISPLAY): w3mimgdisplay.o $(ALIB) w3mimg/w3mimg.a
+ $(CC) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) $(IMGLDFLAGS)
-w3mimgdisplay.o: w3mimgdisplay.c w3mimg
+w3mimgdisplay.o: w3mimgdisplay.c w3mimg/w3mimg.h
$(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c $(srcdir)/w3mimgdisplay.c
-w3mimg:
+w3mimg/w3mimg.a:
(cd w3mimg && $(MAKE) CC="$(CC0)" CFLAGS="$(CFLAGS)")
po:
diff --git a/acinclude.m4 b/acinclude.m4
@@ -160,7 +160,7 @@ if test x"$enable_m17n" = xno; then
document_charset='WC_CES_US_ASCII'
else
AC_DEFINE(USE_M17N)
- WCTARGET="libwc"
+ WCTARGET="libwc/libwc.a"
WCCFLAGS='-I$(srcdir) -I$(srcdir)/..'
wcinclude='-I$(srcdir)/libwc'
wclib="-L./libwc -lwc"
@@ -590,7 +590,7 @@ AC_DEFUN([AC_W3M_IMAGE],
[enable_image="yes"])
AC_MSG_RESULT($enable_image)
if test x"$enable_image" != xno; then
- IMGOBJS=w3mimg/w3mimg.o
+ IMGOBJS=w3mimg.o
if test x"$enable_image" = xyes; then
enable_image=x11
case "`uname -s`" in
@@ -674,21 +674,21 @@ AC_DEFUN([AC_W3M_IMAGE],
if test x"$have_gdkpixbuf" = xyes; then
AC_DEFINE(USE_W3MIMG_X11)
AC_DEFINE(USE_GDKPIXBUF)
- IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
+ IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
IMGX11CFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
IMGX11LDFLAGS="`${GDKPIXBUF_CONFIG} --libs` -lgdk_pixbuf_xlib"
IMGTARGETS="x11"
elif test x"$have_imlib" = xyes; then
AC_DEFINE(USE_W3MIMG_X11)
AC_DEFINE(USE_IMLIB)
- IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
+ IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
IMGX11CFLAGS="`${IMLIB_CONFIG} --cflags`"
IMGX11LDFLAGS="`${IMLIB_CONFIG} --libs`"
IMGTARGETS="x11"
elif test x"$have_imlib2" = xyes; then
AC_DEFINE(USE_W3MIMG_X11)
AC_DEFINE(USE_IMLIB2)
- IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
+ IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`"
IMGX11LDFLAGS="`${IMLIB2_CONFIG} --libs`"
IMGTARGETS="x11"
@@ -700,14 +700,14 @@ AC_DEFUN([AC_W3M_IMAGE],
if test x"$have_gdkpixbuf" = xyes; then
AC_DEFINE(USE_W3MIMG_FB)
AC_DEFINE(USE_GDKPIXBUF)
- IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
+ IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
IMGFBCFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
IMGFBLDFLAGS="`${GDKPIXBUF_CONFIG} --libs`"
IMGTARGETS="${IMGTARGETS} fb"
elif test x"$have_imlib2" = xyes; then
AC_DEFINE(USE_W3MIMG_FB)
AC_DEFINE(USE_IMLIB2)
- IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
+ IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`"
IMGFBLDFLAGS="`${IMLIB2_CONFIG} --libs`"
IMGTARGETS="${IMGTARGETS} fb"
diff --git a/aclocal.m4 b/aclocal.m4
@@ -172,7 +172,7 @@ if test x"$enable_m17n" = xno; then
document_charset='WC_CES_US_ASCII'
else
AC_DEFINE(USE_M17N)
- WCTARGET="libwc"
+ WCTARGET="libwc/libwc.a"
WCCFLAGS='-I$(srcdir) -I$(srcdir)/..'
wcinclude='-I$(srcdir)/libwc'
wclib="-L./libwc -lwc"
@@ -602,7 +602,7 @@ AC_DEFUN([AC_W3M_IMAGE],
[enable_image="yes"])
AC_MSG_RESULT($enable_image)
if test x"$enable_image" != xno; then
- IMGOBJS=w3mimg/w3mimg.o
+ IMGOBJS=w3mimg.o
if test x"$enable_image" = xyes; then
enable_image=x11
case "`uname -s`" in
@@ -686,21 +686,21 @@ AC_DEFUN([AC_W3M_IMAGE],
if test x"$have_gdkpixbuf" = xyes; then
AC_DEFINE(USE_W3MIMG_X11)
AC_DEFINE(USE_GDKPIXBUF)
- IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
+ IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
IMGX11CFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
IMGX11LDFLAGS="`${GDKPIXBUF_CONFIG} --libs` -lgdk_pixbuf_xlib"
IMGTARGETS="x11"
elif test x"$have_imlib" = xyes; then
AC_DEFINE(USE_W3MIMG_X11)
AC_DEFINE(USE_IMLIB)
- IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
+ IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
IMGX11CFLAGS="`${IMLIB_CONFIG} --cflags`"
IMGX11LDFLAGS="`${IMLIB_CONFIG} --libs`"
IMGTARGETS="x11"
elif test x"$have_imlib2" = xyes; then
AC_DEFINE(USE_W3MIMG_X11)
AC_DEFINE(USE_IMLIB2)
- IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
+ IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`"
IMGX11LDFLAGS="`${IMLIB2_CONFIG} --libs`"
IMGTARGETS="x11"
@@ -712,14 +712,14 @@ AC_DEFUN([AC_W3M_IMAGE],
if test x"$have_gdkpixbuf" = xyes; then
AC_DEFINE(USE_W3MIMG_FB)
AC_DEFINE(USE_GDKPIXBUF)
- IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
+ IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
IMGFBCFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
IMGFBLDFLAGS="`${GDKPIXBUF_CONFIG} --libs`"
IMGTARGETS="${IMGTARGETS} fb"
elif test x"$have_imlib2" = xyes; then
AC_DEFINE(USE_W3MIMG_FB)
AC_DEFINE(USE_IMLIB2)
- IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
+ IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`"
IMGFBLDFLAGS="`${IMLIB2_CONFIG} --libs`"
IMGTARGETS="${IMGTARGETS} fb"
diff --git a/configure b/configure
@@ -2984,7 +2984,7 @@ else
#define USE_M17N 1
_ACEOF
- WCTARGET="libwc"
+ WCTARGET="libwc/libwc.a"
WCCFLAGS='-I$(srcdir) -I$(srcdir)/..'
wcinclude='-I$(srcdir)/libwc'
wclib="-L./libwc -lwc"
@@ -4890,7 +4890,7 @@ fi;
echo "$as_me:$LINENO: result: $enable_image" >&5
echo "${ECHO_T}$enable_image" >&6
if test x"$enable_image" != xno; then
- IMGOBJS=w3mimg/w3mimg.o
+ IMGOBJS=w3mimg.o
if test x"$enable_image" = xyes; then
enable_image=x11
case "`uname -s`" in
@@ -5035,7 +5035,7 @@ _ACEOF
#define USE_GDKPIXBUF 1
_ACEOF
- IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
+ IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
IMGX11CFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
IMGX11LDFLAGS="`${GDKPIXBUF_CONFIG} --libs` -lgdk_pixbuf_xlib"
IMGTARGETS="x11"
@@ -5048,7 +5048,7 @@ _ACEOF
#define USE_IMLIB 1
_ACEOF
- IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
+ IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
IMGX11CFLAGS="`${IMLIB_CONFIG} --cflags`"
IMGX11LDFLAGS="`${IMLIB_CONFIG} --libs`"
IMGTARGETS="x11"
@@ -5061,7 +5061,7 @@ _ACEOF
#define USE_IMLIB2 1
_ACEOF
- IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
+ IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`"
IMGX11LDFLAGS="`${IMLIB2_CONFIG} --libs`"
IMGTARGETS="x11"
@@ -5080,7 +5080,7 @@ _ACEOF
#define USE_GDKPIXBUF 1
_ACEOF
- IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
+ IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
IMGFBCFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
IMGFBLDFLAGS="`${GDKPIXBUF_CONFIG} --libs`"
IMGTARGETS="${IMGTARGETS} fb"
@@ -5093,7 +5093,7 @@ _ACEOF
#define USE_IMLIB2 1
_ACEOF
- IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
+ IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`"
IMGFBLDFLAGS="`${IMLIB2_CONFIG} --libs`"
IMGTARGETS="${IMGTARGETS} fb"
@@ -9255,14 +9255,14 @@ _ACEOF
fi
-HELP_DIR="$datadir/$PACKAGE"
-cat >>confdefs.h <<_ACEOF
+HELP_DIR=$(eval echo "$datadir/$PACKAGE")
+cat >>confdefs.h <<\_ACEOF
#define HELP_DIR "$HELP_DIR"
_ACEOF
RC_DIR="~/.$PACKAGE"
-cat >>confdefs.h <<_ACEOF
+cat >>confdefs.h <<\_ACEOF
#define RC_DIR "$RC_DIR"
_ACEOF
diff --git a/configure.in b/configure.in
@@ -150,11 +150,11 @@ AC_W3M_SIGSETJMP
AC_W3M_SIGNAL
AC_SUBST(HELP_DIR)
-HELP_DIR="$datadir/$PACKAGE"
-AC_DEFINE_UNQUOTED(HELP_DIR, "$HELP_DIR")
+HELP_DIR=$(eval echo "$datadir/$PACKAGE")
+AC_DEFINE(HELP_DIR, "$HELP_DIR")
AC_SUBST(RC_DIR)
RC_DIR="~/.$PACKAGE"
-AC_DEFINE_UNQUOTED(RC_DIR, "$RC_DIR")
+AC_DEFINE(RC_DIR, "$RC_DIR")
AC_SUBST(DOCDIRS)
DOCDIRS="doc:en_English doc-jp:ja_Japanese"
AC_DEFINE_UNQUOTED(DOCDIRS, "$DOCDIRS")
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
@@ -48,10 +48,10 @@ PERL = @PERL@
all: $(LIB_TARGETS) $(AUXBIN_TARGETS) $(HELP_TARGETS) $(SUBDIRS)
-w3mhelp-funcname.pl: w3mhelp-funcname.pl.in $(top_srcdir)/funcname.tab $(top_srcdir)/doc/keymap.default $(top_srcdir)/doc/keymap.lynx
+w3mhelp-funcname.pl: w3mhelp-funcname.pl.in ../funcname.tab $(top_srcdir)/doc/keymap.default $(top_srcdir)/doc/keymap.lynx
@echo "generating w3mhelp-funcname.pl..."
@echo '%funcname = (' > w3mhelp-funcname.pl
- @sed -ne "/^[a-zA-Z@]/s/\([a-zA-Z@][a-zA-Z0-9@_]*\)[ ][ ]*\([^ ]*\)/'\1', '\2',/p" < $(top_srcdir)/funcname.tab >> w3mhelp-funcname.pl
+ @sed -ne "/^[a-zA-Z@]/s/\([a-zA-Z@][a-zA-Z0-9@_]*\)[ ][ ]*\([^ ]*\)/'\1', '\2',/p" < ../funcname.tab >> w3mhelp-funcname.pl
@echo ');' >> w3mhelp-funcname.pl
@echo '%keyfunc = (' >> w3mhelp-funcname.pl
@case "$(KEYBIND_SRC)" in *lynx*) keymap=keymap.lynx;; *) keymap=keymap.default;; esac; \
diff --git a/w3mimg/Makefile.in b/w3mimg/Makefile.in
@@ -6,12 +6,19 @@ SHELL=@SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = $(srcdir):.
+AR=ar
+RANLIB=@RANLIB@
RM=rm
IMGCFLAGS=@IMGX11CFLAGS@ @IMGFBCFLAGS@
+IMGOBJS=@IMGOBJS@
.PHONY: fb x11
-all: w3mimg.o @IMGTARGETS@
+all: @IMGTARGETS@ w3mimg.a
+
+w3mimg.a: $(IMGOBJS)
+ $(AR) rv $@ $^
+ $(RANLIB) $@
w3mimg.o: w3mimg.c
$(CC) $(CFLAGS) $(IMGCFLAGS) -I.. -I$(top_srcdir) -I$(srcdir) -c $<
