[w3m-dev 03819] support cd build && ../configure

* Makefile.in: add VPATH add MV use $(top_srcdir), $<, $@ * acinclude.m4 (AC_W3M_VERSION): use $srcdir * configure.in (AC_W3M_VERSION): move * mktable.c (main): basename From: Fumitoshi UKAI <ukai@debian.or.jp>
2003-03-12 18:27:03 +00:00
parent f87fd4e2b7
commit 33ddf9cdfc
7 changed files with 212 additions and 175 deletions
--- a/12
+++ b/12
@@ -1,3 +1,13 @@
+2003-03-13  Fumitoshi UKAI  <ukai@debian.or.jp>
+
+	* [w3m-dev 03819] support cd build && ../configure
+	* Makefile.in: add VPATH
+			add MV
+			use $(top_srcdir), $<, $@
+	* acinclude.m4 (AC_W3M_VERSION): use $srcdir
+	* configure.in (AC_W3M_VERSION): move
+	* mktable.c (main): basename
+
 2003-03-13  Fumitoshi UKAI  <ukai@debian.or.jp>

 	* Makefile.in (distclean): added
@@ -7511,4 +7521,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1

-$Id: ChangeLog,v 1.790 2003/03/12 17:29:00 ukai Exp $
+$Id: ChangeLog,v 1.791 2003/03/12 18:27:03 ukai Exp $
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,6 +19,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 top_srcdir = @top_srcdir@
+VPATH = $(top_srcdir):.
 DESTDIR = 

 CGIBIN_DIR = $(libexecdir)/$(package)/cgi-bin
@@ -48,6 +49,7 @@ RANLIB=@RANLIB@
 AWK = @AWK@
 PERL = @PERL@
 MKDIR=mkdir -p
+MV=mv
 RM=rm
 AR=ar
 INSTALL=@INSTALL@
@@ -111,8 +113,8 @@ $(ALIB): $(ALIBOBJS)

 $(OBJS): fm.h funcname1.h

-tagtable.c: html.h tagtable.tab mktable$(EXT)
-	./mktable$(EXT) 100 tagtable.tab > tagtable.c
+tagtable.c: tagtable.tab mktable$(EXT) html.h 
+	./mktable$(EXT) 100 $< > $@

 func.o: funcname.c functable.c funcname1.h
 keybind.o: funcname2.h
@@ -120,17 +122,17 @@ keybind_lynx.o: funcname2.h
 parsetagx.o: html.c

 funcname.c: funcname.tab
-	sort funcname.tab | $(AWK) -f funcname0.awk > funcname.c
+	sort $< | $(AWK) -f $(top_srcdir)/funcname0.awk > $@

 funcname1.h: funcname.tab
-	sort funcname.tab | $(AWK) -f funcname1.awk > funcname1.h
+	sort $< | $(AWK) -f $(top_srcdir)/funcname1.awk > $@

 funcname2.h: funcname.tab
-	sort funcname.tab | $(AWK) -f funcname2.awk > funcname2.h
+	sort $< | $(AWK) -f $(top_srcdir)/funcname2.awk > $@

 functable.c: funcname.tab mktable$(EXT)
-	sort funcname.tab | $(AWK) -f functable.awk > functable.tab
-	./mktable$(EXT) 100 functable.tab > functable.c
+	sort $< | $(AWK) -f $(top_srcdir)/functable.awk > functable.tab
+	./mktable$(EXT) 100 functable.tab > $@
 	-rm -f functable.tab

 mktable$(EXT): mktable.o hash.o $(ALIB) $(GCTARGET)
@@ -146,28 +148,48 @@ $(INFLATE): inflate.o
 	$(CC) $(CFLAGS) -o $(INFLATE) inflate.o $(LDFLAGS) $(LIBS) -lz

 inflate.o: inflate.c
-	$(CC) $(CFLAGS) -o inflate.o -c inflate.c
+	$(CC) $(CFLAGS) -o $@ -c $<

 $(IMGDISPLAY): w3mimgdisplay.o $(IMGOBJS)
 	$(CC) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o $(IMGOBJS) $(LDFLAGS) $(LIBS) $(IMGLDFLAGS)

 w3mimgdisplay.o: w3mimgdisplay.c
-	$(CC) $(CFLAGS) $(IMGCFLAGS) -c w3mimgdisplay.c
+	$(CC) $(CFLAGS) $(IMGCFLAGS) -c $<

 w3mimg/w3mimg.o: w3mimg/w3mimg.c
-	cd w3mimg && $(CC) $(CFLAGS) $(IMGCFLAGS) -I.. -c w3mimg.c
+	-@$(MKDIR) w3mimg
+	-@$(RM) -f $@
+	cd $(top_srcdir)/w3mimg && \
+		$(CC) $(CFLAGS) $(IMGCFLAGS) -I.. -c w3mimg.c
+	-@$(MV) $(top_srcdir)/w3mimg/w3mimg.o w3mimg/w3mimg.o

 w3mimg/x11/x11_w3mimg.o: w3mimg/x11/x11_w3mimg.c
-	cd w3mimg/x11 && $(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c x11_w3mimg.c
+	-@$(MKDIR) w3mimg/x11
+	-@$(RM) -f $@
+	cd $(top_srcdir)/w3mimg/x11 && \
+		$(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c x11_w3mimg.c
+	-@$(MV) $(top_srcdir)/w3mimg/x11/x11_w3mimg.o w3mimg/x11/x11_w3mimg.o

 w3mimg/fb/fb_w3mimg.o: w3mimg/fb/fb_w3mimg.c
-	cd w3mimg/fb && $(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c fb_w3mimg.c
+	-@$(MKDIR) w3mimg/fb
+	-@$(RM) -f $@
+	cd $(top_srcdir)/w3mimg/fb && \
+		$(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c fb_w3mimg.c
+	-@$(MV) $(top_srcdir)/w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb_w3mimg.o

 w3mimg/fb/fb.o: w3mimg/fb/fb.c
-	cd w3mimg/fb && $(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c fb.c
+	-@$(MKDIR) w3mimg/fb
+	-@$(RM) -f $@
+	cd $(top_srcdir)/w3mimg/fb && \
+		$(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c fb.c
+	-@$(MV) $(top_srcdir)/w3mimg/fb/fb.o w3mimg/fb/fb.o

 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 fb_img.c
+	-@$(MKDIR) w3mimg/fb
+	-@$(RM) -f $@
+	cd $(top_srcdir)/w3mimg/fb && \
+		$(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c fb_img.c
+	-@$(MV) $(top_srcdir)/w3mimg/fb/fb_img.o w3mimg/fb/fb_img.o

 install: install-core install-scripts

@@ -205,14 +227,14 @@ install-helpfile:
 all-scripts:
 	for dir in $(SCRIPTSUBDIRS);	\
 	do	\
-		(cd $$dir; $(MAKE) $(MAKE_ARGS)); \
+		(cd $(top_srcdir)/$$dir && $(MAKE) $(MAKE_ARGS)); \
 	done

 install-scripts: all-scripts
 	topdir=`pwd`; \
 	for dir in $(SCRIPTSUBDIRS);	\
 	do	\
-		(cd $$dir; $(MAKE) $(MAKE_ARGS) install); \
+		(cd $(top_srcdir)/$$dir && $(MAKE) $(MAKE_ARGS) install); \
 	done

 uninstall:
@@ -234,7 +256,7 @@ uninstall:
 	-$(RM) -f $(mandir)/ja/man1/$(MAN1_TARGET)
 	-for dir in $(SCRIPTSUBDIRS);	\
 	do	\
-		(cd $$dir; $(MAKE) $(MAKE_ARGS) uninstall); \
+		(cd $(top_srcdir)/$$dir && $(MAKE) $(MAKE_ARGS) uninstall); \
 	done

 clean: sweep
@@ -243,7 +265,7 @@ clean: sweep
 	-$(RM) -f w3mimg/*.o w3mimg/*/*.o 
 	-for dir in $(SCRIPTSUBDIRS);	\
 	do	\
-		(cd $$dir; $(MAKE) clean); \
+		(cd $(top_srcdir)/$$dir && $(MAKE) clean); \
 	done

 distclean: clean
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -5,8 +5,8 @@ dnl w3m autoconf macros
 # ----------------------------------------------------------------
 AC_DEFUN([AC_W3M_VERSION],
 [AC_SUBST(CURRENT_VERSION)
- cvsver=`$AWK '\$[1] ~ /Id:/ { print \$[3]}' ChangeLog`
- sed -e 's/define CURRENT_VERSION "\(.*\)+cvs/define CURRENT_VERSION "\1+cvs-'$cvsver'/' version.c.in > version.c
+ cvsver=`$AWK '\$[1] ~ /Id:/ { print \$[3]}' $srcdir/ChangeLog`
+ sed -e 's/define CURRENT_VERSION "\(.*\)+cvs/define CURRENT_VERSION "\1+cvs-'$cvsver'/' $srcdir/version.c.in > version.c
 CURRENT_VERSION=`sed -n 's/.*define CURRENT_VERSION *"w3m\/\(.*\)".*$/\1/p' version.c`])
 #
 # ----------------------------------------------------------------
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -17,8 +17,8 @@ dnl w3m autoconf macros
 # ----------------------------------------------------------------
 AC_DEFUN([AC_W3M_VERSION],
 [AC_SUBST(CURRENT_VERSION)
- cvsver=`$AWK '\$[1] ~ /Id:/ { print \$[3]}' ChangeLog`
- sed -e 's/define CURRENT_VERSION "\(.*\)+cvs/define CURRENT_VERSION "\1+cvs-'$cvsver'/' version.c.in > version.c
+ cvsver=`$AWK '\$[1] ~ /Id:/ { print \$[3]}' $srcdir/ChangeLog`
+ sed -e 's/define CURRENT_VERSION "\(.*\)+cvs/define CURRENT_VERSION "\1+cvs-'$cvsver'/' $srcdir/version.c.in > version.c
 CURRENT_VERSION=`sed -n 's/.*define CURRENT_VERSION *"w3m\/\(.*\)".*$/\1/p' version.c`])
 #
 # ----------------------------------------------------------------
--- a/299
+++ b/299
--- a/configure.in
+++ b/configure.in
@@ -23,7 +23,6 @@ AC_SUBST(EXEEXT)
 AC_SUBST(W3M_TARGET)
 W3M_TARGET=$target
 AC_DEFINE_UNQUOTED(W3M_TARGET, $W3M_TARGET)
-AC_W3M_VERSION

 AC_W3M_LANG
 AC_W3M_KANJI_SYMBOLS
@@ -124,4 +123,6 @@ AC_W3M_SYS_ERRLIST
 AC_W3M_SIGSETJMP
 AC_W3M_SIGNAL

+AC_W3M_VERSION
 AC_OUTPUT(Makefile w3mhelp-w3m_en.html w3mhelp-w3m_ja.html w3mhelp-lynx_en.html w3mhelp-lynx_ja.html)
+
--- a/mktable.c
+++ b/mktable.c
@@ -1,4 +1,4 @@
-/* $Id: mktable.c,v 1.11 2002/12/24 17:20:47 ukai Exp $ */
+/* $Id: mktable.c,v 1.12 2003/03/12 18:27:07 ukai Exp $ */
 #include <stdio.h>
 #include <stdlib.h>
 #include "myctype.h"
@@ -48,7 +48,10 @@ main(int argc, char *argv[], char **envp)
 	fprintf(stderr, "Can't open %s\n", argv[2]);
 	exit(1);
    }
-    fbase = Strnew_charp(argv[2]);
+    p = argv[2];
+    if (strrchr(p, '/') != NULL)
+	p = strrchr(p, '/')+1;
+    fbase = Strnew_charp(p);
    if (strchr(fbase->ptr, '.'))
 	while (Strlastchar(fbase) != '.')
 	    Strshrink(fbase, 1);