commit b294e4d2737d27f51b9b12acf9b72da1c38fcbff
parent 6c4c594c2addd60648d120e2c34d73550d2c65c6
Author: ukai <ukai>
Date: Tue, 20 Nov 2001 08:43:40 +0000
remove XXMakefile config.h
config.h is moved to config.h.dist
Diffstat:
| M | ChangeLog | | | 6 | ++++++ |
| D | XXMakefile | | | 145 | ------------------------------------------------------------------------------- |
| D | config.h | | | 231 | ------------------------------------------------------------------------------- |
| A | config.h.dist | | | 232 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
4 files changed, 238 insertions(+), 376 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-20 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * XXMakefile config.h: removed from CVS
+ these are autogenerated files.
+ config.h is moved to config.h.dist as sample config file.
+
2001-11-20 Tsutomu Okada <okada@furuno.co.jp>
* file.c (HTMLtagproc1): reimplement meta refresh with
diff --git a/XXMakefile b/XXMakefile
@@ -1,145 +0,0 @@
-#ifdef makefile_parameter
-
-BIN_DIR = /usr/local/bin
-HELP_DIR = /usr/local/lib/w3m
-LIB_DIR = /usr/local/lib/w3m
-HELP_FILE = w3mhelp-w3m_ja.html
-SYS_LIBRARIES = -lgpm -lbsd -lnsl -lncurses -L/usr/lib -L/usr/lib -L/usr/local/ssl/lib -L/usr/local/ssl/lib -lssl -lcrypto
-LOCAL_LIBRARIES =
-CC = gcc
-MYCFLAGS = -O -I./gc/include -I/usr/local/ssl/include/openssl -I/usr/local/ssl/include
-GCCFLAGS = -O -I./gc/include -I./$(srcdir)/include -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DSILENT -DALL_INTERIOR_POINTERS
-KEYBIND_SRC = keybind.c
-KEYBIND_OBJ = keybind.o
-EXT=
-MATHLIB=-lm
-Z_CFLAGS=-I/usr/include
-ZLIB=-L/usr/lib -lz
-EXT_TARGETS=$(BOOKMARKER) $(HELPER) $(INFLATE)
-GC_CFLAGS=
-GCLIB=gc/gc.a
-GCTARGET=gc/gc.a
-RANLIB=ranlib
-MKDIR=mkdir -p
-VERSION=0.2.1-inu-1.5
-MODEL=Linux.i686-monster-ja
-#else
-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\
- func.c cookie.c history.c backend.c $(KEYBIND_SRC)
-OBJS=main.o file.o buffer.o display.o etc.o search.o linein.o table.o local.o\
- form.o map.o frame.o rc.o menu.o mailcap.o\
- func.o cookie.o history.o backend.o $(KEYBIND_OBJ)
-LSRCS=terms.c conv.c url.c ftp.c anchor.c mimehead.c parsetagx.c\
- tagtable.c istream.c
-LOBJS=terms.o conv.o url.o ftp.o anchor.o mimehead.o parsetagx.o\
- tagtable.o istream.o
-LLOBJS=version.o
-ALIBOBJS=Str.o indep.o regex.o textlist.o parsetag.o myctype.o entity.o hash.o
-ALIB=libindep.a
-ALLOBJS=$(OBJS) $(LOBJS) $(LLOBJS)
-
-TARGET=w3m$(EXT)
-BOOKMARKER=w3mbookmark$(EXT)
-HELPER=w3mhelperpanel$(EXT)
-INFLATE=inflate$(EXT)
-TARGETS=$(TARGET) $(EXT_TARGETS)
-
-INCLUDES=-I.
-
-DEFS=$(INCLUDES) # -DDEBUG
-CFLAGS=$(MYCFLAGS) $(DEFS)
-LIBS=-L. -lindep $(GCLIB) $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
-INSTALL=sh install.sh
-INSTALL2=sh ../install.sh
-AR=ar
-
-all: $(TARGETS)
-
-$(TARGET): $(ALLOBJS) $(ALIB) $(GCTARGET)
- $(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
-
-$(ALIB): $(ALIBOBJS)
- $(AR) rv $(ALIB) $(ALIBOBJS)
- $(RANLIB) $(ALIB)
-
-$(OBJS): fm.h funcname1.h
-
-tagtable.c: html.h tagtable.tab mktable$(EXT)
- ./mktable$(EXT) 100 tagtable.tab > tagtable.c
-
-# entity.h: html.h entity.tab mktable$(EXT)
-# ./mktable 100 entity.tab > entity.h
-
-func.o: funcname.c
-keybind.o: funcname2.h
-keybind_lynx.o: funcname2.h
-parsetagx.o: html.c
-
-funcname.c: funcname.tab
- sort funcname.tab | awk -f funcname0.awk > funcname.c
-
-funcname1.h: funcname.tab
- awk -f funcname1.awk funcname.tab > funcname1.h
-
-funcname2.h: funcname.tab
- awk -f funcname2.awk funcname.tab > funcname2.h
-
-mktable$(EXT): mktable.o hash.o $(ALIB) $(GCTARGET)
- $(CC) $(CFLAGS) -o mktable$(EXT) mktable.o hash.o $(LIBS)
-
-$(BOOKMARKER): w3mbookmark.o $(ALIB) $(GCTARGET)
- $(CC) $(CFLAGS) -o $(BOOKMARKER) w3mbookmark.o $(LIBS)
-
-$(HELPER): w3mhelperpanel.o $(ALIB) $(GCTARGET)
- $(CC) $(CFLAGS) -o $(HELPER) w3mhelperpanel.o $(LIBS)
-
-$(INFLATE): inflate.o
- $(CC) $(CFLAGS) $(Z_CFLAGS) -o $(INFLATE) inflate.o $(ZLIB)
-
-inflate.o: inflate.c
- $(CC) $(CFLAGS) $(Z_CFLAGS) -c inflate.c
-
-gc/gc.a:
- cd gc; make CC='$(CC)' CFLAGS='$(GCCFLAGS) $(GC_CFLAGS)' SPECIALCFLAGS='-I./\$(srcdir)/include $(GC_CFLAGS)'
-
-install: $(TARGETS)
- -$(MKDIR) $(DESTDIR)$(BIN_DIR)
- -$(MKDIR) $(DESTDIR)$(HELP_DIR)
- -$(MKDIR) $(DESTDIR)$(LIB_DIR)
- $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
- $(INSTALL) -m 644 w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html
- $(INSTALL) -m 644 w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_ja.html
- $(INSTALL) -m 644 w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
- $(INSTALL) -m 644 w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_ja.html
- $(INSTALL) -m 644 $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
- for d in $(EXT_TARGETS); do $(INSTALL) -m 755 $$d $(DESTDIR)$(LIB_DIR)/$$d; done
- (cd scripts; for i in *.cgi; do $(INSTALL2) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done)
-
-uninstall:
- -$(RM) $(BIN_DIR)/$(TARGET)
- -$(RM) $(HELP_DIR)/w3mhelp-lynx_en.html
- -$(RM) $(HELP_DIR)/w3mhelp-lynx_ja.html
- -$(RM) $(HELP_DIR)/w3mhelp-w3m_en.html
- -$(RM) $(HELP_DIR)/w3mhelp-w3m_ja.html
- -$(RM) $(HELP_DIR)/w3mhelp.html
- -$(RM) $(LIB_DIR)/$(BOOKMARKER)
- -$(RM) $(LIB_DIR)/$(HELPER)
- -$(RM) $(LIB_DIR)/$(INFLATE)
-
-clean: sweep
- rm -f *.o *.a $(TARGETS) mktable$(EXT)
-
-sweep:
- -rm -f core *~ *.bak *.orig *.rej
-
-depend:
- makedepend $(CFLAGS) *.c
-
-dist:
- cd ..; mv w3m w3m-$(VERSION); tar cvfz w3m-$(VERSION).tar.gz w3m-$(VERSION); mv w3m-$(VERSION) w3m
-
-bindist:
- cd ..; mv w3m w3m-$(VERSION); tar cvfz w3m-$(VERSION)-$(MODEL).tar.gz w3m-$(VERSION)/{w3m*,doc*,Bonus*,README,scripts}; mv w3m-$(VERSION) w3m
-
-# DO NOT DELETE
diff --git a/config.h b/config.h
@@ -1,231 +0,0 @@
-/*
- * Configuration for w3m
- */
-
-#ifndef _CONFIGURED_
-#define _CONFIGURED_
-
-/* User Configuration */
-
-/*
- If you define DICT, you can use dictionary look-up function
- in w3m. See README.dict for detail.
-*/
-#undef DICT
-
-/*
- If you define USE_MARK, you can use set-mark (C-SPC),
- goto-next-mark (ESC p), goto-next-mark (ESC n) and
- mark-by-regexp (").
-*/
-#undef USE_MARK
-
-/*
- If you want to load and save URL history.
- */
-#define USE_HISTORY
-
-/*
- BG_COLOR enables w3m to set background color.
- */
-#define BG_COLOR
-
-/*
- VIEW_UNSEENOBJECTS enables w3m to make a link to unseen objects.
- e.g. background image.
- */
-#undef VIEW_UNSEENOBJECTS
-
-/*
- VI_PREC_NUM enables vi-like behavior for '2 SPC' or '2 b'
- */
-#undef VI_PREC_NUM
-
-/*
- * Do word fill
- */
-#undef FORMAT_NICE
-
-/*
- * Support Gopher protocol
- */
-#undef USE_GOPHER
-
-/*
- * Support NNTP
- */
-#undef USE_NNTP
-
-/*
- * Support ANSI color escape sequences
- */
-#undef ANSI_COLOR
-
-/*
- * Enable id attribute
- */
-#define ID_EXT
-
-/*
- * Save Current-buffer Information
- */
-#define BUFINFO
-
-/*
- * Support EGD (Entropy Gathering Daemon)
- */
-#undef USE_EGD
-
-/*
- * Use Emacs-like key binding for file name completion
- */
-#undef EMACS_LIKE_LINEEDIT
-
-/*
- * Remove line trailing spaces in html buffer.
- */
-#undef ENABLE_REMOVE_TRAILINGSPACES
-
-/*
- * Move cursor to top line when going to label.
- */
-#undef LABEL_TOPLINE
-
-/*
- * Move cursor to top line when moving to next page.
- */
-#undef NEXTPAGE_TOPLINE
-
-/**********************************************************/
-#ifdef makefile_parameter
-
-BIN_DIR = /usr/local/bin
-HELP_DIR = /usr/local/lib/w3m
-LIB_DIR = /usr/local/lib/w3m
-HELP_FILE = w3mhelp-w3m_ja.html
-SYS_LIBRARIES = -lgpm -lbsd -lnsl -lncurses -L/usr/lib -L/usr/lib -L/usr/local/ssl/lib -L/usr/local/ssl/lib -lssl -lcrypto
-LOCAL_LIBRARIES =
-CC = gcc
-MYCFLAGS = -O -I./gc/include -I/usr/local/ssl/include/openssl -I/usr/local/ssl/include
-GCCFLAGS = -O -I./gc/include -I./$(srcdir)/include -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DSILENT -DALL_INTERIOR_POINTERS
-KEYBIND_SRC = keybind.c
-KEYBIND_OBJ = keybind.o
-EXT=
-MATHLIB=-lm
-Z_CFLAGS=-I/usr/include
-ZLIB=-L/usr/lib -lz
-EXT_TARGETS=$(BOOKMARKER) $(HELPER) $(INFLATE)
-GC_CFLAGS=
-GCLIB=gc/gc.a
-GCTARGET=gc/gc.a
-RANLIB=ranlib
-MKDIR=mkdir -p
-VERSION=0.2.1-inu-1.5
-MODEL=Linux.i686-monster-ja
-#else
-
-
-#define DISPLAY_CODE 'E'
-#define SYSTEM_CODE 'E'
-
-#define JA 0
-#define EN 1
-#define LANG JA
-#define KANJI_SYMBOLS
-#define COLOR
-#define MOUSE
-#define USE_GPM
-#undef USE_SYSMOUSE
-#define MENU
-#define USE_COOKIE
-#define USE_SSL
-#undef USE_SSL_VERIFY
-#undef FTPPASS_HOSTNAMEGEN
-#undef SHOW_PARAMS
-
-#define DEF_EDITOR "/bin/vi"
-#define DEF_MAILER "/bin/mail"
-#define DEF_EXT_BROWSER "/usr/bin/netscape"
-
-#define LIB_DIR "/usr/local/lib/w3m"
-#define HELP_DIR "/usr/local/lib/w3m"
-#define HELP_FILE "w3mhelp.html"
-#define W3MCONFIG "w3mconfig"
-
-#define RC_DIR "~/.w3m/"
-#define BOOKMARK "bookmark.html"
-#define CONFIG_FILE "config"
-#define KEYMAP_FILE "keymap"
-#define MENU_FILE "menu"
-#define COOKIE_FILE "cookie"
-#define HISTORY_FILE "history"
-
-#define USER_MAILCAP RC_DIR "/mailcap"
-#define SYS_MAILCAP "/etc/mailcap"
-#define USER_MIMETYPES "~/.mime.types"
-#define SYS_MIMETYPES "/usr/local/lib/mime.types"
-
-#define DEF_SAVE_FILE "index.html"
-
-#undef USE_BINMODE_STREAM
-#define HAVE_TERMIOS_H
-#define HAVE_DIRENT_H
-#define HAVE_STRCASECMP
-#define HAVE_STRCHR
-#define HAVE_STRERROR
-#define HAVE_SYS_ERRLIST
-#define HAVE_BCOPY
-#define HAVE_WAITPID
-#define HAVE_WAIT3
-#define HAVE_STRFTIME
-
-#define HAVE_GETCWD
-#define HAVE_GETWD
-#define HAVE_READLINK
-#define HAVE_SETENV
-#define HAVE_PUTENV
-#define HAVE_SRAND48
-#define HAVE_SRANDOM
-
-#define SETJMP(env) sigsetjmp(env,1)
-#define LONGJMP(env,val) siglongjmp(env,val)
-#define JMP_BUF sigjmp_buf
-
-typedef void MySignalHandler;
-#define SIGNAL_ARG int _dummy
-#define SIGNAL_ARGLIST 0
-#define SIGNAL_RETURN return
-#define HAVE_SETPGRP
-
-/*
- If you want to use IPv6, define this symbol.
- */
-#undef INET6
-
-
-#undef TABLE_EXPAND
-#undef TABLE_NO_COMPACT
-#define NOWRAP 1
-#define MATRIX 1
-#define HAVE_FLOAT_H
-
-#ifndef HAVE_SRAND48
-#ifdef HAVE_SRANDOM
-#define srand48 srandom
-#define lrand48 random
-#else /* HAVE_SRANDOM */
-#define USE_INCLUDED_SRAND48
-#endif /* HAVE_SRANDOM */
-#endif
-
-#if defined( __CYGWIN32__ ) && !defined( __CYGWIN__ )
-#define __CYGWIN__
-#endif
-
-#if defined( __CYGWIN__ ) || defined( __EMX__ )
-#define SUPPORT_DOS_DRIVE_PREFIX 1
-#endif
-
-#endif /* makefile_parameter */
-#endif /* _CONFIGURED_ */
-
diff --git a/config.h.dist b/config.h.dist
@@ -0,0 +1,232 @@
+/*
+ * Configuration for w3m
+ * This is sample. ./configure will generate config.h for you.
+ */
+
+#ifndef _CONFIGURED_
+#define _CONFIGURED_
+
+/* User Configuration */
+
+/*
+ If you define DICT, you can use dictionary look-up function
+ in w3m. See README.dict for detail.
+*/
+#undef DICT
+
+/*
+ If you define USE_MARK, you can use set-mark (C-SPC),
+ goto-next-mark (ESC p), goto-next-mark (ESC n) and
+ mark-by-regexp (").
+*/
+#undef USE_MARK
+
+/*
+ If you want to load and save URL history.
+ */
+#define USE_HISTORY
+
+/*
+ BG_COLOR enables w3m to set background color.
+ */
+#define BG_COLOR
+
+/*
+ VIEW_UNSEENOBJECTS enables w3m to make a link to unseen objects.
+ e.g. background image.
+ */
+#undef VIEW_UNSEENOBJECTS
+
+/*
+ VI_PREC_NUM enables vi-like behavior for '2 SPC' or '2 b'
+ */
+#undef VI_PREC_NUM
+
+/*
+ * Do word fill
+ */
+#undef FORMAT_NICE
+
+/*
+ * Support Gopher protocol
+ */
+#undef USE_GOPHER
+
+/*
+ * Support NNTP
+ */
+#undef USE_NNTP
+
+/*
+ * Support ANSI color escape sequences
+ */
+#undef ANSI_COLOR
+
+/*
+ * Enable id attribute
+ */
+#define ID_EXT
+
+/*
+ * Save Current-buffer Information
+ */
+#define BUFINFO
+
+/*
+ * Support EGD (Entropy Gathering Daemon)
+ */
+#undef USE_EGD
+
+/*
+ * Use Emacs-like key binding for file name completion
+ */
+#undef EMACS_LIKE_LINEEDIT
+
+/*
+ * Remove line trailing spaces in html buffer.
+ */
+#undef ENABLE_REMOVE_TRAILINGSPACES
+
+/*
+ * Move cursor to top line when going to label.
+ */
+#undef LABEL_TOPLINE
+
+/*
+ * Move cursor to top line when moving to next page.
+ */
+#undef NEXTPAGE_TOPLINE
+
+/**********************************************************/
+#ifdef makefile_parameter
+
+BIN_DIR = /usr/local/bin
+HELP_DIR = /usr/local/lib/w3m
+LIB_DIR = /usr/local/lib/w3m
+HELP_FILE = w3mhelp-w3m_ja.html
+SYS_LIBRARIES = -lgpm -lbsd -lnsl -lncurses -L/usr/lib -L/usr/lib -L/usr/local/ssl/lib -L/usr/local/ssl/lib -lssl -lcrypto
+LOCAL_LIBRARIES =
+CC = gcc
+MYCFLAGS = -O -I./gc/include -I/usr/local/ssl/include/openssl -I/usr/local/ssl/include
+GCCFLAGS = -O -I./gc/include -I./$(srcdir)/include -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DSILENT -DALL_INTERIOR_POINTERS
+KEYBIND_SRC = keybind.c
+KEYBIND_OBJ = keybind.o
+EXT=
+MATHLIB=-lm
+Z_CFLAGS=-I/usr/include
+ZLIB=-L/usr/lib -lz
+EXT_TARGETS=$(BOOKMARKER) $(HELPER) $(INFLATE)
+GC_CFLAGS=
+GCLIB=gc/gc.a
+GCTARGET=gc/gc.a
+RANLIB=ranlib
+MKDIR=mkdir -p
+VERSION=0.2.2
+MODEL=Linux.i686-monster-ja
+#else
+
+
+#define DISPLAY_CODE 'E'
+#define SYSTEM_CODE 'E'
+
+#define JA 0
+#define EN 1
+#define LANG JA
+#define KANJI_SYMBOLS
+#define COLOR
+#define MOUSE
+#define USE_GPM
+#undef USE_SYSMOUSE
+#define MENU
+#define USE_COOKIE
+#define USE_SSL
+#undef USE_SSL_VERIFY
+#undef FTPPASS_HOSTNAMEGEN
+#undef SHOW_PARAMS
+
+#define DEF_EDITOR "/bin/vi"
+#define DEF_MAILER "/bin/mail"
+#define DEF_EXT_BROWSER "/usr/bin/netscape"
+
+#define LIB_DIR "/usr/local/lib/w3m"
+#define HELP_DIR "/usr/local/lib/w3m"
+#define HELP_FILE "w3mhelp.html"
+#define W3MCONFIG "w3mconfig"
+
+#define RC_DIR "~/.w3m/"
+#define BOOKMARK "bookmark.html"
+#define CONFIG_FILE "config"
+#define KEYMAP_FILE "keymap"
+#define MENU_FILE "menu"
+#define COOKIE_FILE "cookie"
+#define HISTORY_FILE "history"
+
+#define USER_MAILCAP RC_DIR "/mailcap"
+#define SYS_MAILCAP "/etc/mailcap"
+#define USER_MIMETYPES "~/.mime.types"
+#define SYS_MIMETYPES "/usr/local/lib/mime.types"
+
+#define DEF_SAVE_FILE "index.html"
+
+#undef USE_BINMODE_STREAM
+#define HAVE_TERMIOS_H
+#define HAVE_DIRENT_H
+#define HAVE_STRCASECMP
+#define HAVE_STRCHR
+#define HAVE_STRERROR
+#define HAVE_SYS_ERRLIST
+#define HAVE_BCOPY
+#define HAVE_WAITPID
+#define HAVE_WAIT3
+#define HAVE_STRFTIME
+
+#define HAVE_GETCWD
+#define HAVE_GETWD
+#define HAVE_READLINK
+#define HAVE_SETENV
+#define HAVE_PUTENV
+#define HAVE_SRAND48
+#define HAVE_SRANDOM
+
+#define SETJMP(env) sigsetjmp(env,1)
+#define LONGJMP(env,val) siglongjmp(env,val)
+#define JMP_BUF sigjmp_buf
+
+typedef void MySignalHandler;
+#define SIGNAL_ARG int _dummy
+#define SIGNAL_ARGLIST 0
+#define SIGNAL_RETURN return
+#define HAVE_SETPGRP
+
+/*
+ If you want to use IPv6, define this symbol.
+ */
+#undef INET6
+
+
+#undef TABLE_EXPAND
+#undef TABLE_NO_COMPACT
+#define NOWRAP 1
+#define MATRIX 1
+#define HAVE_FLOAT_H
+
+#ifndef HAVE_SRAND48
+#ifdef HAVE_SRANDOM
+#define srand48 srandom
+#define lrand48 random
+#else /* HAVE_SRANDOM */
+#define USE_INCLUDED_SRAND48
+#endif /* HAVE_SRANDOM */
+#endif
+
+#if defined( __CYGWIN32__ ) && !defined( __CYGWIN__ )
+#define __CYGWIN__
+#endif
+
+#if defined( __CYGWIN__ ) || defined( __EMX__ )
+#define SUPPORT_DOS_DRIVE_PREFIX 1
+#endif
+
+#endif /* makefile_parameter */
+#endif /* _CONFIGURED_ */
+
