diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 58 | ||||
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | aclocal.m4 | 2 | ||||
| -rwxr-xr-x | configure | 143 | ||||
| -rw-r--r-- | configure.in | 28 | ||||
| -rw-r--r-- | libwc/.cvsignore | 1 | ||||
| -rw-r--r-- | libwc/Makefile.in (renamed from libwc/Makefile) | 19 | ||||
| -rw-r--r-- | scripts/.cvsignore | 1 | ||||
| -rw-r--r-- | scripts/Makefile.in (renamed from scripts/Makefile) | 69 | ||||
| -rw-r--r-- | scripts/multipart/.cvsignore | 1 | ||||
| -rw-r--r-- | scripts/multipart/Makefile | 50 | ||||
| -rw-r--r-- | scripts/multipart/Makefile.in | 68 | ||||
| -rw-r--r-- | scripts/w3mman/.cvsignore | 1 | ||||
| -rw-r--r-- | scripts/w3mman/Makefile.in (renamed from scripts/w3mman/Makefile) | 59 | ||||
| -rw-r--r-- | w3mimg/.cvsignore | 1 | ||||
| -rw-r--r-- | w3mimg/Makefile.in | 28 | ||||
| -rw-r--r-- | w3mimg/fb/.cvsignore | 1 | ||||
| -rw-r--r-- | w3mimg/fb/Makefile.in | 31 | ||||
| -rw-r--r-- | w3mimg/x11/.cvsignore | 1 | ||||
| -rw-r--r-- | w3mimg/x11/Makefile.in | 25 |
21 files changed, 440 insertions, 155 deletions
@@ -1,5 +1,9 @@ 2003-09-23 Fumitoshi UKAI <ukai@debian.or.jp> + * more autoconfisicate + +2003-09-23 Fumitoshi UKAI <ukai@debian.or.jp> + * merge m17n patch (w3m-0.4.1-m17n-20030308.patch.gz) * add libwc @@ -8034,4 +8038,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.864 2003/09/22 21:02:15 ukai Exp $ +$Id: ChangeLog,v 1.865 2003/09/22 22:53:52 ukai Exp $ diff --git a/Makefile.in b/Makefile.in index 2deb50c..1d8644f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,7 +27,7 @@ DESTDIR = CGIBIN_DIR = $(libexecdir)/$(package)/cgi-bin AUXBIN_DIR = $(libexecdir)/$(package) HELP_DIR = $(datadir)/$(package) -RC_DIR = ~/.$(package) +RC_DIR = @RC_DIR@ ETC_DIR = $(sysconfdir) CONF_DIR = $(sysconfdir)/$(package) @@ -111,6 +111,8 @@ HELP_ALLFILES=w3mhelp-w3m_en.html w3mhelp-w3m_ja.html \ SCRIPTSUBDIRS= scripts scripts/multipart scripts/w3mman SUBDIRS = $(SCRIPTSUBDIRS) +.PHONY: w3mimg libwc + all: $(TARGETS) all-scripts $(TARGET): $(ALLOBJS) $(ALIB) $(WCTARGET) @@ -159,55 +161,20 @@ $(INFLATE): inflate.o inflate.o: inflate.c $(CC) $(CFLAGS) -o $@ -c $(srcdir)/inflate.c -wctarget: - cd libwc; $(MAKE) \ - CC='$(CC)' CFLAGS='$(WCCFLAGS) $(CFLAGS)' \ - AR='$(AR)' \ - RANLIB='$(RANLIB)' +libwc: + (cd libwc && $(MAKE) CC='$(CC)' TOP_CFLAGS='$(CFLAGS)') dummy.o: entity.c $(CC) $(CFLAGS) -DDUMMY -c -o $@ $? -$(IMGDISPLAY): w3mimgdisplay.o $(IMGOBJS) +$(IMGDISPLAY): w3mimgdisplay.o w3mimg $(CC) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o $(IMGOBJS) $(LDFLAGS) $(LIBS) $(IMGLDFLAGS) -w3mimgdisplay.o: w3mimgdisplay.c +w3mimgdisplay.o: w3mimgdisplay.c w3mimg $(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c $(srcdir)/w3mimgdisplay.c -w3mimg/w3mimg.o: w3mimg/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 - -@$(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 - -@$(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 - -@$(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 - -@$(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 +w3mimg: + (cd w3mimg && $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)") install: install-core install-scripts @@ -280,10 +247,13 @@ 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 w3mimg libwc; \ + do \ + (cd $$dir && $(MAKE) clean RM="$(RM)"); \ + done -for dir in $(SCRIPTSUBDIRS); \ do \ - (cd $(top_srcdir)/$$dir && $(MAKE) clean); \ + (cd $$dir && $(MAKE) clean); \ done distclean: clean diff --git a/acinclude.m4 b/acinclude.m4 index a852215..7197634 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -158,7 +158,7 @@ if test x"$enable_m17n" = xno; then document_charset='WC_CES_US_ASCII' else AC_DEFINE(USE_M17N) - WCTARGET="wctarget" + WCTARGET="libwc" WCCFLAGS="-I. -I.." wcinclude="-I./libwc" wclib="-L./libwc -lwc" @@ -170,7 +170,7 @@ if test x"$enable_m17n" = xno; then document_charset='WC_CES_US_ASCII' else AC_DEFINE(USE_M17N) - WCTARGET="wctarget" + WCTARGET="libwc" WCCFLAGS="-I. -I.." wcinclude="-I./libwc" wclib="-L./libwc -lwc" @@ -308,7 +308,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os W3M_TARGET W3M_LIBS USE_M17N USE_UNICODE WCTARGET WCCFLAGS DISPLAY_CHARSET SYSTEM_CHARSET DOCUMENT_CHARSET USE_COLOR USE_ANSI_COLOR USE_BG_COLOR USE_IMAGE USE_W3MIMG_X11 USE_W3MIMG_FB W3MIMGDISPLAY_SETUID INSTALL_W3MIMGDISPLAY USE_GDKPIXBUF USE_IMLIB USE_IMLIB2 IMGOBJS IMGX11CFLAGS IMGX11LDFLAGS IMGFBCFLAGS IMGFBLDFLAGS USE_XFACE uncompface KEYMAP_FILE HELP_FILE KEYBIND USE_MENU USE_MOUSE USE_HISTORY USE_ALARM USE_COOKIE USE_DIGEST_AUTH USE_NNTP USE_GOPHER INET6 USE_DICT USE_HELP_CGI USE_EXTERNAL_URI_LOADER USE_W3MMAILER USE_MIGEMO DEF_MIGEMO_COMMAND DEF_EDITOR DEF_MAILER DEF_EXT_BROWSER USE_SSL USE_SSL_VERIFY USE_W3M USE_SYSMOUSE AUXBIN_TARGETS EGREP USE_BINMODE_STREAM HAVE_SYS_ERRLIST HAVE_SIGSETJMP RETSIGTYPE SIGNAL_RETURN CURRENT_VERSION LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS package W3M AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB PERL NKF MAN build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os W3M_TARGET W3M_LIBS USE_M17N USE_UNICODE WCTARGET WCCFLAGS DISPLAY_CHARSET SYSTEM_CHARSET DOCUMENT_CHARSET USE_COLOR USE_ANSI_COLOR USE_BG_COLOR USE_IMAGE USE_W3MIMG_X11 USE_W3MIMG_FB W3MIMGDISPLAY_SETUID INSTALL_W3MIMGDISPLAY USE_GDKPIXBUF USE_IMLIB USE_IMLIB2 IMGOBJS IMGX11CFLAGS IMGX11LDFLAGS IMGFBCFLAGS IMGFBLDFLAGS USE_XFACE uncompface KEYMAP_FILE HELP_FILE KEYBIND USE_MENU USE_MOUSE USE_HISTORY USE_ALARM USE_COOKIE USE_DIGEST_AUTH USE_NNTP USE_GOPHER INET6 USE_DICT USE_HELP_CGI USE_EXTERNAL_URI_LOADER USE_W3MMAILER USE_MIGEMO DEF_MIGEMO_COMMAND DEF_EDITOR DEF_MAILER DEF_EXT_BROWSER USE_SSL USE_SSL_VERIFY USE_W3M USE_SYSMOUSE AUXBIN_TARGETS EGREP USE_BINMODE_STREAM HAVE_SYS_ERRLIST HAVE_SIGSETJMP RETSIGTYPE SIGNAL_RETURN RC_DIR DOCDIRS CURRENT_VERSION LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1301,6 +1301,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + +package=w3m +cat >>confdefs.h <<\_ACEOF +#define package w3m +_ACEOF + + +W3M=w3m +cat >>confdefs.h <<\_ACEOF +#define W3M w3m +_ACEOF + + W3M_LANG=${LC_ALL:-$LANG} ac_config_headers="$ac_config_headers config.h" @@ -2712,6 +2725,96 @@ fi done test -n "$PERL" || PERL="/usr/local/bin/perl" +for ac_prog in nkf +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_NKF+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $NKF in + [\\/]* | ?:[\\/]*) + ac_cv_path_NKF="$NKF" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_NKF="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +NKF=$ac_cv_path_NKF + +if test -n "$NKF"; then + echo "$as_me:$LINENO: result: $NKF" >&5 +echo "${ECHO_T}$NKF" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$NKF" && break +done +test -n "$NKF" || NKF="/usr/local/bin/nkf" + +for ac_prog in man +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MAN+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $MAN in + [\\/]* | ?:[\\/]*) + ac_cv_path_MAN="$MAN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_MAN="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +MAN=$ac_cv_path_MAN + +if test -n "$MAN"; then + echo "$as_me:$LINENO: result: $MAN" >&5 +echo "${ECHO_T}$MAN" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$MAN" && break +done +test -n "$MAN" || MAN="/usr/bin/man" + # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 @@ -2847,7 +2950,7 @@ else #define USE_M17N 1 _ACEOF - WCTARGET="wctarget" + WCTARGET="libwc" WCCFLAGS="-I. -I.." wcinclude="-I./libwc" wclib="-L./libwc -lwc" @@ -7166,10 +7269,23 @@ _ACEOF fi +RC_DIR="~/.$package" +cat >>confdefs.h <<_ACEOF +#define RC_DIR "$RC_DIR" +_ACEOF + + +DOCDIRS="doc:en_English doc-jp:ja_Japanese" +cat >>confdefs.h <<_ACEOF +#define DOCDIRS "$DOCDIRS" +_ACEOF + + + 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` - ac_config_files="$ac_config_files Makefile w3mhelp-w3m_en.html w3mhelp-w3m_ja.html w3mhelp-lynx_en.html w3mhelp-lynx_ja.html" + ac_config_files="$ac_config_files Makefile scripts/Makefile scripts/dirlist.cgi scripts/w3mhelp.cgi scripts/w3mmail.cgi scripts/xface2xpm scripts/multipart/Makefile scripts/multipart/multipart.cgi scripts/w3mman/Makefile scripts/w3mman/w3mman scripts/w3mman/w3mman.1 scripts/w3mman/w3mman2html.cgi libwc/Makefile w3mimg/Makefile w3mimg/fb/Makefile w3mimg/x11/Makefile w3mhelp-w3m_en.html w3mhelp-w3m_ja.html w3mhelp-lynx_en.html w3mhelp-lynx_ja.html" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -7695,6 +7811,21 @@ do case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; + "scripts/dirlist.cgi" ) CONFIG_FILES="$CONFIG_FILES scripts/dirlist.cgi" ;; + "scripts/w3mhelp.cgi" ) CONFIG_FILES="$CONFIG_FILES scripts/w3mhelp.cgi" ;; + "scripts/w3mmail.cgi" ) CONFIG_FILES="$CONFIG_FILES scripts/w3mmail.cgi" ;; + "scripts/xface2xpm" ) CONFIG_FILES="$CONFIG_FILES scripts/xface2xpm" ;; + "scripts/multipart/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/multipart/Makefile" ;; + "scripts/multipart/multipart.cgi" ) CONFIG_FILES="$CONFIG_FILES scripts/multipart/multipart.cgi" ;; + "scripts/w3mman/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/w3mman/Makefile" ;; + "scripts/w3mman/w3mman" ) CONFIG_FILES="$CONFIG_FILES scripts/w3mman/w3mman" ;; + "scripts/w3mman/w3mman.1" ) CONFIG_FILES="$CONFIG_FILES scripts/w3mman/w3mman.1" ;; + "scripts/w3mman/w3mman2html.cgi" ) CONFIG_FILES="$CONFIG_FILES scripts/w3mman/w3mman2html.cgi" ;; + "libwc/Makefile" ) CONFIG_FILES="$CONFIG_FILES libwc/Makefile" ;; + "w3mimg/Makefile" ) CONFIG_FILES="$CONFIG_FILES w3mimg/Makefile" ;; + "w3mimg/fb/Makefile" ) CONFIG_FILES="$CONFIG_FILES w3mimg/fb/Makefile" ;; + "w3mimg/x11/Makefile" ) CONFIG_FILES="$CONFIG_FILES w3mimg/x11/Makefile" ;; "w3mhelp-w3m_en.html" ) CONFIG_FILES="$CONFIG_FILES w3mhelp-w3m_en.html" ;; "w3mhelp-w3m_ja.html" ) CONFIG_FILES="$CONFIG_FILES w3mhelp-w3m_ja.html" ;; "w3mhelp-lynx_en.html" ) CONFIG_FILES="$CONFIG_FILES w3mhelp-lynx_en.html" ;; @@ -7784,6 +7915,8 @@ s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t s,@LIBS@,$LIBS,;t t +s,@package@,$package,;t t +s,@W3M@,$W3M,;t t s,@AWK@,$AWK,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t @@ -7801,6 +7934,8 @@ s,@SET_MAKE@,$SET_MAKE,;t t s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@PERL@,$PERL,;t t +s,@NKF@,$NKF,;t t +s,@MAN@,$MAN,;t t s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t s,@build_vendor@,$build_vendor,;t t @@ -7872,6 +8007,8 @@ s,@HAVE_SYS_ERRLIST@,$HAVE_SYS_ERRLIST,;t t s,@HAVE_SIGSETJMP@,$HAVE_SIGSETJMP,;t t s,@RETSIGTYPE@,$RETSIGTYPE,;t t s,@SIGNAL_RETURN@,$SIGNAL_RETURN,;t t +s,@RC_DIR@,$RC_DIR,;t t +s,@DOCDIRS@,$DOCDIRS,;t t s,@CURRENT_VERSION@,$CURRENT_VERSION,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t diff --git a/configure.in b/configure.in index eae329b..9ce3943 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,13 @@ dnl w3m autoconf dnl Process this file with autoconf to produce a configure script. AC_INIT(fm.h) +AC_SUBST(package) +package=w3m +AC_DEFINE(package,w3m) +AC_SUBST(W3M) +W3M=w3m +AC_DEFINE(W3M, w3m) + W3M_LANG=${LC_ALL:-$LANG} dnl AM_INIT_AUTOMAKE(w3m, 0.4) AC_CONFIG_HEADER(config.h) @@ -14,6 +21,8 @@ AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_RANLIB AC_PATH_PROGS(PERL, perl, /usr/local/bin/perl) +AC_PATH_PROGS(NKF, nkf, /usr/local/bin/nkf) +AC_PATH_PROGS(MAN, man, /usr/bin/man) AC_CANONICAL_SYSTEM AC_CYGWIN @@ -124,6 +133,23 @@ AC_W3M_SYS_ERRLIST AC_W3M_SIGSETJMP AC_W3M_SIGNAL +AC_SUBST(RC_DIR) +RC_DIR="~/.$package" +AC_DEFINE_UNQUOTED(RC_DIR, "$RC_DIR") +AC_SUBST(DOCDIRS) +DOCDIRS="doc:en_English doc-jp:ja_Japanese" +AC_DEFINE_UNQUOTED(DOCDIRS, "$DOCDIRS") + AC_W3M_VERSION -AC_OUTPUT(Makefile w3mhelp-w3m_en.html w3mhelp-w3m_ja.html w3mhelp-lynx_en.html w3mhelp-lynx_ja.html) +AC_OUTPUT(Makefile \ +scripts/Makefile scripts/dirlist.cgi \ +scripts/w3mhelp.cgi \ +scripts/w3mmail.cgi scripts/xface2xpm \ +scripts/multipart/Makefile scripts/multipart/multipart.cgi \ +scripts/w3mman/Makefile scripts/w3mman/w3mman scripts/w3mman/w3mman.1 \ +scripts/w3mman/w3mman2html.cgi \ +libwc/Makefile \ +w3mimg/Makefile w3mimg/fb/Makefile w3mimg/x11/Makefile \ +w3mhelp-w3m_en.html w3mhelp-w3m_ja.html \ +w3mhelp-lynx_en.html w3mhelp-lynx_ja.html) diff --git a/libwc/.cvsignore b/libwc/.cvsignore new file mode 100644 index 0000000..f3c7a7c --- /dev/null +++ b/libwc/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/libwc/Makefile b/libwc/Makefile.in index 283aee8..9c57769 100644 --- a/libwc/Makefile +++ b/libwc/Makefile.in @@ -1,10 +1,15 @@ +@SET_MAKE@ +SHELL=@SHELL@ +srcdir=@srcdir@ +top_srcdir=@top_srcdir@ +VPATH=$(srcdir):. LIBRARY = libwc.a -CC = cc -CPPFLAGS = -I. -I.. -I../gc/include -CFLAGS = -g -O -Wall -DUSE_UNICODE $(CPPFLAGS) -AR = ar -RANLIB = ranlib +CC=@CC@ +CFLAGS = $(TOP_CFLAGS) @WCCFLAGS@ +AR=ar +RANLIB=@RANLIB@ +RM=rm SRCS = big5.c \ ces.c \ @@ -157,3 +162,7 @@ viet.o: wc.h wc_types.h ces.h ccs.h iso2022.h priv.h viet.h wtf.h search.h \ ucs.h map/tcvn57123_tcvn5712.map wtf.o: wc.h wc_types.h ces.h ccs.h iso2022.h priv.h wtf.h sjis.h big5.h \ hkscs.h johab.h jis.h viet.h gbk.h gb18030.h uhc.h ucs.h utf8.h + +clean: + @-$(RM) -f *.o + diff --git a/scripts/.cvsignore b/scripts/.cvsignore index 443fc0c..67b6dc8 100644 --- a/scripts/.cvsignore +++ b/scripts/.cvsignore @@ -6,3 +6,4 @@ w3mhelp-funcdesc.ja.pl w3mhelp-funcname.pl w3mhelp-funcdesc-stamp xface2xpm +Makefile diff --git a/scripts/Makefile b/scripts/Makefile.in index 9770423..2a3ea54 100644 --- a/scripts/Makefile +++ b/scripts/Makefile.in @@ -1,37 +1,47 @@ +@SET_MAKE@ +SHELL=@SHELL@ +srcidr=@srcdir@ +top_srcdir=@top_srcdir@ +VPATH= $(srcdir):. +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +datadir = @datadir@ +libdir = @libdir@ +includedir = @includedir@ +infodir = @infodir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +top_srcdir = @top_srcdir@ +VPATH = $(top_srcdir):. +DESTDIR = -prefix = /usr/local -DESTDIR = -BIN_DIR = $(prefix)/bin -AUXBIN_DIR = $(prefix)/lib/w3m -LIB_DIR = $(prefix)/lib/w3m/cgi-bin -HELP_DIR = $(prefix)/share/w3m -RC_DIR = ~/.w3m +CGIBIN_DIR = $(libexecdir)/$(package)/cgi-bin +AUXBIN_DIR = $(libexecdir)/$(package) +HELP_DIR = $(datadir)/$(package) +RC_DIR = ~/.$(package) +ETC_DIR = $(sysconfdir) +CONF_DIR = $(sysconfdir)/$(package) AUXBIN_TARGETS = xface2xpm LIB_TARGETS = dirlist.cgi w3mhelp.cgi w3mmail.cgi HELP_TARGETS = w3mhelp-funcname.pl w3mhelp-funcdesc-stamp MKDIR = mkdir -p -INSTALL = install -c -INSTALL_SCRIPT = $(INSTALL) -m 755 -INSTALL_DATA = $(INSTALL) -m 644 +INSTALL = @INSTALL@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_DATA = @INSTALL_DATA@ -PERL = /usr/local/bin/perl - -DOCDIRS = doc:en_English doc-jp:ja_Japanese - -.SUFFIXES: .in +PERL = @PERL@ all: $(LIB_TARGETS) $(AUXBIN_TARGETS) $(HELP_TARGETS) -.in: - @echo "generating $@..." - @sed -e 's%@PERL@%$(PERL)%' -e 's%@HELP_DIR@%$(HELP_DIR)%' \ - -e 's%@DOCDIRS@%$(DOCDIRS)%' \ - -e 's%@RC_DIR@%$(RC_DIR)%' $< > $@ - @chmod +x $@ - @echo done - w3mhelp-funcname.pl: w3mhelp-funcname.pl.in ../funcname.tab ../doc/keymap.default ../doc/keymap.lynx @echo "generating w3mhelp-funcname.pl..." @echo '%funcname = (' > w3mhelp-funcname.pl @@ -89,4 +99,15 @@ uninstall: done clean: - -rm -f $(LIB_TARGETS) $(AUXBIN_TARGETS) $(HELP_TARGETS) w3mhelp-*.pl + -rm -f $(HELP_TARGETS) w3mhelp-*.pl + -for dir in multipart w3mman; \ + do \ + cd $$dir && $(MAKE) clean; \ + done + +distclean: + -rm -f $(LIB_TARGETS) $(AUXBIN_TARGETS) + -for dir in multipart w3mman; \ + do \ + cd $$dir && $(MAKE) distclean; \ + done
\ No newline at end of file diff --git a/scripts/multipart/.cvsignore b/scripts/multipart/.cvsignore index 854855c..db1dff2 100644 --- a/scripts/multipart/.cvsignore +++ b/scripts/multipart/.cvsignore @@ -1 +1,2 @@ multipart.cgi +Makefile diff --git a/scripts/multipart/Makefile b/scripts/multipart/Makefile deleted file mode 100644 index d01b9a8..0000000 --- a/scripts/multipart/Makefile +++ /dev/null @@ -1,50 +0,0 @@ - -prefix = /usr/local -BIN_DIR = $(prefix)/bin -LIB_DIR = $(prefix)/lib/w3m/cgi-bin -DESTDIR = -distdir = ./distfiles - -LIB_TARGETS = multipart.cgi - -MKDIR = mkdir -p -INSTALL = install -c -INSTALL_SCRIPT = $(INSTALL) -m 755 - -PERL = /usr/local/bin/perl -NKF = nkf - -.SUFFIXES: .in - -all: $(LIB_TARGETS) - -.in: - sed -e 's%@PERL@%$(PERL)%g' \ - -e 's%@NKF@%$(NKF)%g' \ - $< > $@ - chmod +x $@ - -install: $(LIB_TARGETS) - -$(MKDIR) $(DESTDIR)$(LIB_DIR) - for file in $(LIB_TARGETS); \ - do \ - $(INSTALL_SCRIPT) $$file $(DESTDIR)$(LIB_DIR); \ - done - -uninstall: - -for file in $(LIB_TARGETS); \ - do \ - rm -f $(LIB_DIR)/$$file; \ - done - -clean: - -rm -f $(LIB_TARGETS) - -dist: all - @-rm -fr $(distdir)/multipart - $(MKDIR) $(distdir)/multipart - cp Makefile README multipart.cgi.in $(distdir)/multipart - ( cd $(distdir); tar -cf - multipart | GZIP='' gzip ) \ - > $(distdir)/multipart.tar.gz - -rm -fr $(distdir)/multipart - diff --git a/scripts/multipart/Makefile.in b/scripts/multipart/Makefile.in new file mode 100644 index 0000000..e153264 --- /dev/null +++ b/scripts/multipart/Makefile.in @@ -0,0 +1,68 @@ +@SET_MAKE@ +SHELL=@SHELL@ +srcidr=@srcdir@ +top_srcdir=@top_srcdir@ +VPATH= $(srcdir):. +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +datadir = @datadir@ +libdir = @libdir@ +includedir = @includedir@ +infodir = @infodir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +top_srcdir = @top_srcdir@ +VPATH = $(top_srcdir):. +DESTDIR = + +CGIBIN_DIR = $(libexecdir)/$(package)/cgi-bin +AUXBIN_DIR = $(libexecdir)/$(package) +HELP_DIR = $(datadir)/$(package) +RC_DIR = ~/.$(package) +ETC_DIR = $(sysconfdir) +CONF_DIR = $(sysconfdir)/$(package) + +LIB_TARGETS = multipart.cgi + +MKDIR = mkdir -p +INSTALL = @INSTALL@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ + +PERL = @PERL@ +NKF = @NKF@ + +all: $(LIB_TARGETS) + +install: $(LIB_TARGETS) + -$(MKDIR) $(DESTDIR)$(LIB_DIR) + for file in $(LIB_TARGETS); \ + do \ + $(INSTALL_SCRIPT) $$file $(DESTDIR)$(LIB_DIR); \ + done + +uninstall: + -for file in $(LIB_TARGETS); \ + do \ + rm -f $(LIB_DIR)/$$file; \ + done + +clean: + +distclean: + -rm -f $(LIB_TARGETS) + +dist: all + @-rm -fr $(distdir)/multipart + $(MKDIR) $(distdir)/multipart + cp Makefile README multipart.cgi.in $(distdir)/multipart + ( cd $(distdir); tar -cf - multipart | GZIP='' gzip ) \ + > $(distdir)/multipart.tar.gz + -rm -fr $(distdir)/multipart + diff --git a/scripts/w3mman/.cvsignore b/scripts/w3mman/.cvsignore index 090cd50..e867c6e 100644 --- a/scripts/w3mman/.cvsignore +++ b/scripts/w3mman/.cvsignore @@ -2,3 +2,4 @@ w3mman w3mman2html.cgi w3mman.1 +Makefile diff --git a/scripts/w3mman/Makefile b/scripts/w3mman/Makefile.in index 6bf7b4c..c2c57e7 100644 --- a/scripts/w3mman/Makefile +++ b/scripts/w3mman/Makefile.in @@ -1,11 +1,33 @@ +@SET_MAKE@ +SHELL=@SHELL@ +srcidr=@srcdir@ +top_srcdir=@top_srcdir@ +VPATH= $(srcdir):. +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +datadir = @datadir@ +libdir = @libdir@ +includedir = @includedir@ +infodir = @infodir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +top_srcdir = @top_srcdir@ +VPATH = $(top_srcdir):. +DESTDIR = -prefix = /usr/local -BIN_DIR = $(prefix)/bin -LIB_DIR = $(prefix)/lib/w3m/cgi-bin -MAN_DIR = $(prefix)/man -MAN1_DIR = $(MAN_DIR)/man1 -DESTDIR = -distdir = ./distfiles +CGIBIN_DIR = $(libexecdir)/$(package)/cgi-bin +AUXBIN_DIR = $(libexecdir)/$(package) +HELP_DIR = $(datadir)/$(package) +RC_DIR = ~/.$(package) +ETC_DIR = $(sysconfdir) +CONF_DIR = $(sysconfdir)/$(package) TARGETS = w3mman LIB_TARGETS = w3mman2html.cgi @@ -13,27 +35,12 @@ MAN1_TARGETS = w3mman.1 MAN_TARGETS = $(MAN1_TARGETS) MKDIR = mkdir -p -INSTALL = install -c -INSTALL_SCRIPT = $(INSTALL) -m 755 -INSTALL_MAN = $(INSTALL) -m 644 - -PERL = /usr/local/bin/perl -W3M = w3m -# W3M = w3m -X -o confirm_qq=0 -MAN = man - -.SUFFIXES: .in +INSTALL = @INSTALL@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_MAN = @INSTALL_MAN@ all: $(TARGETS) $(LIB_TARGETS) $(MAN_TARGETS) -.in: - sed -e 's%@PERL@%$(PERL)%g' \ - -e 's%@W3M@%$(W3M)%g' \ - -e 's%@MAN@%$(MAN)%g' \ - -e 's%@LIB_DIR@%$(LIB_DIR)%g' \ - $< > $@ - chmod +x $@ - install: $(TARGETS) $(LIB_TARGETS) $(MAN_TARGETS) -$(MKDIR) $(DESTDIR)$(BIN_DIR) -$(MKDIR) $(DESTDIR)$(LIB_DIR) @@ -66,6 +73,8 @@ uninstall: done clean: + +distclean: -rm -f $(TARGETS) $(LIB_TARGETS) $(MAN_TARGETS) dist: all diff --git a/w3mimg/.cvsignore b/w3mimg/.cvsignore new file mode 100644 index 0000000..f3c7a7c --- /dev/null +++ b/w3mimg/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/w3mimg/Makefile.in b/w3mimg/Makefile.in new file mode 100644 index 0000000..ad327c2 --- /dev/null +++ b/w3mimg/Makefile.in @@ -0,0 +1,28 @@ +# +# w3mimg/Makefile +# +@SET_MAKE@ +SHELL=@SHELL@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = $(srcdir):. +RM=rm + +IMGCFLAGS=@IMGX11CFLAGS@ @IMGFBCFLAGS@ + +.PHONY: fb x11 +all: w3mimg.o fb x11 + +w3mimg.o: w3mimg.c + $(CC) $(CFLAGS) $(IMGCFLAGS) -I$(top_srcdir) -c $< + +fb x11: + cd $@ && $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" + +clean: + @-$(RM) -f *.o + @for dir in fb x11; do \ + (cd $$dir && $(MAKE) clean RM=$(RM)); \ + done + +# diff --git a/w3mimg/fb/.cvsignore b/w3mimg/fb/.cvsignore new file mode 100644 index 0000000..f3c7a7c --- /dev/null +++ b/w3mimg/fb/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/w3mimg/fb/Makefile.in b/w3mimg/fb/Makefile.in new file mode 100644 index 0000000..2fbc9db --- /dev/null +++ b/w3mimg/fb/Makefile.in @@ -0,0 +1,31 @@ +# +# w3mimg/fb/Makefile +# +# +@SET_MAKE@ +SHELL=@SHELL@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = $(srcdir):. +RM=rm + +IMGCFLAGS=@IMGFBCFLAGS@ +OBJS=fb.o fb_img.o + +all: fb_w3mimg.o fb.o fb_img.o + +fb_w3mimg.o: fb_w3mimg.c + $(CC) $(CFLAGS) $(IMGCFLAGS) -I$(top_srcdir) -c $< + +fb.o: fb.c + $(CC) $(CFLAGS) $(IMGCFLAGS) -I$(top_srcdir) -c $< + +fb_img.o: fb_img.c fb_gdkpixbuf.c fb_imlib2.c + $(CC) $(CFLAGS) $(IMGCFLAGS) -I$(top_srcdir) -c $< + +clean: + @-$(RM) -f *.o + +# + + diff --git a/w3mimg/x11/.cvsignore b/w3mimg/x11/.cvsignore new file mode 100644 index 0000000..f3c7a7c --- /dev/null +++ b/w3mimg/x11/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/w3mimg/x11/Makefile.in b/w3mimg/x11/Makefile.in new file mode 100644 index 0000000..ae8da91 --- /dev/null +++ b/w3mimg/x11/Makefile.in @@ -0,0 +1,25 @@ +# +# w3mimg/x11/Makefile +# +# +@SET_MAKE@ +SHELL=@SHELL@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = $(srcdir):. +RM=rm + +IMGCFLAGS=@IMGX11CFLAGS@ +OBJS=x11_w3mimg.o + +all: x11_w3mimg.o + +x11_w3mimg.o: x11_w3mimg.c + $(CC) $(CFLAGS) $(IMGCFLAGS) -I$(top_srcdir) -c $< + +clean: + @-$(RM) -f *.o + +# + + |