diff -cNr w3m-0.3.2.2.org/XXMakefile w3m-0.3.2.2-k2/XXMakefile *** w3m-0.3.2.2.org/XXMakefile Thu Jan 1 09:00:00 1970 --- w3m-0.3.2.2-k2/XXMakefile Sat Dec 28 02:45:08 2002 *************** *** 0 **** --- 1,233 ---- + #ifdef makefile_parameter + + BIN_DIR = /home/QtPalmtop/bin + LIB_DIR = /home/QtPalmtop/lib/w3m + HELP_DIR = /home/QtPalmtop/share/w3m + MAN_DIR = /home/QtPalmtop/man + MAN1_DIR = $(MAN_DIR)/man1 + MAN1_JA_DIR = $(MAN_DIR)/ja/man1 + ETC_DIR = /home/QtPalmtop/etc/w3m + RC_DIR = ~/.w3m + HELP_FILE = w3mhelp-w3m_ja.html + SYS_LIBRARIES = -lncurses -lssl -lcrypto + LOCAL_LIBRARIES = -lnsl + CC = arm-linux-gcc + MYCFLAGS = -O2 -I./gc/include -I/usr/include/openssl + LDFLAGS = + GCCFLAGS = -O2 -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= + ZLIB=-lz + EXT_TARGETS=$(BOOKMARKER) $(HELPER) $(INFLATE) + IMGCFLAGS= + IMGLDFLAGS= + IMGX11CFLAGS= + IMGFBCFLAGS= + IMGOBJS=w3mimg/w3mimg.o + GC_CFLAGS= + GCLIB=-lgc -lpthread + GCTARGET=gc/gc.a + RANLIB=ranlib + MKDIR=mkdir -p + PERL=/usr/local/bin/perl + VERSION=0.3.2.2 + MODEL=Linux.i686-custom-JA + #else + # $Id: XMakefile,v 1.29 2002/10/28 17:09:18 ukai Exp $ + 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 image.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 image.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) + IMGDISPLAY=w3mimgdisplay$(EXT) + MAN1=doc/w3m.1 + MAN1_JA=doc-jp/w3m.1 + TARGETS=$(TARGET) $(EXT_TARGETS) + HELP_ALLFILES=w3mhelp-w3m_en.html w3mhelp-w3m_ja.html \ + w3mhelp-lynx_en.html w3mhelp-lynx_ja.html + + SCRIPTSUBDIRS = scripts scripts/multipart scripts/w3mman + SUBDIRS = $(SCRIPTSUBDIRS) + + INCLUDES=-I. + + DEFS=$(INCLUDES) # -DDEBUG + CFLAGS=$(OPTS) $(MYCFLAGS) $(DEFS) + LIBS=-L. -lindep $(GCLIB) $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) + LIBS2=-L. -lindep $(GCLIB) $(LOCAL_LIBRARIES) + INSTALL=sh install-sh + INSTALL_PROGRAM=$(INSTALL) -m 755 -s + INSTALL_SCRIPT=$(INSTALL) -m 755 + INSTALL_DATA=$(INSTALL) -m 644 + AR=ar + + all: $(TARGETS) all-scripts + + $(TARGET): $(ALLOBJS) $(ALIB) $(GCTARGET) + $(CC) $(CFLAGS) $(LDFLAGS) -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 functable.c funcname1.h + 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 + sort funcname.tab | awk -f funcname1.awk > funcname1.h + + funcname2.h: funcname.tab + sort funcname.tab | awk -f funcname2.awk > funcname2.h + + functable.c: funcname.tab mktable$(EXT) + sort funcname.tab | awk -f functable.awk > functable.tab + ./mktable$(EXT) 100 functable.tab > functable.c + -rm -f functable.tab + + mktable$(EXT): mktable.o hash.o $(ALIB) $(GCTARGET) + $(CC) $(CFLAGS) $(LDFLAGS) -o mktable$(EXT) mktable.o hash.o $(LIBS2) + + $(BOOKMARKER): w3mbookmark.o $(ALIB) $(GCTARGET) + $(CC) $(CFLAGS) $(LDFLAGS) -o $(BOOKMARKER) w3mbookmark.o $(LIBS2) + + $(HELPER): w3mhelperpanel.o $(ALIB) $(GCTARGET) + $(CC) $(CFLAGS) $(LDFLAGS) -o $(HELPER) w3mhelperpanel.o $(LIBS2) + + $(INFLATE): inflate.o + $(CC) $(CFLAGS) $(Z_CFLAGS) $(LDFLAGS) -o $(INFLATE) inflate.o $(ZLIB) + + inflate.o: inflate.c + $(CC) $(CFLAGS) $(Z_CFLAGS) -c inflate.c + + $(IMGDISPLAY): w3mimgdisplay.o $(IMGOBJS) + $(CC) $(CFLAGS) $(IMGCFLAGS) $(LDFLAGS) -o $(IMGDISPLAY) \ + w3mimgdisplay.o $(IMGOBJS) $(IMGLDFLAGS) + + w3mimgdisplay.o: w3mimgdisplay.c + $(CC) $(CFLAGS) $(IMGCFLAGS) -c w3mimgdisplay.c + + w3mimg/w3mimg.o: w3mimg/w3mimg.c + cd w3mimg && $(CC) $(CFLAGS) $(IMGCFLAGS) -I.. -c w3mimg.c + + w3mimg/x11/x11_w3mimg.o: w3mimg/x11/x11_w3mimg.c + cd w3mimg/x11 && $(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c x11_w3mimg.c + + w3mimg/fb/fb_w3mimg.o: w3mimg/fb/fb_w3mimg.c + cd w3mimg/fb && $(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c fb_w3mimg.c + + w3mimg/fb/fb.o: w3mimg/fb/fb.c + cd w3mimg/fb && $(CC) $(CFLAGS) $(IMGCFLAGS) -I../.. -c fb.c + + 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 + + gc/gc.a: + cd gc; $(MAKE) base_lib gc.a CC='$(CC)' CFLAGS='$(GCCFLAGS) $(GC_CFLAGS)' SPECIALCFLAGS='-I./\$(srcdir)/include $(GC_CFLAGS)' + + + install: install-core install-scripts + + install-core: $(TARGETS) + -$(MKDIR) $(DESTDIR)$(BIN_DIR) + -$(MKDIR) $(DESTDIR)$(LIB_DIR) + -$(MKDIR) $(DESTDIR)$(HELP_DIR) + -$(MKDIR) $(DESTDIR)$(MAN1_DIR) + -$(MKDIR) $(DESTDIR)$(MAN1_JA_DIR) + $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET) + $(INSTALL_DATA) $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html + $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1_DIR)/$(TARGET).1 + $(INSTALL_DATA) $(MAN1_JA) $(DESTDIR)$(MAN1_JA_DIR)/$(TARGET).1 + for file in $(EXT_TARGETS); \ + do \ + $(INSTALL_PROGRAM) $$file $(DESTDIR)$(LIB_DIR)/$$file; \ + done + + install-helpfile: + -$(MKDIR) $(DESTDIR)$(HELP_DIR) + for file in $(HELP_ALLFILES); \ + do \ + $(INSTALL_DATA) $$file $(DESTDIR)$(HELP_DIR)/$$file; \ + done + + all-scripts: + for dir in $(SCRIPTSUBDIRS); \ + do \ + (cd $$dir; $(MAKE) PERL='$(PERL)' BIN_DIR='$(BIN_DIR)' LIB_DIR='$(LIB_DIR)' HELP_DIR='$(HELP_DIR)' RC_DIR='$(RC_DIR)' KEYBIND_SRC='$(KEYBIND_SRC)'); \ + done + + install-scripts: all-scripts + topdir=`pwd`; \ + for dir in $(SCRIPTSUBDIRS); \ + do \ + (cd $$dir; $(MAKE) PERL='$(PERL)' MKDIR='$(MKDIR)' BIN_DIR='$(BIN_DIR)' LIB_DIR='$(LIB_DIR)' HELP_DIR='$(HELP_DIR)' MAN_DIR='$(MAN_DIR)' DESTDIR='$(DESTDIR)' INSTALL="sh $$topdir/install-sh" install); \ + done + + uninstall: + -rm -f $(BIN_DIR)/$(TARGET) + -for file in $(EXT_TARGETS); \ + do \ + rm -f $(LIB_DIR)/$$file; \ + done + -for file in $(HELP_ALLFILES); \ + do \ + rm -f $(HELP_DIR)/$$file; \ + done + -rm -f $(MAN1_DIR)/$(TARGET).1 + -rm -f $(MAN1_JA_DIR)/$(TARGET).1 + -for dir in $(SCRIPTSUBDIRS); \ + do \ + (cd $$dir; $(MAKE) BIN_DIR='$(BIN_DIR)' LIB_DIR='$(LIB_DIR)' HELP_DIR='$(HELP_DIR)' MAN_DIR='$(MAN_DIR)' uninstall); \ + done + + 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 $(SCRIPTSUBDIRS); \ + do \ + (cd $$dir; $(MAKE) clean); \ + done + + 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 -cNr w3m-0.3.2.2.org/config.h w3m-0.3.2.2-k2/config.h *** w3m-0.3.2.2.org/config.h Thu Jan 1 09:00:00 1970 --- w3m-0.3.2.2-k2/config.h Sat Dec 28 02:45:06 2002 *************** *** 0 **** --- 1,284 ---- + /* + * 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. + */ + #define USE_DICT + + /* + If you want to load and save URL history. + */ + #define USE_HISTORY + + /* + USE_BG_COLOR enables w3m to set background color. + */ + #define USE_BG_COLOR + + /* + * Do word fill + */ + #undef FORMAT_NICE + + /* + * Enable id attribute + */ + #define ID_EXT + + /* + * Save Current-buffer Information + */ + #define USE_BUFINFO + + /* + * Support EGD (Entropy Gathering Daemon) + */ + #define USE_EGD + + /* + * Remove line trailing spaces in html buffer. + */ + #undef ENABLE_REMOVE_TRAILINGSPACES + + /* + * thin chars for menu frame + */ + #undef MENU_THIN_FRAME + + /* + */ + #undef TABLE_EXPAND + #undef TABLE_NO_COMPACT + #define NOWRAP + #define MATRIX + + /**********************************************************/ + #ifdef makefile_parameter + + BIN_DIR = /home/QtPalmtop/bin + LIB_DIR = /home/QtPalmtop/lib/w3m + HELP_DIR = /home/QtPalmtop/share/w3m + MAN_DIR = /home/QtPalmtop/man + MAN1_DIR = $(MAN_DIR)/man1 + MAN1_JA_DIR = $(MAN_DIR)/ja/man1 + ETC_DIR = /home/QtPalmtop/etc/w3m + RC_DIR = ~/.w3m + HELP_FILE = w3mhelp-w3m_ja.html + SYS_LIBRARIES = -lncurses -lssl -lcrypto + LOCAL_LIBRARIES = -lnsl + CC = arm-linux-gcc + MYCFLAGS = -O2 -I./gc/include -I/usr/include/openssl + LDFLAGS = + GCCFLAGS = -O2 -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= + ZLIB=-lz + EXT_TARGETS=$(BOOKMARKER) $(HELPER) $(INFLATE) + IMGCFLAGS= + IMGLDFLAGS= + IMGX11CFLAGS= + IMGFBCFLAGS= + IMGOBJS=w3mimg/w3mimg.o + GC_CFLAGS= + GCLIB=-lgc -lpthread + GCTARGET=gc/gc.a + RANLIB=ranlib + MKDIR=mkdir -p + PERL=/usr/local/bin/perl + VERSION=0.3.2.2 + MODEL=Linux.i686-custom-JA + #else + + + #define DISPLAY_CODE 'E' + #define SYSTEM_CODE 'E' + + #define JA 0 + #define EN 1 + #define LANG JA + #undef KANJI_SYMBOLS + #define USE_COLOR + #define USE_ANSI_COLOR + #define USE_MIGEMO + #define EMACS_LIKE_LINEEDIT + #define VI_PREC_NUM + #define USE_MARK + #define LABEL_TOPLINE + #define NEXTPAGE_TOPLINE + #define USE_MOUSE + #undef USE_GPM + #undef USE_SYSMOUSE + #define USE_MENU + #define USE_COOKIE + #define USE_DIGEST_AUTH + #define USE_SSL + #define USE_SSL_VERIFY + #define FTPPASS_HOSTNAMEGEN + #define USE_EXTERNAL_URI_LOADER + #define USE_W3MMAILER + #define USE_NNTP + #undef USE_GOPHER + #define USE_ALARM + #undef USE_IMAGE + #undef USE_W3MIMG_X11 + #undef USE_W3MIMG_FB + #undef USE_IMLIB + #undef USE_GDKPIXBUF + #undef USE_IMLIB2 + #define USE_HELP_CGI + + + #define DEF_EDITOR "TextEdit" + #define DEF_MAILER "" + #define DEF_EXT_BROWSER "/home/QtPalmtop/bin/konqueror" + + /* fallback viewer. mailcap override these configuration */ + #define DEF_IMAGE_VIEWER "xv" + #define DEF_AUDIO_PLAYER "showaudio" + + /* for USE_MIGEMO */ + #define DEF_MIGEMO_COMMAND "migemo -t egrep /usr/local/share/migemo/migemo-dict" + + #define LIB_DIR "/home/QtPalmtop/lib/w3m" + #define HELP_DIR "/home/QtPalmtop/share/w3m" + #define ETC_DIR "/home/QtPalmtop/etc/w3m" + #define HELP_FILE "w3mhelp.html" + #define HELP_CGI "w3mhelp" + #define W3MCONFIG "w3mconfig" + #define IMGDISPLAY "w3mimgdisplay" + #define XFACE2XPM "xface2xpm" + + #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 PASSWD_FILE RC_DIR "/passwd" + #define USER_MAILCAP RC_DIR "/mailcap" + #define SYS_MAILCAP "/etc/mailcap" + #define USER_MIMETYPES "~/.mime.types" + #define SYS_MIMETYPES "/etc/mime.types" + #define USER_URIMETHODMAP RC_DIR "/urimethodmap" + #define SYS_URIMETHODMAP ETC_DIR "/urimethodmap" + + #define DEF_SAVE_FILE "index.html" + + #undef USE_BINMODE_STREAM + #define HAVE_TERMIOS_H + #define HAVE_DIRENT_H + typedef long long clen_t; + #define HAVE_STRTOLL + #define HAVE_STRTOQ + #define HAVE_ATOLL + #undef HAVE_ATOQ + #define HAVE_STRCASECMP + #define HAVE_STRCASESTR + #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_SYMLINK + #define HAVE_READLINK + #define HAVE_LSTAT + #define HAVE_SETENV + #define HAVE_PUTENV + #define HAVE_SRAND48 + #define HAVE_SRANDOM + #undef HAVE_GETPASSPHRASE + #define HAVE_CHDIR + + + #define SETJMP(env) sigsetjmp(env,1) + #define LONGJMP(env,val) siglongjmp(env,val) + #define JMP_BUF sigjmp_buf + #define HAVE_FLOAT_H + #define HAVE_SYS_SELECT_H + + typedef void MySignalHandler; + #define SIGNAL_ARG int _dummy + #define SIGNAL_ARGLIST 0 + #define SIGNAL_RETURN return + #define HAVE_SETPGRP + #define SETPGRP() setpgrp() + /* + If you want to use IPv6, define this symbol. + */ + #undef INET6 + + + /** dont edit below **/ + #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 + + #if defined( __CYGWIN__ ) + #define SUPPORT_NETBIOS_SHARE 1 + #endif + + #if defined(__DJGPP__) + #define DEFAULT_TERM "dosansi" + #else + #define DEFAULT_TERM 0 /* XXX */ + #endif + + #if defined(__EMX__) /* use $extension? */ + #define GUNZIP_CMDNAME "gzip" + #define BUNZIP2_CMDNAME "bzip2" + #define INFLATE_CMDNAME "inflate.exe" + #define W3MBOOKMARK_CMDNAME "w3mbookmark.exe" + #define W3MHELPERPANEL_CMDNAME "w3mhelperpanel.exe" + #define DEV_NULL_PATH "nul" + #define DEV_TTY_PATH "con" + #define CGI_EXTENSION ".cmd" + #define USE_PATH_ENVVAR + #else + #define GUNZIP_CMDNAME "gunzip" + #define BUNZIP2_CMDNAME "bunzip2" + #define INFLATE_CMDNAME "inflate" + #define W3MBOOKMARK_CMDNAME "w3mbookmark" + #define W3MHELPERPANEL_CMDNAME "w3mhelperpanel" + #define DEV_NULL_PATH "/dev/null" + #define DEV_TTY_PATH "/dev/tty" + #define CGI_EXTENSION ".cgi" + #endif + + #define PATH_SEPARATOR ':' + #define GUNZIP_NAME "gunzip" + #define BUNZIP2_NAME "bunzip2" + #define INFLATE_NAME "inflate" + + #endif /* makefile_parameter */ + #endif /* _CONFIGURED_ */ + diff -cNr w3m-0.3.2.2.org/config.param w3m-0.3.2.2-k2/config.param *** w3m-0.3.2.2.org/config.param Thu Jan 1 09:00:00 1970 --- w3m-0.3.2.2-k2/config.param Sat Dec 28 02:45:04 2002 *************** *** 0 **** --- 1,58 ---- + # Configuration at kuhn + bindir='/home/QtPalmtop/bin' + libdir='/home/QtPalmtop/lib/w3m' + helpdir='/home/QtPalmtop/share/w3m' + mandir='/home/QtPalmtop/man' + sysconfdir='/home/QtPalmtop/etc/w3m' + lang=JA + display_code=E + system_code=E + kanji_symbols=n + use_lynx_key=n + dmodel=6 + use_color=y + use_mouse=y + use_menu=y + use_cookie=y + use_ssl=y + use_ssl_verify=y + use_digest_auth=y + use_image=n + use_ansi_color=y + use_migemo=y + def_migemo_command='migemo -t egrep /usr/local/share/migemo/migemo-dict' + use_external_uri_loader=y + use_w3mmailer=y + use_nntp=y + use_gopher=n + use_alarm=y + use_mark=y + use_dict=y + use_history=y + use_bg_color=y + format_nice=n + id_ext=y + use_bufinfo=y + use_egd=y + enable_remove_trailingspaces=n + menu_thin_frame=n + emacs_like_lineedit=y + vi_prec_num=y + label_topline=y + nextpage_topline=y + ftppass_hostnamegen=y + table_expand=n + table_no_compact=n + nowrap=y + matrix=y + ded='TextEdit' + dmail='' + dbrowser='/home/QtPalmtop/bin/konqueror' + def_image_viewer='xv' + def_audio_player='showaudio' + dcc='gcc' + dcflags='-O2' + dtermlib='-lncurses' + use_bundled_gclib=y + dldflags='' + use_help_cgi=y diff -cNr w3m-0.3.2.2.org/form.c w3m-0.3.2.2-k2/form.c *** w3m-0.3.2.2.org/form.c Tue Jun 18 02:51:39 2002 --- w3m-0.3.2.2-k2/form.c Sat Dec 28 00:38:52 2002 *************** *** 463,469 **** void input_textarea(FormItemList *fi) { ! char *tmpf = tmpfname(TMPF_DFL, NULL)->ptr; Str tmp; FILE *f; #ifdef JP_CHARSET --- 463,469 ---- void input_textarea(FormItemList *fi) { ! char *tmpf = tmpfname(TMPF_DFL, ".txt")->ptr; Str tmp; FILE *f; #ifdef JP_CHARSET diff -cNr w3m-0.3.2.2.org/gc/Makefile w3m-0.3.2.2-k2/gc/Makefile *** w3m-0.3.2.2.org/gc/Makefile Wed Jul 10 23:21:11 2002 --- w3m-0.3.2.2-k2/gc/Makefile Sat Dec 28 00:25:54 2002 *************** *** 1,632 **** ! # This is the original manually generated Makefile. It may still be used ! # to build the collector. ! # ! # Primary targets: ! # gc.a - builds basic library ! # c++ - adds C++ interface to library ! # cords - adds cords (heavyweight strings) to library ! # test - prints porting information, then builds basic version of gc.a, ! # and runs some tests of collector and cords. Does not add cords or ! # c++ interface to gc.a ! # cord/de - builds dumb editor based on cords. ! ABI_FLAG= ! # ABI_FLAG should be the cc flag that specifies the ABI. On most ! # platforms this will be the empty string. Possible values: ! # +DD64 for 64-bit executable on HP/UX. ! # -n32, -n64, -o32 for SGI/MIPS ABIs. ! ! AS_ABI_FLAG=$(ABI_FLAG) ! # ABI flag for assembler. On HP/UX this is +A64 for 64 bit ! # executables. ! ! CC=cc $(ABI_FLAG) ! CXX=g++ $(ABI_FLAG) ! AS=as $(AS_ABI_FLAG) ! # The above doesn't work with gas, which doesn't run cpp. ! # Define AS as `gcc -c -x assembler-with-cpp' instead. ! ! # Redefining srcdir allows object code for the nonPCR version of the collector ! # to be generated in different directories. ! srcdir= . ! VPATH= $(srcdir) ! ! CFLAGS= -O -I$(srcdir)/include -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DSILENT -DALL_INTERIOR_POINTERS ! ! # To build the parallel collector on Linux, add to the above: ! # -DGC_LINUX_THREADS -DPARALLEL_MARK -DTHREAD_LOCAL_ALLOC ! # To build the parallel collector n a static library on HP/UX, add to the above: ! # -DGC_HPUX_THREADS -DPARALLEL_MARK -DTHREAD_LOCAL_ALLOC -DUSE_HPUX_TLS -D_POSIX_C_SOURCE=199506L ! ! # HOSTCC and HOSTCFLAGS are used to build executables that will be run as ! # part of the build process, i.e. on the build machine. These will usually ! # be the same as CC and CFLAGS, except in a cross-compilation environment. ! # Note that HOSTCFLAGS should include any -D flags that affect thread support. ! HOSTCC=$(CC) ! HOSTCFLAGS=$(CFLAGS) ! ! # For dynamic library builds, it may be necessary to add flags to generate ! # PIC code, e.g. -fPIC on Linux. ! ! # Setjmp_test may yield overly optimistic results when compiled ! # without optimization. ! ! # These define arguments influence the collector configuration: ! # -DSILENT disables statistics printing, and improves performance. ! # -DFIND_LEAK causes GC_find_leak to be initially set. ! # This causes the collector to assume that all inaccessible ! # objects should have been explicitly deallocated, and reports exceptions. ! # Finalization and the test program are not usable in this mode. ! # -DGC_SOLARIS_THREADS enables support for Solaris (thr_) threads. ! # (Clients should also define GC_SOLARIS_THREADS and then include ! # gc.h before performing thr_ or dl* or GC_ operations.) ! # Must also define -D_REENTRANT. ! # -DGC_SOLARIS_PTHREADS enables support for Solaris pthreads. ! # (Internally this define GC_SOLARIS_THREADS as well.) ! # -DGC_IRIX_THREADS enables support for Irix pthreads. See README.irix. ! # -DGC_HPUX_THREADS enables support for HP/UX 11 pthreads. ! # Also requires -D_REENTRANT or -D_POSIX_C_SOURCE=199506L. See README.hp. ! # -DGC_LINUX_THREADS enables support for Xavier Leroy's Linux threads. ! # see README.linux. -D_REENTRANT may also be required. ! # -DGC_OSF1_THREADS enables support for Tru64 pthreads. Untested. ! # -DGC_FREEBSD_THREADS enables support for FreeBSD pthreads. Untested. ! # Appeared to run into some underlying thread problems. ! # -DGC_DGUX386_THREADS enables support for DB/UX on I386 threads. ! # See README.DGUX386. ! # -DALL_INTERIOR_POINTERS allows all pointers to the interior ! # of objects to be recognized. (See gc_priv.h for consequences.) ! # Alternatively, GC_all_interior_pointers can be set at process ! # initialization time. ! # -DSMALL_CONFIG tries to tune the collector for small heap sizes, ! # usually causing it to use less space in such situations. ! # Incremental collection no longer works in this case. ! # -DLARGE_CONFIG tunes the collector for unusually large heaps. ! # Necessary for heaps larger than about 500 MB on most machines. ! # Recommended for heaps larger than about 64 MB. ! # -DDONT_ADD_BYTE_AT_END is meaningful only with -DALL_INTERIOR_POINTERS or ! # GC_all_interior_pointers = 1. Normally -DALL_INTERIOR_POINTERS ! # causes all objects to be padded so that pointers just past the end of ! # an object can be recognized. This can be expensive. (The padding ! # is normally more than one byte due to alignment constraints.) ! # -DDONT_ADD_BYTE_AT_END disables the padding. ! # -DNO_SIGNALS does not disable signals during critical parts of ! # the GC process. This is no less correct than many malloc ! # implementations, and it sometimes has a significant performance ! # impact. However, it is dangerous for many not-quite-ANSI C ! # programs that call things like printf in asynchronous signal handlers. ! # This is on by default. Turning it off has not been extensively tested with ! # compilers that reorder stores. It should have been. ! # -DNO_EXECUTE_PERMISSION may cause some or all of the heap to not ! # have execute permission, i.e. it may be impossible to execute ! # code from the heap. Currently this only affects the incremental ! # collector on UNIX machines. It may greatly improve its performance, ! # since this may avoid some expensive cache synchronization. ! # -DGC_NO_OPERATOR_NEW_ARRAY declares that the C++ compiler does not support ! # the new syntax "operator new[]" for allocating and deleting arrays. ! # See gc_cpp.h for details. No effect on the C part of the collector. ! # This is defined implicitly in a few environments. Must also be defined ! # by clients that use gc_cpp.h. ! # -DREDIRECT_MALLOC=X causes malloc, realloc, and free to be ! # defined as aliases for X, GC_realloc, and GC_free, respectively. ! # Calloc and strdup are redefined in terms of the new malloc. X should ! # be either GC_malloc or GC_malloc_uncollectable, or ! # GC_debug_malloc_replacement. (The latter invokes GC_debug_malloc ! # with dummy source location information, but still results in ! # properly remembered call stacks on Linux/X86 and Solaris/SPARC.) ! # The former is occasionally useful for working around leaks in code ! # you don't want to (or can't) look at. It may not work for ! # existing code, but it often does. Neither works on all platforms, ! # since some ports use malloc or calloc to obtain system memory. ! # (Probably works for UNIX, and win32.) If you build with DBG_HDRS_ALL, ! # you should only use GC_debug_malloc_replacement as a malloc ! # replacement. ! # -DREDIRECT_REALLOC=X causes GC_realloc to be redirected to X. ! # The canonical use is -DREDIRECT_REALLOC=GC_debug_realloc_replacement, ! # together with -DREDIRECT_MALLOC=GC_debug_malloc_replacement to ! # generate leak reports with call stacks for both malloc and realloc. ! # -DIGNORE_FREE turns calls to free into a noop. Only useful with ! # -DREDIRECT_MALLOC. ! # -DNO_DEBUGGING removes GC_dump and the debugging routines it calls. ! # Reduces code size slightly at the expense of debuggability. ! # -DJAVA_FINALIZATION makes it somewhat safer to finalize objects out of ! # order by specifying a nonstandard finalization mark procedure (see ! # finalize.c). Objects reachable from finalizable objects will be marked ! # in a sepearte postpass, and hence their memory won't be reclaimed. ! # Not recommended unless you are implementing a language that specifies ! # these semantics. Since 5.0, determines only only the initial value ! # of GC_java_finalization variable. ! # -DFINALIZE_ON_DEMAND causes finalizers to be run only in response ! # to explicit GC_invoke_finalizers() calls. ! # In 5.0 this became runtime adjustable, and this only determines the ! # initial value of GC_finalize_on_demand. ! # -DATOMIC_UNCOLLECTABLE includes code for GC_malloc_atomic_uncollectable. ! # This is useful if either the vendor malloc implementation is poor, ! # or if REDIRECT_MALLOC is used. ! # -DHBLKSIZE=ddd, where ddd is a power of 2 between 512 and 16384, explicitly ! # sets the heap block size. Each heap block is devoted to a single size and ! # kind of object. For the incremental collector it makes sense to match ! # the most likely page size. Otherwise large values result in more ! # fragmentation, but generally better performance for large heaps. ! # -DUSE_MMAP use MMAP instead of sbrk to get new memory. ! # Works for Solaris and Irix. ! # -DUSE_MUNMAP causes memory to be returned to the OS under the right ! # circumstances. This currently disables VM-based incremental collection. ! # This is currently experimental, and works only under some Unix, ! # Linux and Windows versions. ! # -DMMAP_STACKS (for Solaris threads) Use mmap from /dev/zero rather than ! # GC_scratch_alloc() to get stack memory. ! # -DPRINT_BLACK_LIST Whenever a black list entry is added, i.e. whenever ! # the garbage collector detects a value that looks almost, but not quite, ! # like a pointer, print both the address containing the value, and the ! # value of the near-bogus-pointer. Can be used to identifiy regions of ! # memory that are likely to contribute misidentified pointers. ! # -DKEEP_BACK_PTRS Add code to save back pointers in debugging headers ! # for objects allocated with the debugging allocator. If all objects ! # through GC_MALLOC with GC_DEBUG defined, this allows the client ! # to determine how particular or randomly chosen objects are reachable ! # for debugging/profiling purposes. The gc_backptr.h interface is ! # implemented only if this is defined. ! # -DGC_ASSERTIONS Enable some internal GC assertion checking. Currently ! # this facility is only used in a few places. It is intended primarily ! # for debugging of the garbage collector itself, but could also ! # -DDBG_HDRS_ALL Make sure that all objects have debug headers. Increases ! # the reliability (from 99.9999% to 100%) of some of the debugging ! # code (especially KEEP_BACK_PTRS). Makes -DSHORT_DBG_HDRS possible. ! # Assumes that all client allocation is done through debugging ! # allocators. ! # -DSHORT_DBG_HDRS Assume that all objects have debug headers. Shorten ! # the headers to minimize object size, at the expense of checking for ! # writes past the end of an object. This is intended for environments ! # in which most client code is written in a "safe" language, such as ! # Scheme or Java. Assumes that all client allocation is done using ! # the GC_debug_ functions, or through the macros that expand to these, ! # or by redirecting malloc to GC_debug_malloc_replacement. ! # (Also eliminates the field for the requested object size.) ! # occasionally be useful for debugging of client code. Slows down the ! # collector somewhat, but not drastically. ! # -DSAVE_CALL_COUNT= Set the number of call frames saved with objects ! # allocated through the debugging interface. Affects the amount of ! # information generated in leak reports. Only matters on platforms ! # on which we can quickly generate call stacks, currently Linux/(X86 & SPARC) ! # and Solaris/SPARC and platforms that provide execinfo.h. ! # Default is zero. On X86, client ! # code should NOT be compiled with -fomit-frame-pointer. ! # -DSAVE_CALL_NARGS= Set the number of functions arguments to be ! # saved with each call frame. Default is zero. Ignored if we ! # don't know how to retrieve arguments on the platform. ! # -DCHECKSUMS reports on erroneously clear dirty bits, and unexpectedly ! # altered stubborn objects, at substantial performance cost. ! # Use only for debugging of the incremental collector. ! # -DGC_GCJ_SUPPORT includes support for gcj (and possibly other systems ! # that include a pointer to a type descriptor in each allocated object). ! # Building this way requires an ANSI C compiler. ! # -DUSE_I686_PREFETCH causes the collector to issue Pentium III style ! # prefetch instructions. No effect except on X86 Linux platforms. ! # Assumes a very recent gcc-compatible compiler and assembler. ! # (Gas prefetcht0 support was added around May 1999.) ! # Empirically the code appears to still run correctly on Pentium II ! # processors, though with no performance benefit. May not run on other ! # X86 processors? In some cases this improves performance by ! # 15% or so. ! # -DUSE_3DNOW_PREFETCH causes the collector to issue AMD 3DNow style ! # prefetch instructions. Same restrictions as USE_I686_PREFETCH. ! # Minimally tested. Didn't appear to be an obvious win on a K6-2/500. ! # -DGC_USE_LD_WRAP in combination with the old flags listed in README.linux ! # causes the collector some system and pthread calls in a more transparent ! # fashion than the usual macro-based approach. Requires GNU ld, and ! # currently probably works only with Linux. ! # -DTHREAD_LOCAL_ALLOC defines GC_local_malloc(), GC_local_malloc_atomic() ! # and GC_local_gcj_malloc(). Needed for gc_gcj.h interface. These allocate ! # in a way that usually does not involve acquisition of a global lock. ! # Currently requires -DGC_LINUX_THREADS, but should be easy to port to ! # other pthreads environments. Recommended for multiprocessors. ! # -DPARALLEL_MARK allows the marker to run in multiple threads. Recommended ! # for multiprocessors. Currently requires Linux on X86 or IA64, though ! # support for other Posix platforms should be fairly easy to add, ! # if the thread implementation is otherwise supported. ! # -DNO_GETENV prevents the collector from looking at environment variables. ! # These may otherwise alter its configuration, or turn off GC altogether. ! # I don't know of a reason to disable this, except possibly if the ! # resulting process runs as a privileged user? ! # -DUSE_GLOBAL_ALLOC. Win32 only. Use GlobalAlloc instead of ! # VirtualAlloc to allocate the heap. May be needed to work around ! # a Windows NT/2000 issue. Incompatible with USE_MUNMAP. ! # See README.win32 for details. ! # -DMAKE_BACK_GRAPH. Enable GC_PRINT_BACK_HEIGHT environment variable. ! # See README.environment for details. Experimental. Limited platform ! # support. Implies DBG_HDRS_ALL. All allocation should be done using ! # the debug interface. ! # -DSTUBBORN_ALLOC allows allocation of "hard to change" objects, and thus ! # makes incremental collection easier. Was enabled by default until 6.0. ! # Rarely used, to my knowledge. ! # -DHANDLE_FORK attempts to make GC_malloc() work in a child process fork()ed ! # from a multithreaded parent. Currently only supported by linux_threads.c. ! # (Similar code should work on Solaris or Irix, but it hasn't been tried.) ! # ! CXXFLAGS= $(CFLAGS) ! AR= ar ! RANLIB= ranlib ! ! ! OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o dbg_mlc.o malloc.o stubborn.o checksums.o solaris_threads.o irix_threads.o linux_threads.o typd_mlc.o ptr_chck.o mallocx.o solaris_pthreads.o gcj_mlc.o specific.o gc_dlopen.o backgraph.o ! ! CSRCS= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c headers.c mark.c obj_map.c pcr_interface.c blacklst.c finalize.c new_hblk.c real_malloc.c dyn_load.c dbg_mlc.c malloc.c stubborn.c checksums.c solaris_threads.c irix_threads.c linux_threads.c typd_mlc.c ptr_chck.c mallocx.c solaris_pthreads.c gcj_mlc.c specific.c gc_dlopen.c backgraph.c ! ! CORD_SRCS= cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/de.c cord/cordtest.c include/cord.h include/ec.h include/private/cord_pos.h cord/de_win.c cord/de_win.h cord/de_cmds.h cord/de_win.ICO cord/de_win.RC ! ! CORD_OBJS= cord/cordbscs.o cord/cordxtra.o cord/cordprnt.o ! ! SRCS= $(CSRCS) mips_sgi_mach_dep.S rs6000_mach_dep.s alpha_mach_dep.S \ ! sparc_mach_dep.S include/gc.h include/gc_typed.h \ ! include/private/gc_hdrs.h include/private/gc_priv.h \ ! include/private/gcconfig.h include/private/gc_pmark.h \ ! include/gc_inl.h include/gc_inline.h include/gc_mark.h \ ! threadlibs.c if_mach.c if_not_there.c gc_cpp.cc include/gc_cpp.h \ ! gcname.c include/weakpointer.h include/private/gc_locks.h \ ! gcc_support.c mips_ultrix_mach_dep.s include/gc_alloc.h \ ! include/new_gc_alloc.h include/gc_allocator.h \ ! include/javaxfc.h sparc_sunos4_mach_dep.s sparc_netbsd_mach_dep.s \ ! include/private/solaris_threads.h include/gc_backptr.h \ ! hpux_test_and_clear.s include/gc_gcj.h \ ! include/gc_local_alloc.h include/private/dbg_mlc.h \ ! include/private/specific.h powerpc_macosx_mach_dep.s \ ! include/leak_detector.h include/gc_amiga_redirects.h \ ! include/gc_pthread_redirects.h ia64_save_regs_in_stack.s \ ! $(CORD_SRCS) ! ! DOC_FILES= README.QUICK doc/README.Mac doc/README.MacOSX doc/README.OS2 \ ! doc/README.amiga doc/README.cords doc/debugging.html \ ! doc/README.dj doc/README.hp doc/README.linux doc/README.rs6000 \ ! doc/README.sgi doc/README.solaris2 doc/README.uts \ ! doc/README.win32 doc/barrett_diagram doc/README \ ! doc/README.contributors doc/README.changes doc/gc.man \ ! doc/README.environment doc/tree.html doc/gcdescr.html \ ! doc/README.autoconf doc/README.macros doc/README.ews4800 \ ! doc/README.DGUX386 doc/README.arm.cross ! ! TESTS= tests/test.c tests/test_cpp.cc tests/trace_test.c \ ! tests/leak_test.c tests/thread_leak_test.c ! ! GNU_BUILD_FILES= configure.in Makefile.am configure acinclude.m4 \ ! libtool.m4 install-sh configure.host Makefile.in \ ! ltconfig aclocal.m4 config.sub config.guess \ ! ltmain.sh mkinstalldirs depcomp missing ! ! OTHER_MAKEFILES= OS2_MAKEFILE NT_MAKEFILE NT_THREADS_MAKEFILE gc.mak \ ! BCC_MAKEFILE EMX_MAKEFILE WCC_MAKEFILE Makefile.dj \ ! PCR-Makefile SMakefile.amiga Makefile.DLLs \ ! digimars.mak Makefile.direct ! # Makefile and Makefile.direct are copies of each other. ! ! OTHER_FILES= Makefile setjmp_t.c callprocs pc_excludes \ ! MacProjects.sit.hqx MacOS.c \ ! Mac_files/datastart.c Mac_files/dataend.c \ ! Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \ ! add_gc_prefix.c gc_cpp.cpp win32_threads.c \ ! version.h AmigaOS.c \ ! $(TESTS) $(GNU_BUILD_FILES) $(OTHER_MAKEFILES) ! ! CORD_INCLUDE_FILES= $(srcdir)/include/gc.h $(srcdir)/include/cord.h \ ! $(srcdir)/include/ec.h $(srcdir)/include/private/cord_pos.h ! ! UTILS= if_mach if_not_there threadlibs ! ! # Libraries needed for curses applications. Only needed for de. ! CURSES= -lcurses -ltermlib ! ! # The following is irrelevant on most systems. But a few ! # versions of make otherwise fork the shell specified in ! # the SHELL environment variable. ! SHELL= /bin/sh ! ! SPECIALCFLAGS = -I$(srcdir)/include ! # Alternative flags to the C compiler for mach_dep.c. ! # Mach_dep.c often doesn't like optimization, and it's ! # not time-critical anyway. ! # Set SPECIALCFLAGS to -q nodirect_code on Encore. ! ! all: gc.a gctest ! ! BSD-pkg-all: bsd-libgc.a ! ! bsd-libgc.a: ! $(MAKE) CFLAGS="$(CFLAGS)" clean c++-t ! mv gc.a bsd-libgc.a ! ! BSD-pkg-install: BSD-pkg-all ! ${CP} bsd-libgc.a libgc.a ! ${INSTALL_DATA} libgc.a ${PREFIX}/lib ! ${INSTALL_DATA} gc.h gc_cpp.h ${PREFIX}/include ! ! pcr: PCR-Makefile include/private/gc_private.h include/private/gc_hdrs.h \ ! include/private/gc_locks.h include/gc.h include/private/gcconfig.h \ ! mach_dep.o $(SRCS) ! $(MAKE) -f PCR-Makefile depend ! $(MAKE) -f PCR-Makefile ! ! $(OBJS) tests/test.o dyn_load.o dyn_load_sunos53.o: \ ! $(srcdir)/include/private/gc_priv.h \ ! $(srcdir)/include/private/gc_hdrs.h $(srcdir)/include/private/gc_locks.h \ ! $(srcdir)/include/gc.h \ ! $(srcdir)/include/private/gcconfig.h $(srcdir)/include/gc_typed.h \ ! Makefile ! # The dependency on Makefile is needed. Changing ! # options such as -DSILENT affects the size of GC_arrays, ! # invalidating all .o files that rely on gc_priv.h ! ! mark.o typd_mlc.o finalize.o ptr_chck.o: $(srcdir)/include/gc_mark.h $(srcdir)/include/private/gc_pmark.h ! ! specific.o linux_threads.o: $(srcdir)/include/private/specific.h ! ! solaris_threads.o solaris_pthreads.o: $(srcdir)/include/private/solaris_threads.h ! ! dbg_mlc.o gcj_mlc.o: $(srcdir)/include/private/dbg_mlc.h ! ! tests/test.o: tests $(srcdir)/tests/test.c ! $(CC) $(CFLAGS) -c $(srcdir)/tests/test.c ! mv test.o tests/test.o ! ! tests: ! mkdir tests ! ! base_lib gc.a: $(OBJS) dyn_load.o $(UTILS) ! echo > base_lib ! rm -f dont_ar_1 ! ./if_mach SPARC SUNOS5 touch dont_ar_1 ! ./if_mach SPARC SUNOS5 $(AR) rus gc.a $(OBJS) dyn_load.o ! ./if_mach M68K AMIGA touch dont_ar_1 ! ./if_mach M68K AMIGA $(AR) -vrus gc.a $(OBJS) dyn_load.o ! ./if_not_there dont_ar_1 $(AR) ru gc.a $(OBJS) dyn_load.o ! ./if_not_there dont_ar_1 $(RANLIB) gc.a || cat /dev/null ! # ignore ranlib failure; that usually means it doesn't exist, and isn't needed ! ! cords: $(CORD_OBJS) cord/cordtest $(UTILS) ! rm -f dont_ar_3 ! ./if_mach SPARC SUNOS5 touch dont_ar_3 ! ./if_mach SPARC SUNOS5 $(AR) rus gc.a $(CORD_OBJS) ! ./if_mach M68K AMIGA touch dont_ar_3 ! ./if_mach M68K AMIGA $(AR) -vrus gc.a $(CORD_OBJS) ! ./if_not_there dont_ar_3 $(AR) ru gc.a $(CORD_OBJS) ! ./if_not_there dont_ar_3 $(RANLIB) gc.a || cat /dev/null ! ! gc_cpp.o: $(srcdir)/gc_cpp.cc $(srcdir)/include/gc_cpp.h $(srcdir)/include/gc.h Makefile ! $(CXX) -c $(CXXFLAGS) $(srcdir)/gc_cpp.cc ! ! test_cpp: $(srcdir)/tests/test_cpp.cc $(srcdir)/include/gc_cpp.h gc_cpp.o $(srcdir)/include/gc.h \ ! base_lib $(UTILS) ! rm -f test_cpp ! ./if_mach HP_PA HPUX $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/tests/test_cpp.cc gc_cpp.o gc.a -ldld `./threadlibs` ! ./if_not_there test_cpp $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/tests/test_cpp.cc gc_cpp.o gc.a `./threadlibs` ! ! c++-t: c++ ! ./test_cpp 1 ! ! c++-nt: c++ ! @echo "Use ./test_cpp 1 to test the leak library" ! ! c++: gc_cpp.o $(srcdir)/include/gc_cpp.h test_cpp ! rm -f dont_ar_4 ! ./if_mach SPARC SUNOS5 touch dont_ar_4 ! ./if_mach SPARC SUNOS5 $(AR) rus gc.a gc_cpp.o ! ./if_mach M68K AMIGA touch dont_ar_4 ! ./if_mach M68K AMIGA $(AR) -vrus gc.a gc_cpp.o ! ./if_not_there dont_ar_4 $(AR) ru gc.a gc_cpp.o ! ./if_not_there dont_ar_4 $(RANLIB) gc.a || cat /dev/null ! ./test_cpp 1 ! echo > c++ ! ! dyn_load_sunos53.o: dyn_load.c ! $(CC) $(CFLAGS) -DSUNOS53_SHARED_LIB -c $(srcdir)/dyn_load.c -o $@ ! ! # SunOS5 shared library version of the collector ! sunos5gc.so: $(OBJS) dyn_load_sunos53.o ! $(CC) -G -o sunos5gc.so $(OBJS) dyn_load_sunos53.o -ldl ! ln sunos5gc.so libgc.so ! ! # Alpha/OSF shared library version of the collector ! libalphagc.so: $(OBJS) ! ld -shared -o libalphagc.so $(OBJS) dyn_load.o -lc ! ln libalphagc.so libgc.so ! ! # IRIX shared library version of the collector ! libirixgc.so: $(OBJS) dyn_load.o ! ld -shared $(ABI_FLAG) -o libirixgc.so $(OBJS) dyn_load.o -lc ! ln libirixgc.so libgc.so ! ! # Linux shared library version of the collector ! liblinuxgc.so: $(OBJS) dyn_load.o ! gcc -shared -o liblinuxgc.so $(OBJS) dyn_load.o ! ln liblinuxgc.so libgc.so ! ! # Alternative Linux rule. This is preferable, but is likely to break the ! # Makefile for some non-linux platforms. ! # LIBOBJS= $(patsubst %.o, %.lo, $(OBJS)) ! # ! #.SUFFIXES: .lo $(SUFFIXES) ! # ! #.c.lo: ! # $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c $< -o $@ # ! # liblinuxgc.so: $(LIBOBJS) dyn_load.lo ! # gcc -shared -Wl,-soname=libgc.so.0 -o libgc.so.0 $(LIBOBJS) dyn_load.lo ! # touch liblinuxgc.so ! ! mach_dep.o: $(srcdir)/mach_dep.c $(srcdir)/mips_sgi_mach_dep.S \ ! $(srcdir)/mips_ultrix_mach_dep.s \ ! $(srcdir)/rs6000_mach_dep.s $(srcdir)/powerpc_macosx_mach_dep.s \ ! $(srcdir)/sparc_mach_dep.S $(srcdir)/sparc_sunos4_mach_dep.s \ ! $(srcdir)/ia64_save_regs_in_stack.s \ ! $(srcdir)/sparc_netbsd_mach_dep.s $(UTILS) ! rm -f mach_dep.o ! ./if_mach MIPS IRIX5 $(AS) -o mach_dep.o $(srcdir)/mips_sgi_mach_dep.S ! ./if_mach MIPS RISCOS $(AS) -o mach_dep.o $(srcdir)/mips_ultrix_mach_dep.s ! ./if_mach MIPS ULTRIX $(AS) -o mach_dep.o $(srcdir)/mips_ultrix_mach_dep.s ! ./if_mach POWERPC MACOSX $(AS) -o mach_dep.o $(srcdir)/powerpc_macosx_mach_dep.s ! ./if_mach ALPHA "" $(CC) -c -o mach_dep.o $(srcdir)/alpha_mach_dep.S ! ./if_mach SPARC SUNOS5 $(CC) -c -o mach_dep.o $(srcdir)/sparc_mach_dep.S ! ./if_mach SPARC SUNOS4 $(AS) -o mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s ! ./if_mach SPARC OPENBSD $(AS) -o mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s ! ./if_mach SPARC NETBSD $(AS) -o mach_dep.o $(srcdir)/sparc_netbsd_mach_dep.s ! ./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/ia64_save_regs_in_stack.s ! ./if_mach IA64 "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c ! ./if_mach IA64 "" ld -r -o mach_dep.o mach_dep1.o ia64_save_regs_in_stack.o ! ./if_not_there mach_dep.o $(CC) -c $(SPECIALCFLAGS) $(srcdir)/mach_dep.c ! ! mark_rts.o: $(srcdir)/mark_rts.c $(UTILS) ! rm -f mark_rts.o ! -./if_mach ALPHA OSF1 $(CC) -c $(CFLAGS) -Wo,-notail $(srcdir)/mark_rts.c ! ./if_not_there mark_rts.o $(CC) -c $(CFLAGS) $(srcdir)/mark_rts.c ! # Work-around for DEC optimizer tail recursion elimination bug. ! # The ALPHA-specific line should be removed if gcc is used. ! ! alloc.o: version.h ! ! cord: ! mkdir cord ! ! cord/cordbscs.o: cord $(srcdir)/cord/cordbscs.c $(CORD_INCLUDE_FILES) ! $(CC) $(CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordbscs.c ! mv cordbscs.o cord/cordbscs.o ! # not all compilers understand -o filename ! ! cord/cordxtra.o: cord $(srcdir)/cord/cordxtra.c $(CORD_INCLUDE_FILES) ! $(CC) $(CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordxtra.c ! mv cordxtra.o cord/cordxtra.o ! ! cord/cordprnt.o: cord $(srcdir)/cord/cordprnt.c $(CORD_INCLUDE_FILES) ! $(CC) $(CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordprnt.c ! mv cordprnt.o cord/cordprnt.o ! ! cord/cordtest: $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a $(UTILS) ! rm -f cord/cordtest ! ./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a -lucb ! ./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a -ldld `./threadlibs` ! ./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a `./threadlibs` ! ./if_not_there cord/cordtest $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a `./threadlibs` ! ! cord/de: $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(UTILS) ! rm -f cord/de ! ./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) -lucb `./threadlibs` ! ./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) -ldld `./threadlibs` ! ./if_mach RS6000 "" $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses ! ./if_mach POWERPC MACOSX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a ! ./if_mach I386 LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses `./threadlibs` ! ./if_mach ALPHA LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses `./threadlibs` ! ./if_mach IA64 LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses `./threadlibs` ! ./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses ! ./if_not_there cord/de $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) `./threadlibs` ! ! if_mach: $(srcdir)/if_mach.c $(srcdir)/include/private/gcconfig.h ! $(HOSTCC) $(HOSTCFLAGS) -o if_mach $(srcdir)/if_mach.c ! ! threadlibs: $(srcdir)/threadlibs.c $(srcdir)/include/private/gcconfig.h Makefile ! $(HOSTCC) $(HOSTCFLAGS) -o threadlibs $(srcdir)/threadlibs.c ! ! if_not_there: $(srcdir)/if_not_there.c ! $(HOSTCC) $(HOSTCFLAGS) -o if_not_there $(srcdir)/if_not_there.c ! ! clean: ! rm -f gc.a *.o *.exe tests/*.o gctest gctest_dyn_link test_cpp \ ! setjmp_test mon.out gmon.out a.out core if_not_there if_mach \ ! threadlibs $(CORD_OBJS) cord/cordtest cord/de ! -rm -f *~ ! ! gctest: tests/test.o gc.a $(UTILS) ! rm -f gctest ! ./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o gctest tests/test.o gc.a -lucb ! ./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o gctest tests/test.o gc.a -ldld `./threadlibs` ! ./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o gctest tests/test.o gc.a `./threadlibs` ! ./if_not_there gctest $(CC) $(CFLAGS) -o gctest tests/test.o gc.a `./threadlibs` ! ! # If an optimized setjmp_test generates a segmentation fault, ! # odds are your compiler is broken. Gctest may still work. ! # Try compiling setjmp_t.c unoptimized. ! setjmp_test: $(srcdir)/setjmp_t.c $(srcdir)/include/gc.h $(UTILS) ! $(CC) $(CFLAGS) -o setjmp_test $(srcdir)/setjmp_t.c ! ! test: KandRtest cord/cordtest ! cord/cordtest ! ! # Those tests that work even with a K&R C compiler: ! KandRtest: setjmp_test gctest ! ./setjmp_test ! ./gctest ! ! add_gc_prefix: $(srcdir)/add_gc_prefix.c $(srcdir)/version.h ! $(CC) -o add_gc_prefix $(srcdir)/add_gc_prefix.c ! ! gcname: $(srcdir)/gcname.c $(srcdir)/version.h ! $(CC) -o gcname $(srcdir)/gcname.c ! ! gc.tar: $(SRCS) $(DOC_FILES) $(OTHER_FILES) add_gc_prefix gcname ! cp Makefile Makefile.old ! cp Makefile.direct Makefile ! rm -f `./gcname` ! ln -s . `./gcname` ! ./add_gc_prefix $(SRCS) $(DOC_FILES) $(OTHER_FILES) > /tmp/gc.tar-files ! tar cvfh gc.tar `cat /tmp/gc.tar-files` ! cp gc.tar `./gcname`.tar ! gzip `./gcname`.tar ! rm `./gcname` ! ! pc_gc.tar: $(SRCS) $(OTHER_FILES) ! tar cvfX pc_gc.tar pc_excludes $(SRCS) $(OTHER_FILES) ! ! floppy: pc_gc.tar ! -mmd a:/cord ! -mmd a:/cord/private ! -mmd a:/include ! -mmd a:/include/private ! mkdir /tmp/pc_gc ! cat pc_gc.tar | (cd /tmp/pc_gc; tar xvf -) ! -mcopy -tmn /tmp/pc_gc/* a: ! -mcopy -tmn /tmp/pc_gc/cord/* a:/cord ! -mcopy -mn /tmp/pc_gc/cord/de_win.ICO a:/cord ! -mcopy -tmn /tmp/pc_gc/cord/private/* a:/cord/private ! -mcopy -tmn /tmp/pc_gc/include/* a:/include ! -mcopy -tmn /tmp/pc_gc/include/private/* a:/include/private ! rm -r /tmp/pc_gc ! ! gc.tar.Z: gc.tar ! compress gc.tar ! ! gc.tar.gz: gc.tar ! gzip gc.tar ! ! lint: $(CSRCS) tests/test.c ! lint -DLINT $(CSRCS) tests/test.c | egrep -v "possible pointer alignment problem|abort|exit|sbrk|mprotect|syscall|change in ANSI|improper alignment" ! ! # BTL: added to test shared library version of collector. ! # Currently works only under SunOS5. Requires GC_INIT call from statically ! # loaded client code. ! ABSDIR = `pwd` ! gctest_dyn_link: tests/test.o libgc.so ! $(CC) -L$(ABSDIR) -R$(ABSDIR) -o gctest_dyn_link tests/test.o -lgc -ldl -lthread ! ! gctest_irix_dyn_link: tests/test.o libirixgc.so ! $(CC) -L$(ABSDIR) -o gctest_irix_dyn_link tests/test.o -lirixgc ! ! # The following appear to be dead, especially since libgc_globals.h ! # is apparently lost. ! test_dll.o: tests/test.c libgc_globals.h ! $(CC) $(CFLAGS) -DGC_USE_DLL -c tests/test.c -o test_dll.o ! ! test_dll: test_dll.o libgc_dll.a libgc.dll ! $(CC) test_dll.o -L$(ABSDIR) -lgc_dll -o test_dll ! ! SYM_PREFIX-libgc=GC ! ! # Uncomment the following line to build a GNU win32 DLL ! # include Makefile.DLLs ! ! reserved_namespace: $(SRCS) ! for file in $(SRCS) tests/test.c tests/test_cpp.cc; do \ ! sed s/GC_/_GC_/g < $$file > tmp; \ ! cp tmp $$file; \ ! done ! ! user_namespace: $(SRCS) ! for file in $(SRCS) tests/test.c tests/test_cpp.cc; do \ ! sed s/_GC_/GC_/g < $$file > tmp; \ ! cp tmp $$file; \ ! done --- 1,673 ---- ! # Makefile.in generated by automake 1.6.1 from Makefile.am. ! # Generated automatically from Makefile.in by configure. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. ! # This Makefile.in is free software; the Free Software Foundation ! # gives unlimited permission to copy and/or distribute it, ! # with or without modifications, as long as this notice is preserved. ! ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY, to the extent permitted by law; without ! # even the implied warranty of MERCHANTABILITY or FITNESS FOR A ! # PARTICULAR PURPOSE. ! ! ! ! # Copyright (c) 1999-2001 by Red Hat, Inc. All rights reserved. ! # ! # THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED ! # OR IMPLIED. ANY USE IS AT YOUR OWN RISK. ! # ! # Permission is hereby granted to use or copy this program ! # for any purpose, provided the above notices are retained on all copies. ! # Permission to modify the code and to distribute modified code is granted, ! # provided the above notices are retained, and a notice that the code was ! # modified is included with the above copyright notice. # ! # Original author: Tom Tromey ! # Severely truncated by Hans-J. Boehm ! SHELL = /bin/sh ! ! srcdir = . ! top_srcdir = . ! ! prefix = /usr/local ! exec_prefix = ${prefix} ! ! bindir = ${exec_prefix}/bin ! sbindir = ${exec_prefix}/sbin ! libexecdir = ${exec_prefix}/libexec ! datadir = ${prefix}/share ! sysconfdir = ${prefix}/etc ! sharedstatedir = ${prefix}/com ! localstatedir = ${prefix}/var ! libdir = ${exec_prefix}/lib ! infodir = ${prefix}/info ! mandir = ${prefix}/man ! includedir = ${prefix}/include ! oldincludedir = /usr/include ! pkgdatadir = $(datadir)/gc ! pkglibdir = $(libdir)/gc ! pkgincludedir = $(includedir)/gc ! top_builddir = . ! ! ACLOCAL = ${SHELL} /home/src/w3m/w3m-0.3.2.2-k2/gc/missing --run aclocal-1.6 ! AUTOCONF = ${SHELL} /home/src/w3m/w3m-0.3.2.2-k2/gc/missing --run autoconf ! AUTOMAKE = ${SHELL} /home/src/w3m/w3m-0.3.2.2-k2/gc/missing --run automake-1.6 ! AUTOHEADER = ${SHELL} /home/src/w3m/w3m-0.3.2.2-k2/gc/missing --run autoheader ! ! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ! INSTALL = /usr/bin/install -c ! INSTALL_PROGRAM = ${INSTALL} ! INSTALL_DATA = ${INSTALL} -m 644 ! install_sh_DATA = $(install_sh) -c -m 644 ! install_sh_PROGRAM = $(install_sh) -c ! INSTALL_SCRIPT = ${INSTALL} ! INSTALL_HEADER = $(INSTALL_DATA) ! transform = s,x,x, ! NORMAL_INSTALL = : ! PRE_INSTALL = : ! POST_INSTALL = : ! NORMAL_UNINSTALL = : ! PRE_UNINSTALL = : ! POST_UNINSTALL = : ! host_alias = arm-linux ! host_triplet = arm-unknown-linux-gnu ! ! EXEEXT = ! OBJEXT = o ! PATH_SEPARATOR = : ! AMTAR = ${SHELL} /home/src/w3m/w3m-0.3.2.2-k2/gc/missing --run tar ! AR = arm-linux-ar ! AS = @AS@ ! AWK = mawk ! CC = arm-linux-gcc ! CCAS = $(CC) ! CCASFLAGS = $(CFLAGS) ! CFLAGS = -g -O2 ! CXX = arm-linux-g++ ! CXXFLAGS = -g -O2 ! CXXINCLUDES = ! DEPDIR = .deps ! DLLTOOL = @DLLTOOL@ ! ECHO = echo ! EXTRA_TEST_LIBS = -ldl ! GC_CFLAGS = -fexceptions ! INCLUDES = -I./include ! INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s ! LIBTOOL = $(SHELL) $(top_builddir)/libtool ! LN_S = ln -s ! MAINT = # ! MY_CFLAGS = -g -O2 ! OBJDUMP = @OBJDUMP@ ! PACKAGE = gc ! RANLIB = arm-linux-ranlib ! STRIP = arm-linux-strip ! THREADLIBS = ! VERSION = 6.1 ! addobjs = mach_dep.lo ! am__include = include ! am__quote = ! gc_basedir = ./dummy ! install_sh = /home/src/w3m/w3m-0.3.2.2-k2/gc/install-sh ! target_all = libgc.la ! ! AUTOMAKE_OPTIONS = foreign ! ! lib_LTLIBRARIES = libgc.la ! ! libgc_la_SOURCES = allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \ ! dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c irix_threads.c \ ! linux_threads.c malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \ ! obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c \ ! solaris_pthreads.c solaris_threads.c specific.c stubborn.c typd_mlc.c \ ! backgraph.c win32_threads.c ! ! ! # Include THREADLIBS here to ensure that the correct versions of ! # linuxthread semaphore functions get linked: ! libgc_la_LIBADD = mach_dep.lo $(THREADLIBS) ! libgc_la_DEPENDENCIES = mach_dep.lo ! libgc_la_LDFLAGS = -version-info 1:1:0 ! ! EXTRA_libgc_la_SOURCES = alpha_mach_dep.s \ ! mips_sgi_mach_dep.S mips_ultrix_mach_dep.s powerpc_macosx_mach_dep.s \ ! rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \ ! sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s ! ! ! AM_CXXFLAGS = -fexceptions ! AM_CFLAGS = -fexceptions ! ! check_PROGRAMS = gctest ! # Using $< in the above seems to fail with the HP/UX on Itanium make. ! ! # gctest_OBJECTS = test.o ! gctest_SOURCES = ! gctest_LDADD = test.o ./libgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS) ! TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc ! TESTS = gctest ! ! all_objs = mach_dep.lo $(libgc_la_OBJECTS) ! ! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \ ! $(AM_CPPFLAGS) $(CPPFLAGS) \ ! $(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS) ! ! LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LDFLAGS) -o $@ ! ! # Work around what appears to be a GNU make bug handling MAKEFLAGS ! # values defined in terms of make variables, as is the case for CC and ! # friends when we are called from the top level Makefile. ! AM_MAKEFLAGS = \ ! "AR_FLAGS=$(AR_FLAGS)" \ ! "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ ! "CFLAGS=$(CFLAGS)" \ ! "CXXFLAGS=$(CXXFLAGS)" \ ! "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ ! "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ ! "INSTALL=$(INSTALL)" \ ! "INSTALL_DATA=$(INSTALL_DATA)" \ ! "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ ! "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ ! "LDFLAGS=$(LDFLAGS)" \ ! "LIBCFLAGS=$(LIBCFLAGS)" \ ! "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ ! "MAKE=$(MAKE)" \ ! "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ ! "PICFLAG=$(PICFLAG)" \ ! "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ ! "SHELL=$(SHELL)" \ ! "EXPECT=$(EXPECT)" \ ! "RUNTEST=$(RUNTEST)" \ ! "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ ! "exec_prefix=$(exec_prefix)" \ ! "infodir=$(infodir)" \ ! "libdir=$(libdir)" \ ! "prefix=$(prefix)" \ ! "tooldir=$(tooldir)" \ ! "AR=$(AR)" \ ! "AS=$(AS)" \ ! "CC=$(CC)" \ ! "CXX=$(CXX)" \ ! "LD=$(LD)" \ ! "LIBCFLAGS=$(LIBCFLAGS)" \ ! "NM=$(NM)" \ ! "PICFLAG=$(PICFLAG)" \ ! "RANLIB=$(RANLIB)" \ ! "DESTDIR=$(DESTDIR)" ! ! ! CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host ! ! MAKEOVERRIDES = ! subdir = . ! ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ! mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_CLEAN_FILES = ! LTLIBRARIES = $(lib_LTLIBRARIES) ! ! am_libgc_la_OBJECTS = allchblk.lo alloc.lo blacklst.lo checksums.lo \ ! dbg_mlc.lo dyn_load.lo finalize.lo gc_dlopen.lo gcj_mlc.lo \ ! headers.lo irix_threads.lo linux_threads.lo malloc.lo \ ! mallocx.lo mark.lo mark_rts.lo misc.lo new_hblk.lo obj_map.lo \ ! os_dep.lo pcr_interface.lo ptr_chck.lo real_malloc.lo \ ! reclaim.lo solaris_pthreads.lo solaris_threads.lo specific.lo \ ! stubborn.lo typd_mlc.lo backgraph.lo win32_threads.lo ! libgc_la_OBJECTS = $(am_libgc_la_OBJECTS) ! check_PROGRAMS = gctest$(EXEEXT) ! am_gctest_OBJECTS = ! gctest_OBJECTS = $(am_gctest_OBJECTS) ! gctest_DEPENDENCIES = test.o ./libgc.la ! gctest_LDFLAGS = ! ! DEFS = -DHAVE_DLFCN_H=1 -DSILENT=1 -DNO_SIGNALS=1 -DNO_EXECUTE_PERMISSION=1 -DALL_INTERIOR_POINTERS=1 -DJAVA_FINALIZATION=1 -DGC_GCJ_SUPPORT=1 -DATOMIC_UNCOLLECTABLE=1 ! DEFAULT_INCLUDES = -I. -I$(srcdir) ! CPPFLAGS = ! LDFLAGS = ! LIBS = ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! DEP_FILES = ./$(DEPDIR)/allchblk.Plo ./$(DEPDIR)/alloc.Plo \ ! ./$(DEPDIR)/backgraph.Plo ./$(DEPDIR)/blacklst.Plo \ ! ./$(DEPDIR)/checksums.Plo ./$(DEPDIR)/dbg_mlc.Plo \ ! ./$(DEPDIR)/dyn_load.Plo ./$(DEPDIR)/finalize.Plo \ ! ./$(DEPDIR)/gc_dlopen.Plo ./$(DEPDIR)/gcj_mlc.Plo \ ! ./$(DEPDIR)/headers.Plo \ ! ./$(DEPDIR)/irix_threads.Plo \ ! ./$(DEPDIR)/linux_threads.Plo \ ! ./$(DEPDIR)/malloc.Plo ./$(DEPDIR)/mallocx.Plo \ ! ./$(DEPDIR)/mark.Plo ./$(DEPDIR)/mark_rts.Plo \ ! ./$(DEPDIR)/misc.Plo ./$(DEPDIR)/new_hblk.Plo \ ! ./$(DEPDIR)/obj_map.Plo ./$(DEPDIR)/os_dep.Plo \ ! ./$(DEPDIR)/pcr_interface.Plo \ ! ./$(DEPDIR)/ptr_chck.Plo \ ! ./$(DEPDIR)/real_malloc.Plo ./$(DEPDIR)/reclaim.Plo \ ! ./$(DEPDIR)/solaris_pthreads.Plo \ ! ./$(DEPDIR)/solaris_threads.Plo \ ! ./$(DEPDIR)/specific.Plo ./$(DEPDIR)/stubborn.Plo \ ! ./$(DEPDIR)/typd_mlc.Plo \ ! ./$(DEPDIR)/win32_threads.Plo ! CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) ! LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \ ! $(CCASFLAGS) ! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ! $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! CCLD = $(CC) ! DIST_SOURCES = $(libgc_la_SOURCES) $(EXTRA_libgc_la_SOURCES) \ ! $(gctest_SOURCES) ! DIST_COMMON = Makefile.am Makefile.in acinclude.m4 aclocal.m4 \ ! config.guess config.sub configure configure.in depcomp \ ! install-sh ltconfig ltmain.sh missing mkinstalldirs ! SOURCES = $(libgc_la_SOURCES) $(EXTRA_libgc_la_SOURCES) $(gctest_SOURCES) ! ! all: all-am ! ! .SUFFIXES: ! .SUFFIXES: .S .c .lo .o .obj .s ! $(srcdir)/Makefile.in: # Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && \ ! $(AUTOMAKE) --foreign Makefile ! Makefile: # $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) ! ! $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ! $(SHELL) ./config.status --recheck ! $(srcdir)/configure: # $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) ! cd $(srcdir) && $(AUTOCONF) ! ! $(ACLOCAL_M4): # configure.in acinclude.m4 ! cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ! libLTLIBRARIES_INSTALL = $(INSTALL) ! install-libLTLIBRARIES: $(lib_LTLIBRARIES) ! @$(NORMAL_INSTALL) ! $(mkinstalldirs) $(DESTDIR)$(libdir) ! @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! if test -f $$p; then \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ ! $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ ! else :; fi; \ ! done ! ! uninstall-libLTLIBRARIES: ! @$(NORMAL_UNINSTALL) ! @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! p="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ ! done ! ! clean-libLTLIBRARIES: ! -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) ! libgc.la: $(libgc_la_OBJECTS) $(libgc_la_DEPENDENCIES) ! $(LINK) -rpath $(libdir) $(libgc_la_LDFLAGS) $(libgc_la_OBJECTS) $(libgc_la_LIBADD) $(LIBS) ! ! clean-checkPROGRAMS: ! -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) ! gctest$(EXEEXT): $(gctest_OBJECTS) $(gctest_DEPENDENCIES) ! @rm -f gctest$(EXEEXT) ! $(LINK) $(gctest_LDFLAGS) $(gctest_OBJECTS) $(gctest_LDADD) $(LIBS) ! ! mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core ! ! distclean-compile: ! -rm -f *.tab.c ! ! include ./$(DEPDIR)/allchblk.Plo ! include ./$(DEPDIR)/alloc.Plo ! include ./$(DEPDIR)/backgraph.Plo ! include ./$(DEPDIR)/blacklst.Plo ! include ./$(DEPDIR)/checksums.Plo ! include ./$(DEPDIR)/dbg_mlc.Plo ! include ./$(DEPDIR)/dyn_load.Plo ! include ./$(DEPDIR)/finalize.Plo ! include ./$(DEPDIR)/gc_dlopen.Plo ! include ./$(DEPDIR)/gcj_mlc.Plo ! include ./$(DEPDIR)/headers.Plo ! include ./$(DEPDIR)/irix_threads.Plo ! include ./$(DEPDIR)/linux_threads.Plo ! include ./$(DEPDIR)/malloc.Plo ! include ./$(DEPDIR)/mallocx.Plo ! include ./$(DEPDIR)/mark.Plo ! include ./$(DEPDIR)/mark_rts.Plo ! include ./$(DEPDIR)/misc.Plo ! include ./$(DEPDIR)/new_hblk.Plo ! include ./$(DEPDIR)/obj_map.Plo ! include ./$(DEPDIR)/os_dep.Plo ! include ./$(DEPDIR)/pcr_interface.Plo ! include ./$(DEPDIR)/ptr_chck.Plo ! include ./$(DEPDIR)/real_malloc.Plo ! include ./$(DEPDIR)/reclaim.Plo ! include ./$(DEPDIR)/solaris_pthreads.Plo ! include ./$(DEPDIR)/solaris_threads.Plo ! include ./$(DEPDIR)/specific.Plo ! include ./$(DEPDIR)/stubborn.Plo ! include ./$(DEPDIR)/typd_mlc.Plo ! include ./$(DEPDIR)/win32_threads.Plo ! ! distclean-depend: ! -rm -rf ./$(DEPDIR) ! ! .S.o: ! $(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ! ! .S.obj: ! $(CCASCOMPILE) -c `cygpath -w $<` ! ! .S.lo: ! $(LTCCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ! ! .c.o: ! source='$<' object='$@' libtool=no \ ! depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \ ! $(CCDEPMODE) $(depcomp) \ ! $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ! ! .c.obj: ! source='$<' object='$@' libtool=no \ ! depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \ ! $(CCDEPMODE) $(depcomp) \ ! $(COMPILE) -c `cygpath -w $<` ! ! .c.lo: ! source='$<' object='$@' libtool=yes \ ! depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \ ! $(CCDEPMODE) $(depcomp) \ ! $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ! CCDEPMODE = depmode=gcc ! ! .s.o: ! $(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ! ! .s.obj: ! $(CCASCOMPILE) -c `cygpath -w $<` ! ! mostlyclean-libtool: ! -rm -f *.lo ! ! clean-libtool: ! -rm -rf .libs _libs ! ! distclean-libtool: ! -rm -f libtool ! uninstall-info-am: ! ! ETAGS = etags ! ETAGSFLAGS = ! ! tags: TAGS ! ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! mkid -fID $$unique ! ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) ! tags=; \ ! here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$tags$$unique" \ ! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique ! ! GTAGS: ! here=`$(am__cd) $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here ! ! distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! ! check-TESTS: $(TESTS) ! @failed=0; all=0; xfail=0; xpass=0; \ ! srcdir=$(srcdir); export srcdir; \ ! list='$(TESTS)'; \ ! if test -n "$$list"; then \ ! for tst in $$list; do \ ! if test -f ./$$tst; then dir=./; \ ! elif test -f $$tst; then dir=; \ ! else dir="$(srcdir)/"; fi; \ ! if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ ! all=`expr $$all + 1`; \ ! case " $(XFAIL_TESTS) " in \ ! *" $$tst "*) \ ! xpass=`expr $$xpass + 1`; \ ! failed=`expr $$failed + 1`; \ ! echo "XPASS: $$tst"; \ ! ;; \ ! *) \ ! echo "PASS: $$tst"; \ ! ;; \ ! esac; \ ! elif test $$? -ne 77; then \ ! all=`expr $$all + 1`; \ ! case " $(XFAIL_TESTS) " in \ ! *" $$tst "*) \ ! xfail=`expr $$xfail + 1`; \ ! echo "XFAIL: $$tst"; \ ! ;; \ ! *) \ ! failed=`expr $$failed + 1`; \ ! echo "FAIL: $$tst"; \ ! ;; \ ! esac; \ ! fi; \ ! done; \ ! if test "$$failed" -eq 0; then \ ! if test "$$xfail" -eq 0; then \ ! banner="All $$all tests passed"; \ ! else \ ! banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ! fi; \ ! else \ ! if test "$$xpass" -eq 0; then \ ! banner="$$failed of $$all tests failed"; \ ! else \ ! banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ! fi; \ ! fi; \ ! dashes=`echo "$$banner" | sed s/./=/g`; \ ! echo "$$dashes"; \ ! echo "$$banner"; \ ! echo "$$dashes"; \ ! test "$$failed" -eq 0; \ ! else :; fi ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! ! top_distdir = . ! distdir = $(PACKAGE)-$(VERSION) ! ! am__remove_distdir = \ ! { test ! -d $(distdir) \ ! || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ ! && rm -fr $(distdir); }; } ! ! GZIP_ENV = --best ! distcleancheck_listfiles = find . -type f -print ! ! distdir: $(DISTFILES) ! $(am__remove_distdir) ! mkdir $(distdir) ! @for file in $(DISTFILES); do \ ! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ ! else \ ! dir=''; \ ! fi; \ ! if test -d $$d/$$file; then \ ! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ! fi; \ ! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ! else \ ! test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ ! fi; \ ! done ! -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ ! || chmod -R a+r $(distdir) ! dist-gzip: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ! $(am__remove_distdir) ! ! dist dist-all: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ! $(am__remove_distdir) ! ! # This target untars the dist file and tries a VPATH configuration. Then ! # it guarantees that the distribution is self-contained by making another ! # tarfile. ! distcheck: dist ! $(am__remove_distdir) ! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ! chmod -R a-w $(distdir); chmod a+w $(distdir) ! mkdir $(distdir)/=build ! mkdir $(distdir)/=inst ! chmod a-w $(distdir) ! dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ ! && cd $(distdir)/=build \ ! && ../configure --srcdir=.. --prefix=$$dc_install_base \ ! $(DISTCHECK_CONFIGURE_FLAGS) \ ! && $(MAKE) $(AM_MAKEFLAGS) \ ! && $(MAKE) $(AM_MAKEFLAGS) dvi \ ! && $(MAKE) $(AM_MAKEFLAGS) check \ ! && $(MAKE) $(AM_MAKEFLAGS) install \ ! && $(MAKE) $(AM_MAKEFLAGS) installcheck \ ! && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ! && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ ! || { echo "ERROR: files left after uninstall:" ; \ ! find $$dc_install_base -type f -print ; \ ! exit 1; } >&2 ) \ ! && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ ! && rm -f $(distdir).tar.gz \ ! && $(MAKE) $(AM_MAKEFLAGS) distcleancheck ! $(am__remove_distdir) ! @echo "$(distdir).tar.gz is ready for distribution" | \ ! sed 'h;s/./=/g;p;x;p;x' ! distcleancheck: distclean ! if test '$(srcdir)' = . ; then \ ! echo "ERROR: distcleancheck can only run from a VPATH build" ; \ ! exit 1 ; \ ! fi ! test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ! || { echo "ERROR: files left after distclean:" ; \ ! $(distcleancheck_listfiles) ; \ ! exit 1; } >&2 ! check-am: all-am ! $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) ! $(MAKE) $(AM_MAKEFLAGS) check-TESTS ! check: check-am ! all-am: Makefile $(LTLIBRARIES) ! ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(libdir) ! ! install: install-am ! install-exec: install-exec-am ! install-data: install-data-am ! uninstall: uninstall-am ! ! install-am: all-am ! @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ! ! installcheck: installcheck-am ! install-strip: ! $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! INSTALL_STRIP_FLAG=-s \ ! `test -z '$(STRIP)' || \ ! echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ! mostlyclean-generic: ! ! clean-generic: ! ! distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* ! ! maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-am ! ! clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ ! clean-libtool mostlyclean-am ! ! distclean: distclean-am ! -rm -f config.status config.cache config.log ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags ! ! dvi: dvi-am ! ! dvi-am: ! ! info: info-am ! ! info-am: ! ! install-data-am: ! ! install-exec-am: install-libLTLIBRARIES ! ! install-info: install-info-am ! ! install-man: ! ! installcheck-am: ! ! maintainer-clean: maintainer-clean-am ! ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-am ! ! mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool ! ! uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES ! ! .PHONY: GTAGS all all-am check check-TESTS check-am clean \ ! clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ ! clean-libtool dist dist-all dist-gzip distcheck distclean \ ! distclean-compile distclean-depend distclean-generic \ ! distclean-libtool distclean-tags distcleancheck distdir dvi \ ! dvi-am info info-am install install-am install-data \ ! install-data-am install-exec install-exec-am install-info \ ! install-info-am install-libLTLIBRARIES install-man \ ! install-strip installcheck installcheck-am installdirs \ ! maintainer-clean maintainer-clean-generic mostlyclean \ ! mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ! tags uninstall uninstall-am uninstall-info-am \ ! uninstall-libLTLIBRARIES ! ! # The following hack produces a warning from automake, but we need it in order ! # to build a file from a subdirectory. FIXME. ! test.o: $(srcdir)/tests/test.c ! $(COMPILE) -c $(srcdir)/tests/test.c ! $(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \ ! include/private/gc_hdrs.h include/gc.h include/gc_gcj.h include/gc_mark.h ! ! .s.lo: ! $(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $< ! # Tell versions [3.59,3.63) of GNU make to not export all variables. ! # Otherwise a system limit (for SysV at least) may be exceeded. ! .NOEXPORT: diff -cNr w3m-0.3.2.2.org/gc/misc.c w3m-0.3.2.2-k2/gc/misc.c *** w3m-0.3.2.2.org/gc/misc.c Wed Jul 10 23:21:16 2002 --- w3m-0.3.2.2-k2/gc/misc.c Sat Dec 28 00:24:54 2002 *************** *** 77,83 **** #undef STACKBASE #endif ! GC_FAR struct _GC_arrays GC_arrays /* = { 0 } */; GC_bool GC_debugging_started = FALSE; --- 77,83 ---- #undef STACKBASE #endif ! GC_FAR struct _GC_arrays GC_arrays = { 0 }; GC_bool GC_debugging_started = FALSE; diff -cNr w3m-0.3.2.2.org/main.c w3m-0.3.2.2-k2/main.c *** w3m-0.3.2.2.org/main.c Thu Oct 31 02:03:27 2002 --- w3m-0.3.2.2-k2/main.c Sat Dec 28 00:39:33 2002 *************** *** 1755,1761 **** return; } } ! tmpf = tmpfname(TMPF_DFL, NULL)->ptr; f = fopen(tmpf, "w"); if (f == NULL) { disp_message(Sprintf("Can't save buffer to %s", cmd)->ptr, TRUE); --- 1755,1761 ---- return; } } ! tmpf = tmpfname(TMPF_DFL, ".txt")->ptr; f = fopen(tmpf, "w"); if (f == NULL) { disp_message(Sprintf("Can't save buffer to %s", cmd)->ptr, TRUE); *************** *** 2406,2412 **** char *tmpf; FILE *f; ! tmpf = tmpfname(TMPF_DFL, NULL)->ptr; f = fopen(tmpf, "w"); if (f == NULL) { disp_err_message(Sprintf("Can't open %s", tmpf)->ptr, TRUE); --- 2406,2412 ---- char *tmpf; FILE *f; ! tmpf = tmpfname(TMPF_DFL, ".txt")->ptr; f = fopen(tmpf, "w"); if (f == NULL) { disp_err_message(Sprintf("Can't open %s", tmpf)->ptr, TRUE); Binary files w3m-0.3.2.2.org/mktable_arm and w3m-0.3.2.2-k2/mktable_arm differ diff -cNr w3m-0.3.2.2.org/terms.c w3m-0.3.2.2-k2/terms.c *** w3m-0.3.2.2.org/terms.c Mon Sep 9 22:49:17 2002 --- w3m-0.3.2.2-k2/terms.c Sat Dec 28 02:04:57 2002 *************** *** 494,499 **** --- 494,500 ---- } w3m_term_info_list[] = { {W3M_TERM_INFO("xterm", XTERM_TITLE, (NEED_XTERM_ON|NEED_XTERM_OFF))}, {W3M_TERM_INFO("kterm", XTERM_TITLE, (NEED_XTERM_ON|NEED_XTERM_OFF))}, + {W3M_TERM_INFO("vt100", XTERM_TITLE, (NEED_XTERM_ON|NEED_XTERM_OFF))}, {W3M_TERM_INFO("rxvt", XTERM_TITLE, (NEED_XTERM_ON|NEED_XTERM_OFF))}, {W3M_TERM_INFO("Eterm", XTERM_TITLE, (NEED_XTERM_ON|NEED_XTERM_OFF))}, {W3M_TERM_INFO("mlterm", XTERM_TITLE, (NEED_XTERM_ON|NEED_XTERM_OFF))}, *************** *** 1247,1252 **** --- 1248,1255 ---- int graph_ok(void) { + + return 0; #ifndef KANJI_SYMBOLS if (no_graphic_char) return 0;