remove XXMakefile config.h

config.h is moved to config.h.dist

3 files changed, 8 insertions, 146 deletions

diff --git a/ChangeLog b/ChangeLog
index c5a9630..cad3736 100644
--- 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
deleted file mode 100644
index 278f645..0000000
--- a/XXMakefile
+++ /dev/null
@@ -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.dist
index 9418d0e..4df19b8 100644
--- a/config.h
+++ b/config.h.dist
@@ -1,5 +1,6 @@
 /*
  * Configuration for w3m
+ * This is sample.  ./configure will generate config.h for you.
  */
 
 #ifndef _CONFIGURED_
@@ -120,7 +121,7 @@ GCLIB=gc/gc.a
 GCTARGET=gc/gc.a
 RANLIB=ranlib
 MKDIR=mkdir -p
-VERSION=0.2.1-inu-1.5
+VERSION=0.2.2
 MODEL=Linux.i686-monster-ja
 #else