Updates from 0.2.1 into 0.2.1-inu-1.5
This commit is contained in:
41
XXMakefile
41
XXMakefile
@@ -4,20 +4,24 @@ 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 -ltermcap -L/usr/local/ssl/lib -lssl -lcrypto
|
||||
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 = -g -Wall -I./gc/include -I/usr/local/ssl/include/openssl -I/usr/local/ssl/include
|
||||
GCCFLAGS = -g -Wall -I./gc/include -DATOMIC_UNCOLLECTABLE -DNO_EXECUTE_PERMISSION -DALL_INTERIOR_POINTERS -DSILENT -DNO_DEBUGGING #-DNO_SIGNALS
|
||||
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
|
||||
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 \
|
||||
@@ -26,19 +30,20 @@ SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \
|
||||
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 hash.c parsetagx.c\
|
||||
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 hash.o parsetagx.o\
|
||||
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
|
||||
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)
|
||||
TARGETS=$(TARGET) $(BOOKMARKER) $(HELPER)
|
||||
INFLATE=inflate$(EXT)
|
||||
TARGETS=$(TARGET) $(EXT_TARGETS)
|
||||
|
||||
INCLUDES=-I.
|
||||
|
||||
@@ -61,7 +66,10 @@ $(ALIB): $(ALIBOBJS)
|
||||
$(OBJS): fm.h funcname1.h
|
||||
|
||||
tagtable.c: html.h tagtable.tab mktable$(EXT)
|
||||
./mktable 100 tagtable.tab > tagtable.c
|
||||
./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
|
||||
@@ -69,7 +77,7 @@ keybind_lynx.o: funcname2.h
|
||||
parsetagx.o: html.c
|
||||
|
||||
funcname.c: funcname.tab
|
||||
awk -f funcname0.awk funcname.tab > funcname.c
|
||||
sort funcname.tab | awk -f funcname0.awk > funcname.c
|
||||
|
||||
funcname1.h: funcname.tab
|
||||
awk -f funcname1.awk funcname.tab > funcname1.h
|
||||
@@ -86,8 +94,14 @@ $(BOOKMARKER): w3mbookmark.o $(ALIB) $(GCTARGET)
|
||||
$(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)'
|
||||
cd gc; make CC='$(CC)' CFLAGS='$(GCCFLAGS) $(GC_CFLAGS)' SPECIALCFLAGS='-I./\$(srcdir)/include $(GC_CFLAGS)'
|
||||
|
||||
install: $(TARGETS)
|
||||
-$(MKDIR) $(DESTDIR)$(BIN_DIR)
|
||||
@@ -99,7 +113,7 @@ install: $(TARGETS)
|
||||
$(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 $(BOOKMARKER) $(HELPER); do $(INSTALL) -m 755 $$d $(DESTDIR)$(LIB_DIR)/$$d; done
|
||||
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:
|
||||
@@ -109,6 +123,9 @@ uninstall:
|
||||
-$(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)
|
||||
|
Reference in New Issue
Block a user