Merge with git+ssh://pasky.or.cz/srv/git/elinks.git

.gitignore

@@ -6,8 +6,7 @@ config.h.in
 config.log
 config.status
 configure
-Makefile
+Makefile.config
-Makefile.in
 stamp-h
 stamp-h.in
 depcomp
@@ -16,6 +15,5 @@ stamp-h1
 .deps
 elinks
 *.swp
-*.html
 *.patch
 features.log

Makefile

@@ -0,0 +1,12 @@
+path_to_top = .
+include $(path_to_top)/Makefile.config
+
+# TODO: Automagically rerun autoconf.
+
+SUBDIRS = doc po src
+
+
+clean-l:
+	rm -rf features.log
+
+include $(path_to_top)/Makefile.lib

Makefile.am

@@ -1,25 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.49 2005/05/13 21:45:27 rrowan Exp $
-
-SUBDIRS = Unicode config contrib debian doc intl po src test
-
-EXTRA_DIST = \
- ABOUT-NLS \
- BUGS \
- Makefile.base \
- SITES \
- TODO \
- autogen.sh \
- features.conf
-
-install-exec-hook:
-	@if grep 'Lua' features.log > /dev/null; then \
-		echo "**************************************************************"; \
-		echo "Lua 4 support in ELinks is obsolete.  If you are upgrading"; \
-		echo "from ELinks <= 0.10.X, you must update $(CONFDIR)/hooks.lua."; \
-		echo "**************************************************************"; \
-	fi
-
-
-CLEANFILES = $(srcdir)/features.log
-MAINTAINERCLEANFILES = $(srcdir)/acinclude.m4

Makefile.config.in

@@ -0,0 +1,169 @@
+# This is the automake's playground of our cool build system.
+# $Id$
+#
+# TODO: Make part of it autogenerated based on AC_SUBST() or something.
+
+SHELL = @SHELL@
+
+top_srcdir = $(path_to_top)/@top_srcdir@
+srcdir = $(top_srcdir)/$(shell pwd | sed 's!.*/\($(shell echo $(path_to_top) | sed 's!\.\.![^/]*!')\)$$!\1!')
+top_builddir = $(path_to_top)
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+
+DESTDIR =
+
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+
+ASCIIDOC = @ASCIIDOC@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CONFDIR = @CONFDIR@
+DATADIRNAME = @DATADIRNAME@
+GENCAT = @GENCAT@
+GLIBC21 = @GLIBC21@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
+GUILE_CFLAGS = @GUILE_CFLAGS@
+GUILE_CONFIG = @GUILE_CONFIG@
+HAVE_LIB = @HAVE_LIB@
+HAVE_SMBCLIENT = @HAVE_SMBCLIENT@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+JW = @JW@
+LIB = @LIB@
+LIBDIR = @LIBDIR@
+LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
+LOCALEDIR = @LOCALEDIR@
+LTLIB = @LTLIB@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_LIBS = @LUA_LIBS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+PACKAGE = @PACKAGE@
+PERL_CFLAGS = @PERL_CFLAGS@
+PERL_LIBS = @PERL_LIBS@
+POD2HTML = @POD2HTML@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PYTHON_CFLAGS = @PYTHON_CFLAGS@
+PYTHON_LIBS = @PYTHON_LIBS@
+RANLIB = @RANLIB@
+RUBY_CFLAGS = @RUBY_CFLAGS@
+RUBY_LIBS = @RUBY_LIBS@
+SPIDERMONKEY_CFLAGS = @SPIDERMONKEY_CFLAGS@
+SPIDERMONKEY_LIBS = @SPIDERMONKEY_LIBS@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+VERSION = @VERSION@
+XMLTO = @XMLTO@
+X_CFLAGS = @X_CFLAGS@
+XGETTEXT = @XGETTEXT@
+
+# :r !grep AC_SUBST\(CONFIG_ configure.in | sed 's/.*(\(.*\))$/\1 = @\1@/' | sort | uniq
+CONFIG_256_COLORS = @CONFIG_256_COLORS@
+CONFIG_ASCIIDOC = @CONFIG_ASCIIDOC@
+CONFIG_BACKTRACE = @CONFIG_BACKTRACE@
+CONFIG_BEOS = @CONFIG_BEOS@
+CONFIG_BITTORRENT = @CONFIG_BITTORRENT@
+CONFIG_BOOKMARKS = @CONFIG_BOOKMARKS@
+CONFIG_BZIP2 = @CONFIG_BZIP2@
+CONFIG_CGI = @CONFIG_CGI@
+CONFIG_COOKIES = @CONFIG_COOKIES@
+CONFIG_CSS = @CONFIG_CSS@
+CONFIG_DATA = @CONFIG_DATA@
+CONFIG_DEBUG = @CONFIG_DEBUG@
+CONFIG_DOM = @CONFIG_DOM@
+CONFIG_ECMASCRIPT = @CONFIG_ECMASCRIPT@
+CONFIG_EXMODE = @CONFIG_EXMODE@
+CONFIG_FASTMEM = @CONFIG_FASTMEM@
+CONFIG_FINGER = @CONFIG_FINGER@
+CONFIG_FORMHIST = @CONFIG_FORMHIST@
+CONFIG_FTP = @CONFIG_FTP@
+CONFIG_GLOBHIST = @CONFIG_GLOBHIST@
+CONFIG_GNUTLS = @CONFIG_GNUTLS@
+CONFIG_GOPHER = @CONFIG_GOPHER@
+CONFIG_GUILE = @CONFIG_GUILE@
+CONFIG_GZIP = @CONFIG_GZIP@
+CONFIG_HTML_HIGHLIGHT = @CONFIG_HTML_HIGHLIGHT@
+CONFIG_INTERLINK = @CONFIG_INTERLINK@
+CONFIG_IPV6 = @CONFIG_IPV6@
+CONFIG_JW = @CONFIG_JW@
+CONFIG_LEDS = @CONFIG_LEDS@
+CONFIG_LUA = @CONFIG_LUA@
+CONFIG_MAILCAP = @CONFIG_MAILCAP@
+CONFIG_MARKS = @CONFIG_MARKS@
+CONFIG_MD5 = @CONFIG_MD5@
+CONFIG_MIMETYPES = @CONFIG_MIMETYPES@
+CONFIG_MOUSE = @CONFIG_MOUSE@
+CONFIG_NNTP = @CONFIG_NNTP@
+CONFIG_NO_ROOT_EXEC = @CONFIG_NO_ROOT_EXEC@
+CONFIG_OPENSSL = @CONFIG_OPENSSL@
+CONFIG_OS2 = @CONFIG_OS2@
+CONFIG_OWN_LIBC = @CONFIG_OWN_LIBC@
+CONFIG_PERL = @CONFIG_PERL@
+CONFIG_POD2HTML = @CONFIG_POD2HTML@
+CONFIG_PYTHON = @CONFIG_PYTHON@
+CONFIG_RISCOS = @CONFIG_RISCOS@
+CONFIG_RUBY = @CONFIG_RUBY@
+CONFIG_SCANNER = @CONFIG_SCANNER@
+CONFIG_SCRIPTING = @CONFIG_SCRIPTING@
+CONFIG_SHA1 = @CONFIG_SHA1@
+CONFIG_SMALL = @CONFIG_SMALL@
+CONFIG_SMB = @CONFIG_SMB@
+CONFIG_SPIDERMONKEY = @CONFIG_SPIDERMONKEY@
+CONFIG_SSL = @CONFIG_SSL@
+CONFIG_SYSMOUSE = @CONFIG_SYSMOUSE@
+CONFIG_UNIX = @CONFIG_UNIX@
+CONFIG_URI_REWRITE = @CONFIG_URI_REWRITE@
+CONFIG_WIN32 = @CONFIG_WIN32@
+CONFIG_XBEL_BOOKMARKS = @CONFIG_XBEL_BOOKMARKS@
+CONFIG_XMLTO = @CONFIG_XMLTO@
+
+DEFS = @DEFS@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src
+
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+
+
+### This is here because Makefile.config is usually the first thing
+### we get and sometimes the all rule can be implicit, yet we want
+### it always as the default one. So this should make sure it always
+### comes first.
+all:
+

Makefile.lib

@@ -0,0 +1,85 @@
+### The build commands and verbosity
+
+# If we are verbose, we will show commands prefixed by $(Q) (which acts as
+# @ in the non-verbose mode), and we will show the "real" cmds instead of
+# their quiet versions (which are used in the non-verbose mode).
+# Inspired by the Linux kernel build system.
+ifdef V
+	Q =
+	quiet =
+	mquiet = masq_
+else
+	Q = @
+	quiet = quiet_
+	mquiet = quiet_
+endif
+
+# Show the command (quiet or non-quiet version based on the assignment
+# just above) and then execute it.
+ncmd = $(if $($(quiet)cmd_$(1)),echo $($(quiet)cmd_$(1)) &&) $(cmd_$(1))
+cmd = @$(if $($(quiet)cmd_$(1)),echo $($(quiet)cmd_$(1)) &&) $(cmd_$(1))
+mcmd = @$(if $($(mquiet)cmd_$(1)),echo $($(mquiet)cmd_$(1)) &&) $(cmd_$(1))
+
+quiet_cmd_compile = '[CC]   $<'
+ masq_cmd_compile = $(COMPILE) -c $<
+      cmd_compile = $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+
+quiet_cmd_archive = '[AR]   $@'
+      cmd_archive = $(AR) r $@ $^
+
+   quiet_cmd_link = '[LINK] $@'
+         cmd_link = $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+# Recursive make
+quiet_cmd_recmake = "[MAKE $$target]   $$subdir"
+      cmd_recmake = $(MAKE) -C $$subdir $$target
+
+
+
+### Internal build rules
+
+DEP_FILES_1 = $(foreach src,$(OBJS),.deps/$(src))
+DEP_FILES = $(DEP_FILES_1:%.o=%.P)
+
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+ifdef OBJS
+-include $(DEP_FILES)
+endif
+
+%.o: %.c
+	$(call mcmd,compile)
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+		tr ' ' '\012' < .deps/$(*F).pp \
+			| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+			>> .deps/$(*F).P; \
+		rm .deps/$(*F).pp
+
+%.a:
+	$(call cmd,archive)
+
+ifdef OBJS
+clean-l:
+	rm -f $(OBJS) *.a
+endif
+
+
+# Recursion:
+
+.PHONY: all-recursive install-recursive clean-recursive
+all-recursive install-recursive clean-recursive:
+	@target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $(SUBDIRS); do \
+		$(call ncmd,recmake) || exit 1; \
+	done
+
+all: all-recursive all-l
+install: install-recursive install-l
+clean: clean-recursive clean-l
+
+all-l:
+install-l:
+clean-l:
+
+
+# vim:syntax=make

SITES

@@ -13,9 +13,13 @@ RPMs:
 Cygwin binaries:
 	http://www.pervalidus.net/cygwin/links/
 
+RISC OS binaries:
+	http://www.riscos.info/unix/indexes/browser.html
+
+
 GIT root:
 	http://elinks.cz/elinks.git
-	git+ssh://pasky.or.cz/srv/git/elinks.git (master, DEPRECATED)
+	git+ssh://pasky.or.cz/srv/git/elinks.git (only for developers)
 
 Mailing list:
 	http://elinks.cz/community.html#mailinglist

Unicode/Makefile.am

@@ -1,51 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.3 2004/08/15 05:51:12 miciah Exp $
-
-include $(top_srcdir)/Makefile.base
-
-EXTRA_DIST = \
- 7bit.cp \
- 7bitrepl.lnx \
- 8859_1.cp \
- 8859_10.cp \
- 8859_13.cp \
- 8859_14.cp \
- 8859_15.cp \
- 8859_16.cp \
- 8859_2.cp \
- 8859_3.cp \
- 8859_4.cp \
- 8859_5.cp \
- 8859_6.cp \
- 8859_7.cp \
- 8859_8.cp \
- 8859_9.cp \
- README \
- cp1125.cp \
- cp1250.cp \
- cp1251.cp \
- cp1252.cp \
- cp1256.cp \
- cp1257.cp \
- cp437.cp \
- cp737.cp \
- cp850.cp \
- cp852.cp \
- cp866.cp \
- entities.lnx \
- gen \
- gen-7b \
- gen-cp \
- gen-ent \
- index.txt \
- kamen.cp \
- koi8_r.cp \
- koi8_ru.cp \
- koi8_u.cp \
- mac_lat2.cp \
- macroman.cp \
- tcvn5712.cp \
- tr7bit.awk \
- utf_8.cp \
- viscii.cp
-

autogen.sh

@@ -10,9 +10,6 @@ aclocal
 echo autoheader...
 autoheader
 
-echo automake...
-automake -a -c
-
 echo autoconf...
 autoconf
 

config/.gitignore

@@ -1,8 +1,4 @@
-Makefile
-Makefile.in
 install-sh
 missing
 mkinstalldirs
 depcomp
-.deps
-*.swp

config/Makefile.am

@@ -1,4 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.1 2005/01/08 21:23:01 jonas Exp $
-
-EXTRA_DIST = m4/*.m4

configure.in

@@ -4,8 +4,13 @@ AC_PREREQ(2.13)
 AC_INIT(src/main/main.c)
 AC_CONFIG_AUX_DIR(config)
 
-AM_INIT_AUTOMAKE(elinks, 0.11.CVS)
+PACKAGE=elinks
-AM_CONFIG_HEADER(config.h)
+VERSION=0.11.GIT
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Package version])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Package version])
+AC_CONFIG_HEADERS(config.h)
 
 AC_PROG_MAKE_SET
 
@@ -79,10 +84,10 @@ if test "$CONFIG_ASCIIDOC" = yes &&
 	EL_CONFIG_DEPENDS(CONFIG_MANUAL, [MAN_ASCIIDOC MAN_XMLTO], [Man Page Formats])
 fi
 
-AM_CONDITIONAL(CONFIG_ASCIIDOC, test "$CONFIG_ASCIIDOC" = yes)
+AC_SUBST(CONFIG_ASCIIDOC)
-AM_CONDITIONAL(CONFIG_POD2HTML, test "$CONFIG_POD2HTML" = yes)
+AC_SUBST(CONFIG_POD2HTML)
-AM_CONDITIONAL(CONFIG_XMLTO, test "$CONFIG_XMLTO" = yes)
+AC_SUBST(CONFIG_XMLTO)
-AM_CONDITIONAL(CONFIG_JW, test "$CONFIG_JW" = yes)
+AC_SUBST(CONFIG_JW)
 
 dnl gcc specific options (to be continued at the bottom of configure)
 if test "x$ac_cv_prog_gcc" = "xyes"; then
@@ -115,16 +120,16 @@ kill me!
 ])
 
 EL_CHECK_COMPILER_MACROS(CONFIG_BEOS, [BEOS], [__BEOS__])
-AM_CONDITIONAL(CONFIG_BEOS, test "$CONFIG_BEOS" = yes)
+AC_SUBST(CONFIG_BEOS)
 
 EL_CHECK_COMPILER_MACROS(CONFIG_RISCOS, [RISCOS], [__riscos__])
-AM_CONDITIONAL(CONFIG_RISCOS, test "$CONFIG_RISCOS" = yes)
+AC_SUBST(CONFIG_RISCOS)
 
 EL_CHECK_COMPILER_MACROS(CONFIG_WIN32, [WIN32], [_WIN32 __WIN32__])
-AM_CONDITIONAL(CONFIG_WIN32, test "$CONFIG_WIN32" = yes)
+AC_SUBST(CONFIG_WIN32)
 
 EL_CHECK_COMPILER_MACROS(CONFIG_OS2, [EMX], [__EMX__])
-AM_CONDITIONAL(CONFIG_OS2, test "$CONFIG_OS2" = yes)
+AC_SUBST(CONFIG_OS2)
 test "$CONFIG_OS2" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zexe//g"`
 
 AC_MSG_CHECKING([for UNIX])
@@ -138,7 +143,7 @@ else
 	CONFIG_UNIX=no
 fi
 AC_MSG_RESULT($CONFIG_UNIX)
-AM_CONDITIONAL(CONFIG_UNIX, test "$CONFIG_UNIX" = yes)
+AC_SUBST(CONFIG_UNIX)
 
 dnl ===================================================================
 dnl Checks for header files.
@@ -173,7 +178,7 @@ AC_CHECK_HEADERS(sys/un.h,
 	[CONFIG_INTERLINK=yes
 	 EL_CONFIG([CONFIG_INTERLINK], [interlinking])],
 	[CONFIG_INTERLINK=no])
-AM_CONDITIONAL(CONFIG_INTERLINK, test "$CONFIG_INTERLINK" = yes)
+AC_SUBST(CONFIG_INTERLINK)
 
 dnl ===================================================================
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -406,11 +411,11 @@ EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_GPM, gpm, gpm.h, gpm, Gpm_Open,
 
 EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_GZIP, zlib, zlib.h, z, gzdopen,
 	[  --without-zlib          disable zlib support])
-AM_CONDITIONAL(CONFIG_GZIP, test "$CONFIG_GZIP" = yes)
+AC_SUBST(CONFIG_GZIP)
 
 EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_BZIP2, bzlib, bzlib.h, bz2, BZ2_bzReadOpen,
 	[  --without-bzlib         disable bzlib support])
-AM_CONDITIONAL(CONFIG_BZIP2, test "$CONFIG_BZIP2" = yes)
+AC_SUBST(CONFIG_BZIP2)
 
 EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_IDN, idn, idna.h, idn, stringprep_check_version,
 	[  --without-idn           disable international domain names support])
@@ -423,7 +428,7 @@ EL_SAVE_FLAGS
 
 EL_ARG_ENABLE(CONFIG_BOOKMARKS, bookmarks, [Bookmarks],
 	      [  --disable-bookmarks     disable bookmark support])
-AM_CONDITIONAL(CONFIG_BOOKMARKS, test "$CONFIG_BOOKMARKS" = yes)
+AC_SUBST(CONFIG_BOOKMARKS)
 
 # Check whether --enable-xbel or --disable-xbel was given.
 if test "x${enable_xbel}" != xno; then
@@ -442,7 +447,7 @@ EL_ARG_DEPEND(CONFIG_XBEL_BOOKMARKS, xbel, [CONFIG_BOOKMARKS:yes HAVE_LIBEXPAT:y
 	      [XBEL bookmarks],
 	      [  --disable-xbel          disable XBEL bookmark support (requires expat)])
 
-AM_CONDITIONAL(CONFIG_XBEL_BOOKMARKS, test "$CONFIG_XBEL_BOOKMARKS" = yes)
+AC_SUBST(CONFIG_XBEL_BOOKMARKS)
 
 if test "$CONFIG_XBEL_BOOKMARKS" != yes; then
 	EL_RESTORE_FLAGS
@@ -706,12 +711,12 @@ dnl Setup global scripting
 dnl ===================================================================
 
 EL_CONFIG_DEPENDS(CONFIG_SCRIPTING, [CONFIG_GUILE CONFIG_LUA CONFIG_PERL CONFIG_PYTHON CONFIG_RUBY], [Scripting])
-AM_CONDITIONAL(CONFIG_GUILE, test "$CONFIG_GUILE" = yes)
+AC_SUBST(CONFIG_GUILE)
-AM_CONDITIONAL(CONFIG_LUA, test "$CONFIG_LUA" = yes)
+AC_SUBST(CONFIG_LUA)
-AM_CONDITIONAL(CONFIG_PERL, test "$CONFIG_PERL" = yes)
+AC_SUBST(CONFIG_PERL)
-AM_CONDITIONAL(CONFIG_PYTHON, test "$CONFIG_PYTHON" = yes)
+AC_SUBST(CONFIG_PYTHON)
-AM_CONDITIONAL(CONFIG_RUBY, test "$CONFIG_RUBY" = yes)
+AC_SUBST(CONFIG_RUBY)
-AM_CONDITIONAL(CONFIG_SCRIPTING, test "$CONFIG_SCRIPTING" = yes)
+AC_SUBST(CONFIG_SCRIPTING)
 
 
 dnl ===================================================================
@@ -766,10 +771,10 @@ else
 	AC_SUBST(SPIDERMONKEY_CFLAGS)
 fi
 
-AM_CONDITIONAL(CONFIG_SPIDERMONKEY, test "$CONFIG_SPIDERMONKEY" = yes)
+AC_SUBST(CONFIG_SPIDERMONKEY)
 
 EL_CONFIG_DEPENDS(CONFIG_ECMASCRIPT, [CONFIG_SPIDERMONKEY], [ECMAScript (JavaScript)])
-AM_CONDITIONAL(CONFIG_ECMASCRIPT, test "$CONFIG_ECMASCRIPT" = yes)
+AC_SUBST(CONFIG_ECMASCRIPT)
 
 
 dnl ===================================================================
@@ -922,9 +927,9 @@ AC_MSG_RESULT($cf_result)
 dnl Final SSL setup
 
 EL_CONFIG_DEPENDS(CONFIG_SSL, [CONFIG_OPENSSL CONFIG_GNUTLS], [SSL])
-AM_CONDITIONAL(CONFIG_OPENSSL, test "$CONFIG_OPENSSL" = yes)
+AC_SUBST(CONFIG_OPENSSL)
-AM_CONDITIONAL(CONFIG_GNUTLS, test "$CONFIG_GNUTLS" = yes)
+AC_SUBST(CONFIG_GNUTLS)
-AM_CONDITIONAL(CONFIG_SSL, test "$CONFIG_SSL" = yes)
+AC_SUBST(CONFIG_SSL)
 
 #endif
 
@@ -1002,72 +1007,72 @@ dnl ===================================================================
 
 EL_ARG_ENABLE(CONFIG_COOKIES, cookies, [Cookies],
 	      [  --disable-cookies       disable cookie support])
-AM_CONDITIONAL(CONFIG_COOKIES, test "$CONFIG_COOKIES" = yes)
+AC_SUBST(CONFIG_COOKIES)
 
 EL_ARG_ENABLE(CONFIG_FORMHIST, formhist, [Form history],
 	      [  --disable-formhist      disable form history support])
-AM_CONDITIONAL(CONFIG_FORMHIST, test "$CONFIG_FORMHIST" = yes)
+AC_SUBST(CONFIG_FORMHIST)
 
 EL_ARG_ENABLE(CONFIG_GLOBHIST, globhist, [Global history],
 	      [  --disable-globhist      disable global history support])
-AM_CONDITIONAL(CONFIG_GLOBHIST, test "$CONFIG_GLOBHIST" = yes)
+AC_SUBST(CONFIG_GLOBHIST)
 
 
 EL_ARG_ENABLE(CONFIG_MAILCAP, mailcap, [Mailcap],
 	      [  --disable-mailcap       disable mailcap support])
-AM_CONDITIONAL(CONFIG_MAILCAP, test "$CONFIG_MAILCAP" = yes)
+AC_SUBST(CONFIG_MAILCAP)
 
 EL_ARG_ENABLE(CONFIG_MIMETYPES, mimetypes, [Mimetypes files],
 	      [  --disable-mimetypes     disable mimetypes files support])
-AM_CONDITIONAL(CONFIG_MIMETYPES, test "$CONFIG_MIMETYPES" = yes)
+AC_SUBST(CONFIG_MIMETYPES)
 
 
 EL_ARG_DEPEND(CONFIG_IPV6, ipv6,
 	      [HAVE_SA_STORAGE:yes HAVE_SA_IN6:yes HAVE_ADDRINFO:yes HAVE_GETADDRINFO:yes],
 	      [IPv6],
 	      [  --disable-ipv6          disable IPv6 support])
-AM_CONDITIONAL(CONFIG_IPV6, test "$CONFIG_IPV6" = yes)
+AC_SUBST(CONFIG_IPV6)
 
 EL_ARG_ENABLE(CONFIG_BITTORRENT, bittorrent, [BitTorrent protocol],
 	      [  --enable-bittorrent     enable BitTorrent protocol support])
-AM_CONDITIONAL(CONFIG_BITTORRENT, test "$CONFIG_BITTORRENT" = yes)
+AC_SUBST(CONFIG_BITTORRENT)
 
 EL_ARG_ENABLE(CONFIG_DATA, data, [Data protocol],
 	      [  --disable-data          disable data protocol support])
-AM_CONDITIONAL(CONFIG_DATA, test "$CONFIG_DATA" = yes)
+AC_SUBST(CONFIG_DATA)
 
 EL_ARG_ENABLE(CONFIG_URI_REWRITE, uri-rewrite, [URI rewriting],
 	      [  --disable-uri-rewrite   disable URI rewrite support])
-AM_CONDITIONAL(CONFIG_URI_REWRITE, test "$CONFIG_URI_REWRITE" = yes)
+AC_SUBST(CONFIG_URI_REWRITE)
 
 EL_ARG_DEPEND(CONFIG_CGI, cgi, [HAVE_SETENV_OR_PUTENV:yes], [Local CGI],
 	      [  --enable-cgi            enable local CGI support])
-AM_CONDITIONAL(CONFIG_CGI, test "$CONFIG_CGI" = yes)
+AC_SUBST(CONFIG_CGI)
 
 EL_ARG_ENABLE(CONFIG_FINGER, finger, [Finger protocol],
 	      [  --enable-finger         enable finger protocol support])
-AM_CONDITIONAL(CONFIG_FINGER, test "$CONFIG_FINGER" = yes)
+AC_SUBST(CONFIG_FINGER)
 
 EL_ARG_ENABLE(CONFIG_FTP, ftp, [FTP protocol],
 	      [  --disable-ftp           disable ftp protocol support])
-AM_CONDITIONAL(CONFIG_FTP, test "$CONFIG_FTP" = yes)
+AC_SUBST(CONFIG_FTP)
 
 EL_ARG_ENABLE(CONFIG_GOPHER, gopher, [Gopher protocol],
 	      [  --enable-gopher         enable gopher protocol support])
-AM_CONDITIONAL(CONFIG_GOPHER, test "$CONFIG_GOPHER" = yes)
+AC_SUBST(CONFIG_GOPHER)
 
 EL_ARG_ENABLE(CONFIG_NNTP, nntp, [NNTP protocol],
 	      [  --enable-nntp           enable nntp protocol support])
-AM_CONDITIONAL(CONFIG_NNTP, test "$CONFIG_NNTP" = yes)
+AC_SUBST(CONFIG_NNTP)
 
 EL_ARG_DEPEND(CONFIG_SMB, smb, [HAVE_SMBCLIENT:yes], [SMB protocol],
 	      [  --disable-smb           disable SMB protocol support (requires smbclient)])
-AM_CONDITIONAL(CONFIG_SMB, test "$CONFIG_SMB" = yes)
+AC_SUBST(CONFIG_SMB)
 
 
 EL_ARG_ENABLE(CONFIG_MOUSE, mouse, [Mouse handling],
 	      [  --disable-mouse         disable mouse support])
-AM_CONDITIONAL(CONFIG_MOUSE, test "$CONFIG_MOUSE" = yes)
+AC_SUBST(CONFIG_MOUSE)
 
 # GPM mouse is Linux specific, so ...
 CONFIG_SYSMOUSE=yes
@@ -1075,67 +1080,67 @@ EL_ARG_DEPEND(CONFIG_SYSMOUSE, sysmouse,
 	      [CONFIG_MOUSE:yes CONFIG_GPM:no HAVE_SYSMOUSE_HEADER:yes],
 	      [BSD sysmouse],
 	      [  --disable-sysmouse      disable BSD sysmouse support])
-AM_CONDITIONAL(CONFIG_SYSMOUSE, test "$CONFIG_SYSMOUSE" = yes)
+AC_SUBST(CONFIG_SYSMOUSE)
 
 EL_ARG_ENABLE(CONFIG_88_COLORS, 88-colors, [88 colors],
 	      [  --enable-88-colors     enable 88 color support])
-AM_CONDITIONAL(CONFIG_256_COLORS, test "$CONFIG_256_COLORS" = yes)
+AC_SUBST(CONFIG_256_COLORS)
 
 EL_ARG_ENABLE(CONFIG_256_COLORS, 256-colors, [256 colors],
 	      [  --enable-256-colors     enable 256 color support])
-AM_CONDITIONAL(CONFIG_256_COLORS, test "$CONFIG_256_COLORS" = yes)
+AC_SUBST(CONFIG_256_COLORS)
 
 
 EL_ARG_ENABLE(CONFIG_EXMODE, exmode, [Exmode interface],
 	      [  --enable-exmode         enable exmode (CLI) interface])
-AM_CONDITIONAL(CONFIG_EXMODE, test "$CONFIG_EXMODE" = yes)
+AC_SUBST(CONFIG_EXMODE)
 
 EL_ARG_ENABLE(CONFIG_LEDS, leds, [LEDs],
 	      [  --disable-leds          disable LEDs support])
-AM_CONDITIONAL(CONFIG_LEDS, test "$CONFIG_LEDS" = yes)
+AC_SUBST(CONFIG_LEDS)
 
 EL_ARG_ENABLE(CONFIG_MARKS, marks, [Marks],
 	      [  --disable-marks         disable document marks support])
-AM_CONDITIONAL(CONFIG_MARKS, test "$CONFIG_MARKS" = yes)
+AC_SUBST(CONFIG_MARKS)
 
 
 EL_ARG_ENABLE(CONFIG_CSS, css, [Cascading Style Sheets],
 	      [  --disable-css           disable Cascading Style Sheet support])
-AM_CONDITIONAL(CONFIG_CSS, test "$CONFIG_CSS" = yes)
+AC_SUBST(CONFIG_CSS)
 
 EL_ARG_DEPEND(CONFIG_HTML_HIGHLIGHT, html-highlight, [CONFIG_CSS:yes], [HTML highlighting],
 	      [  --enable-html-highlight HTML highlighting using DOM engine])
-AM_CONDITIONAL(CONFIG_HTML_HIGHLIGHT, test "$CONFIG_HTML_HIGHLIGHT" = yes)
+AC_SUBST(CONFIG_HTML_HIGHLIGHT)
 
 dnl Everything in the tree already uses CONFIG_DOM
 dnl so resolve CONFIG_HTML_HIGHLIGHT to CONFIG_DOM
 EL_CONFIG_DEPENDS(CONFIG_DOM, [CONFIG_HTML_HIGHLIGHT], [DOM engine])
-AM_CONDITIONAL(CONFIG_DOM, test "$CONFIG_DOM" = yes)
+AC_SUBST(CONFIG_DOM)
 
 EL_ARG_DEPEND(CONFIG_BACKTRACE, backtrace, [HAVE_EXECINFO:yes], [Backtrace],
 	      [  --disable-backtrace     disable backtrace support])
-AM_CONDITIONAL(CONFIG_BACKTRACE, test "$CONFIG_BACKTRACE" = yes)
+AC_SUBST(CONFIG_BACKTRACE)
 
 EL_ARG_DEPEND(CONFIG_NO_ROOT_EXEC, no-root, [HAVE_GETUID:yes HAVE_GETEUID:yes], [No root exec],
 	      [  --enable-no-root        enable prevention of usage by root])
-AM_CONDITIONAL(CONFIG_NO_ROOT_EXEC, test "$CONFIG_NO_ROOT_EXEC" = yes)
+AC_SUBST(CONFIG_NO_ROOT_EXEC)
 
 
 EL_ARG_ENABLE(CONFIG_DEBUG, debug, [Debug mode],
 	      [  --enable-debug          enable leak debug and internal error checking])
-AM_CONDITIONAL(CONFIG_DEBUG, test "$CONFIG_DEBUG" = yes)
+AC_SUBST(CONFIG_DEBUG)
 
 EL_ARG_DEPEND(CONFIG_FASTMEM, fastmem, [CONFIG_DEBUG:no], [Fast mode],
               [  --enable-fastmem        enable direct use of system allocation functions, not usable with --enable-debug])
-AM_CONDITIONAL(CONFIG_FASTMEM, test "$CONFIG_FASTMEM" = yes)
+AC_SUBST(CONFIG_FASTMEM)
 
 EL_ARG_ENABLE(CONFIG_OWN_LIBC, own-libc, [Own libc stubs],
               [  --enable-own-libc       force use of internal functions instead of those of system libc])
-AM_CONDITIONAL(CONFIG_OWN_LIBC, test "$CONFIG_OWN_LIBC" = yes)
+AC_SUBST(CONFIG_OWN_LIBC)
 
 EL_ARG_ENABLE(CONFIG_SMALL, small, [Small binary],
 	      [  --enable-small          reduce binary size as far as possible (but see the bottom of doc/small.txt!)])
-AM_CONDITIONAL(CONFIG_SMALL, test "$CONFIG_SMALL" = yes)
+AC_SUBST(CONFIG_SMALL)
 
 if test "$CONFIG_OPENSSL" != yes &&
    test "$CONFIG_GNUTLS_OPENSSL_COMPAT" != yes ||
@@ -1146,7 +1151,7 @@ then
 	EL_CONFIG(CONFIG_MD5, [Built-in MD5])
 fi
 
-AM_CONDITIONAL(CONFIG_MD5, test "$CONFIG_MD5" = yes)
+AC_SUBST(CONFIG_MD5)
 
 if test "$CONFIG_BITTORRENT" = yes; then
 	if test "$CONFIG_OPENSSL" != yes ||
@@ -1158,13 +1163,13 @@ if test "$CONFIG_BITTORRENT" = yes; then
 	fi
 fi
 
-AM_CONDITIONAL(CONFIG_SHA1, test "$CONFIG_SHA1" = yes)
+AC_SUBST(CONFIG_SHA1)
 
 if test "$CONFIG_CSS" = yes || test "$CONFIG_DOM" = yes;
 then
 	EL_CONFIG(CONFIG_SCANNER, [Built-in scanner])
 fi
-AM_CONDITIONAL(CONFIG_SCANNER, test "$CONFIG_SCANNER" = yes)
+AC_SUBST(CONFIG_SCANNER)
 
 AC_ARG_ENABLE(weehoofooboomookerchoo,
               [
@@ -1262,81 +1267,12 @@ dnl Generated files
 dnl ===================================================================
 
 AC_OUTPUT([ \
- Makefile \
+ Makefile.config \
- Unicode/Makefile \
- config/Makefile \
- contrib/Makefile \
  contrib/elinks.spec \
  contrib/lua/hooks.lua \
  contrib/conv/w3m2links.awk \
- debian/Makefile \
- doc/Makefile \
- doc/man/Makefile \
- doc/man/man1/Makefile \
- doc/man/man1/elinks.1 \
- doc/man/man5/Makefile \
- intl/Makefile \
- po/Makefile \
- src/Makefile \
- src/bfu/Makefile \
- src/bookmarks/Makefile \
- src/bookmarks/backend/Makefile \
- src/cache/Makefile \
- src/config/Makefile \
- src/cookies/Makefile \
- src/dialogs/Makefile \
- src/document/Makefile \
- src/document/css/Makefile \
- src/document/dom/Makefile \
- src/document/html/Makefile \
- src/document/html/parser/Makefile \
- src/document/plain/Makefile \
- src/document/sgml/Makefile \
- src/document/sgml/html/Makefile \
- src/ecmascript/Makefile \
- src/ecmascript/spidermonkey/Makefile \
- src/encoding/Makefile \
- src/formhist/Makefile \
- src/globhist/Makefile \
- src/intl/Makefile \
- src/intl/gettext/Makefile \
  src/intl/gettext/ref-add.sed \
- src/intl/gettext/ref-del.sed \
+ src/intl/gettext/ref-del.sed
- src/main/Makefile \
- src/mime/Makefile \
- src/mime/backend/Makefile \
- src/network/Makefile \
- src/network/ssl/Makefile \
- src/osdep/Makefile \
- src/osdep/beos/Makefile \
- src/osdep/os2/Makefile \
- src/osdep/riscos/Makefile \
- src/osdep/unix/Makefile \
- src/osdep/win32/Makefile \
- src/protocol/Makefile \
- src/protocol/auth/Makefile \
- src/protocol/bittorrent/Makefile \
- src/protocol/file/Makefile \
- src/protocol/finger/Makefile \
- src/protocol/ftp/Makefile \
- src/protocol/gopher/Makefile \
- src/protocol/http/Makefile \
- src/protocol/nntp/Makefile \
- src/protocol/rewrite/Makefile \
- src/protocol/smb/Makefile \
- src/scripting/Makefile \
- src/scripting/guile/Makefile \
- src/scripting/lua/Makefile \
- src/scripting/perl/Makefile \
- src/scripting/python/Makefile \
- src/scripting/ruby/Makefile \
- src/session/Makefile \
- src/terminal/Makefile \
- src/util/Makefile \
- src/viewer/Makefile \
- src/viewer/dump/Makefile \
- src/viewer/text/Makefile \
- test/Makefile
 ])
 
 

contrib/.cvsignore

@@ -1,5 +0,0 @@
-Makefile
-Makefile.in
-.deps
-elinks.spec
-*.swp

contrib/.gitignore

@@ -0,0 +1 @@
+elinks.spec

contrib/Makefile.am

@@ -1,42 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.19 2005/06/03 02:18:43 jonas Exp $
-
-include $(top_srcdir)/Makefile.base
-
-EXTRA_DIST = \
- LinksOS2Icon.zip \
- README \
- colws.diff \
- elinks.conf \
- elinks-vim.diff \
- elinks.fortune \
- elinks.spec.in \
- elinks.vim \
- js-1.5-rc6a+elinks.patch \
- keybind-full.conf \
- keybind.conf \
- links_wps.zip \
- wipe-out-ssl \
- wipe-out-ssl.awk \
- user.css \
- TIPS-AND-TRICKS \
- conv/conf-links2elinks.pl \
- conv/mailcap.pl \
- conv/old_to_new_bookmarks.sh \
- conv/w3m2links.awk \
- conv/w3m2links.awk.in \
- guile/internal-hooks.scm \
- guile/user-hooks.scm \
- lua/babelfish.lua \
- lua/bm-to-elinks-bookmarks.lua \
- lua/bm.lua \
- lua/config.lua \
- lua/elinks-remote \
- lua/highlight.lua \
- lua/hooks.lua.in \
- lua/md5check.lua \
- lua/remote.lua \
- perl/hooks.pl \
- perl/config.pl \
- python/hooks.py \
- ruby/hooks.rb

contrib/conv/.cvsignore

@@ -1,5 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp
-w3m2links.awk

contrib/conv/.gitignore

@@ -0,0 +1 @@
+w3m2links.awk

contrib/guile/.cvsignore

@@ -1,5 +0,0 @@
-Makefile
-Makefile.in
-.deps
-elinks.spec
-*.swp

contrib/lua/.gitignore

@@ -1,2 +1 @@
 hooks.lua
-*.swp

contrib/perl/.cvsignore

@@ -1,4 +0,0 @@
-*.swp
-hooks.html
-pod2htmd.tmp
-pod2htmi.tmp

contrib/perl/config.pl

@@ -1,5 +1,4 @@
 # Configuration file for hooks.pl - salt to taste and place in ~/.elinks
-# $Id: config.pl,v 1.5 2005/08/07 21:14:04 rrowan Exp $
 
 bork:       nah                   # BORKify Google?
 collapse:   nope                  # Collapse all XBEL bookmark folders on exit?

contrib/perl/hooks.pl

@@ -1,5 +1,4 @@
 # Example ~/.elinks/hooks.pl
-# $Id: hooks.pl,v 1.135 2005/09/03 20:56:58 rrowan Exp $
 #
 # Copyleft by Russ Rowan (See the file "COPYING" for details.)
 #

contrib/ruby/.cvsignore

@@ -1 +0,0 @@
-*.swp

debian/.cvsignore

@@ -1,11 +0,0 @@
-*.swp
-.deps
-Makefile
-Makefile.in
-build-stamp
-depcomp
-elinks
-elinks.postinst.debhelper
-elinks.postrm.debhelper
-elinks.substvars
-files

debian/Makefile.am

@@ -1,19 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.5 2005/02/22 14:39:03 jonas Exp $
-
-EXTRA_DIST = \
- README.Debian \
- changelog \
- control \
- control.in \
- copyright \
- elinks.desktop \
- elinks.docs \
- elinks.postinst \
- elinks.preinst \
- elinks.prerm \
- menu \
- mime \
- rules
-
-DISTCLEANFILES = build-stamp elinks

doc/.cvsignore

@@ -1,9 +0,0 @@
-*.swp
-Makefile
-Makefile.in
-html
-perl.html
-pod2htmd.tmp
-pod2htmi.tmp
-txt
-xml

doc/Makefile

@@ -1,5 +1,5 @@
-## Process this file with automake to produce Makefile.in
+path_to_top=..
-## $Id: Makefile.am,v 1.75 2005/08/09 17:44:23 jonas Exp $
+include $(path_to_top)/Makefile.config
 
 SUBDIRS = man
 
@@ -41,21 +41,6 @@ MANUAL_FILES = \
  terminals.txt \
  urlshortcuts.txt
 
-EXTRA_DIST = \
- README \
- $(MANUAL_FILES) \
- color-model.txt \
- events.txt \
- feedback.txt \
- get-cvs-docs \
- hacking.txt \
- dev-intro.txt \
- index.txt \
- perl.pod \
- tools/help2doc \
- tools/make-elinks-manpage \
- tools/make-elinkskeys-manpage
-
 ### Script Dependencies
 #
 
@@ -71,7 +56,7 @@ IMPORT_FEATURES_CONF	= $(top_srcdir)/doc/tools/import-features.conf
 MAKE_ELINKS_MANPAGE	= $(top_srcdir)/doc/tools/make-elinks-manpage
 MAKE_ELINKSKEYS_MANPAGE	= $(top_srcdir)/doc/tools/make-elinkskeys-manpage
 
-if CONFIG_ASCIIDOC
+ifeq ($(CONFIG_ASCIIDOC),yes)
 HTML_DOCS_WITH_ASCIIDOC = \
  $(HTML_DIR)/elinks.1.html \
  $(HTML_DIR)/elinkskeys.5.html \
@@ -81,22 +66,22 @@ endif
 
 
 # Only jw is used for generating PDF.
-if CONFIG_XMLTO
+ifeq ($(CONFIG_XMLTO),yes)
 HTML_DOCS_WITH_XMLTO = \
  $(HTML_DIR)/manual.html-chunked
 
 MAN_DOCS_WITH_XMLTO = \
  $(MAN_DIR)/man1/elinks.1.in \
  $(MAN_DIR)/man5/elinkskeys.5
-
 endif
+
 # Only jw is used for generating PDF.
-if CONFIG_JW
+ifeq ($(CONFIG_JW),yes)
 PDF_DOCS_WITH_JW = \
  $(PDF_DIR)/manual.pdf
 endif
 
-if CONFIG_POD2HTML
+ifeq ($(CONFIG_POD2HTML),yes)
 HTML_DOCS_WITH_POD2HTML = \
  $(HTML_DIR)/perl.html \
  $(HTML_DIR)/perl-hooks.html
@@ -131,9 +116,9 @@ man-xmlto-no:
 pdf-jw-yes: doc-dirs $(PDF_DOCS_WITH_JW)
 pdf-jw-no:
 
-man-docs: man-xmlto-@CONFIG_XMLTO@ $(MAN_DOCS_WITH_SHELL)
+man-docs: man-xmlto-$(CONFIG_XMLTO) $(MAN_DOCS_WITH_SHELL)
-html-docs: html-asciidoc-@CONFIG_ASCIIDOC@ html-xmlto-@CONFIG_XMLTO@ html-pod2html-@CONFIG_POD2HTML@
+html-docs: html-asciidoc-$(CONFIG_ASCIIDOC) html-xmlto-$(CONFIG_XMLTO) html-pod2html-$(CONFIG_POD2HTML)
-pdf-docs: pdf-jw-@CONFIG_JW@
+pdf-docs: pdf-jw-$(CONFIG_JW)
 
 all-docs: man-docs html-docs pdf-docs
 
@@ -212,3 +197,5 @@ $(HTML_DIR)/perl.html: $(top_srcdir)/doc/perl.pod doc-dirs
 
 $(HTML_DIR)/perl-hooks.html: $(top_srcdir)/contrib/perl/hooks.pl doc-dirs
 	$(POD2HTML) --outfile=$@ < $<
+
+include $(path_to_top)/Makefile.lib

doc/man/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-index.bt
-*.swp

doc/man/.gitignore

@@ -1,5 +1,3 @@
-Makefile
+index.bt
-Makefile.in
 manpage.links
 manpage.refs
-*.swp

doc/man/Makefile

@@ -0,0 +1,6 @@
+path_to_top=../..
+include $(path_to_top)/Makefile.config
+
+SUBDIRS = man1 man5
+
+include $(path_to_top)/Makefile.lib

doc/man/Makefile.am

@@ -1,4 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.1 2003/05/21 02:02:56 jonas Exp $
-
-SUBDIRS = man1 man5

doc/man/man1/.cvsignore

@@ -1,6 +0,0 @@
-Makefile
-Makefile.in
-elinks.1
-manpage.links
-manpage.refs
-*.swp

doc/man/man1/.gitignore

@@ -0,0 +1 @@
+elinks.1

doc/man/man1/Makefile

@@ -0,0 +1,7 @@
+path_to_top=../../..
+include $(path_to_top)/Makefile.config
+
+install-l:
+	$(INSTALL_DATA) elinks.1 $(DESTDIR)$(mandir)/man1
+
+include $(path_to_top)/Makefile.lib

doc/man/man1/Makefile.am

@@ -1,6 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.3 2005/05/18 02:40:54 jonas Exp $
-
-man_MANS = elinks.1
-
-EXTRA_DIST = elinks.1.in

doc/man/man5/Makefile

@@ -0,0 +1,8 @@
+path_to_top=../../..
+include $(path_to_top)/Makefile.config
+
+install-l:
+	$(INSTALL_DATA) elinks.conf.5 $(DESTDIR)$(mandir)/man5
+	$(INSTALL_DATA) elinkskeys.5 $(DESTDIR)$(mandir)/man5
+
+include $(path_to_top)/Makefile.lib

doc/man/man5/Makefile.am

@@ -1,6 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.2 2003/06/04 22:21:29 jonas Exp $
-
-man_MANS = elinks.conf.5 elinkskeys.5
-
-EXTRA_DIST = $(man_MANS)

doc/tools/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp

intl/.cvsignore

@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-*.swp

intl/Makefile.am

@@ -1,4 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.4 2003/01/04 01:06:59 pasky Exp $
-
-EXTRA_DIST = README

po/.cvsignore

@@ -1,6 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.gmo
-elinks.pot
-*.swp

po/.gitignore

@@ -0,0 +1,2 @@
+*.gmo
+elinks.pot

po/Makefile

@@ -1,24 +1,18 @@
-## Process this file with automake to produce Makefile.in
+path_to_top=..
-## $Id: Makefile.am,v 1.9 2005/05/16 22:34:41 jonas Exp $
+include $(path_to_top)/Makefile.config
-
-EXTRA_DIST = README $(PACKAGE).pot $(POFILES) $(GMOFILES)
-
-MOSTLYCLEANFILES = $(PACKAGE).po *.new.po
-DISTCLEANFILES = *.mo
-MAINTAINERCLEANFILES = $(GMOFILES)
 
 # Where to install the catalog files.
 localedir = $(datadir)/locale
 
 # These are for some reason not added magically to the Makefile.
 MSGMERGE = msgmerge
-XGETTEXT = @XGETTEXT@
 
 POTFILES_REL = $(shell find $(top_srcdir)/src/ -name '*.[ch]' -o -name options.inc -o -name 'actions-*.inc' | sort)
 POTFILES_ABS = $(shell cd $(top_srcdir); find src/ -name '*.[ch]' -o -name options.inc -o -name 'actions-*.inc' | sort)
 
 
 SUFFIXES = .po .gmo .mo
+.SUFFIXES: .gmo .mo .po
 
 .po.mo:
 	$(MSGFMT) -o $@ $<
@@ -43,7 +37,7 @@ SUFFIXES = .po .gmo .mo
 #
 # $(CATALOGS) is empty if --disable-nls. Beats using *-(yes|no) targets.
 
-all-local: $(CATALOGS)
+all-l: $(CATALOGS)
 
 
 ### Creating the template po template file
@@ -108,13 +102,13 @@ check-po:
 	  $(GMSGFMT) --check --check-accelerators=~ --verbose --statistics -o /dev/null $$lang.po; \
 	done
 
-### (Un)installation and distribution
+### Installation and distribution
 #
-# Use *-local targets to place and remove .gmo files.
+# Use *-l targets to place and remove .gmo files.
 
-install-data-local: install-data-local-@CONFIG_NLS@
+install-l: install-l-$(CONFIG_NLS)
-install-data-local-no:
+install-l-no:
-install-data-local-yes:
+install-l-yes:
 	$(mkinstalldirs) $(DESTDIR)$(localedir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
@@ -130,16 +124,11 @@ install-data-local-yes:
 	  fi; \
 	done
 
-# There is no `uninstall-data-local' target. The automake info document says to
-# just use `uninstall-local'.
-uninstall-local:
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
-	done
-
 # Steal the `dist' target so that .po and .gmo files will be properly updated
 # then the dependence on `distdir' will take care of copying.
 dist: update-po distdir
+
+clean:
+	rm -f $(PACKAGE).po *.new.po
+
+include $(path_to_top)/Makefile.lib

src/.cvsignore

@@ -1,7 +0,0 @@
-Makefile
-Makefile.in
-.deps
-elinks
-*.swp
-*.html
-*.patch

src/Makefile

@@ -1,36 +1,32 @@
-## Process this file with automake to produce Makefile.in
+path_to_top=..
-## $Id: Makefile.am,v 1.87 2005/06/14 12:25:19 jonas Exp $
+include $(path_to_top)/Makefile.config
 
-include $(top_srcdir)/Makefile.base
+ifeq ($(CONFIG_BOOKMARKS),yes)
-
-EXTRA_DIST = README
-
-if CONFIG_BOOKMARKS
 bookmarksdir = bookmarks
 bookmarkslib = $(bookmarksdir)/libbookmarks.a
 endif
 
-if CONFIG_COOKIES
+ifeq ($(CONFIG_COOKIES),yes)
 cookiesdir = cookies
 cookieslib = $(cookiesdir)/libcookies.a
 endif
 
-if CONFIG_FORMHIST
+ifeq ($(CONFIG_FORMHIST),yes)
 formhistdir = formhist
 formhistlib = $(formhistdir)/libformhist.a
 endif
 
-if CONFIG_GLOBHIST
+ifeq ($(CONFIG_GLOBHIST),yes)
 globhistdir = globhist
 globhistlib = $(globhistdir)/libglobhist.a
 endif
 
-if CONFIG_ECMASCRIPT
+ifeq ($(CONFIG_ECMASCRIPT),yes)
 ecmascriptdir = ecmascript
 ecmascriptlib = $(ecmascriptdir)/libecmascript.a
 endif
 
-if CONFIG_SCRIPTING
+ifeq ($(CONFIG_SCRIPTING),yes)
 scriptingdir = scripting
 scriptinglib = $(scriptingdir)/libscripting.a
 endif
@@ -59,23 +55,11 @@ SUBDIRS = \
  util \
  viewer
 
-bin_PROGRAMS = elinks
-elinks_SOURCES = \
- elinks.h \
- setup.h \
- vernum.c \
- vernum.h
-
-vernum.o: FORCE
-
-FORCE:
-
 # Order of this is purely magic and random, so that ld doesn't fail for some
 # strange reason. Try to swap randomly when ld will start to complain about
 # mysteriously unresolved symbols.
-elinks_DEPENDENCIES = \
+ELINKSLIBS = \
  main/libmain.a \
- @INTLLIBS@ \
  $(cookieslib) \
  viewer/libviewer.a \
  cache/libcache.a \
@@ -96,6 +80,15 @@ elinks_DEPENDENCIES = \
  mime/libmime.a \
  bfu/libbfu.a \
  encoding/libencoding.a \
+ $(INTLLIBS) \
  util/libutil.a
 
-elinks_LDADD = $(elinks_DEPENDENCIES)
+OBJS = vernum.o
+vernum.o: FORCE
+FORCE:
+
+all-l: elinks
+elinks: $(OBJS) $(ELINKSLIBS)
+	$(call cmd,link)
+
+include $(path_to_top)/Makefile.lib

src/bfu/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp

src/bfu/Makefile

@@ -0,0 +1,29 @@
+path_to_top=../..
+include $(path_to_top)/Makefile.config
+
+ifeq ($(CONFIG_LEDS),yes)
+ledsobj = leds.o
+endif
+
+OBJS = \
+ button.o \
+ checkbox.o \
+ dialog.o \
+ group.o \
+ hierbox.o \
+ hotkey.o \
+ inpfield.o \
+ inphist.o \
+ $(ledsobj) \
+ listbox.o \
+ listmenu.o \
+ menu.o \
+ msgbox.o \
+ style.o \
+ text.o \
+ widget.o
+
+all-l: libbfu.a
+libbfu.a: $(OBJS)
+
+include $(path_to_top)/Makefile.lib

src/bfu/Makefile.am

@@ -1,47 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.27 2004/11/19 15:33:07 zas Exp $
-
-include $(top_srcdir)/Makefile.base
-
-if CONFIG_LEDS
-ledsobj = leds.o
-endif
-
-noinst_LIBRARIES = libbfu.a
-
-EXTRA_libbfu_a_SOURCES = leds.c leds.h
-libbfu_a_LIBADD = $(ledsobj)
-
-libbfu_a_SOURCES = \
- button.c \
- button.h \
- checkbox.c \
- checkbox.h \
- common.h \
- dialog.c \
- dialog.h \
- group.c \
- group.h \
- hierbox.c \
- hierbox.h \
- hotkey.c \
- hotkey.h \
- inpfield.c \
- inpfield.h \
- inphist.c \
- inphist.h \
- listbox.c \
- listbox.h \
- listmenu.c \
- listmenu.h \
- menu.c \
- menu.h \
- msgbox.c \
- msgbox.h \
- style.c \
- style.h \
- text.c \
- text.h \
- widget.c \
- widget.h
-

src/bookmarks/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp

src/bookmarks/Makefile

@@ -0,0 +1,16 @@
+path_to_top=../..
+include $(path_to_top)/Makefile.config
+
+SUBDIRS = backend
+
+ifeq ($(CONFIG_XBEL_BOOKMARKS),yes)
+xbelobj = xbel.o
+endif
+
+BACK_OBJS = common.o default.o $(xbelobj)
+OBJS = bookmarks.o dialogs.o $(foreach obj,$(BACK_OBJS),backend/$(obj))
+
+all-l: libbookmarks.a
+libbookmarks.a: $(OBJS)
+
+include $(path_to_top)/Makefile.lib

src/bookmarks/Makefile.am

@@ -1,23 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.12 2004/05/02 12:59:42 jonas Exp $
-
-include $(top_srcdir)/Makefile.base
-
-if CONFIG_XBEL_BOOKMARKS
-xbelobj = backend/xbel.o
-endif
-
-SUBDIRS = backend
-
-noinst_LIBRARIES = libbookmarks.a
-
-libbookmarks_a_LIBADD = \
- backend/common.o \
- backend/default.o \
- $(xbelobj)
-
-libbookmarks_a_SOURCES = \
- bookmarks.c \
- bookmarks.h \
- dialogs.c \
- dialogs.h

src/bookmarks/backend/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp

src/bookmarks/backend/Makefile

@@ -0,0 +1,13 @@
+path_to_top=../../..
+include $(path_to_top)/Makefile.config
+
+ifeq ($(CONFIG_XBEL_BOOKMARKS),yes)
+xbelobj = xbel.o
+endif
+
+OBJS = common.o default.o $(xbelobj)
+
+# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
+all-l: $(OBJS)
+
+include $(path_to_top)/Makefile.lib

src/bookmarks/backend/Makefile.am

@@ -1,26 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.4 2004/08/14 21:12:36 miciah Exp $
-
-include $(top_srcdir)/Makefile.base
-
-# We don't want to expose this outside of /src/bookmarks/ at all, and we can't
-# merge the whole library of these with libbookmarks.a. So we only compile
-# objects here and link them directly to libbookmarks.a in ../Makefile.am.
-
-# However, we apparently need to create the library in order to convince
-# automake to compile the objects :/. We DON'T use libbackend.a ANYWHERE.
-
-if CONFIG_XBEL_BOOKMARKS
-xbelobj = xbel.o
-endif
-
-noinst_LIBRARIES = libbackend.a
-
-EXTRA_libbackend_a_SOURCES = xbel.c xbel.h
-libbackend_a_LIBADD = $(xbelobj)
-
-libbackend_a_SOURCES = \
- common.c \
- common.h \
- default.c \
- default.h

src/cache/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp

src/cache/Makefile

@@ -0,0 +1,9 @@
+path_to_top=../..
+include $(path_to_top)/Makefile.config
+
+OBJS = cache.o dialogs.o
+
+all-l: libcache.a
+libcache.a: $(OBJS)
+
+include $(path_to_top)/Makefile.lib

src/cache/Makefile.am

@@ -1,12 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.2 2003/11/17 17:58:57 pasky Exp $
-
-include $(top_srcdir)/Makefile.base
-
-noinst_LIBRARIES = libcache.a
-libcache_a_SOURCES = \
- cache.c \
- cache.h \
- dialogs.c \
- dialogs.h
-

src/config/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp

src/config/Makefile

@@ -0,0 +1,9 @@
+path_to_top=../..
+include $(path_to_top)/Makefile.config
+
+OBJS = cmdline.o conf.o dialogs.o home.o kbdbind.o options.o opttypes.o timer.o urlhist.o
+
+all-l: libconfig.a
+libconfig.a: $(OBJS)
+
+include $(path_to_top)/Makefile.lib

src/config/Makefile.am

@@ -1,29 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.17 2005/06/12 18:31:42 jonas Exp $
-
-include $(top_srcdir)/Makefile.base
-
-noinst_LIBRARIES = libconfig.a
-libconfig_a_SOURCES = \
- actions-edit.inc \
- actions-main.inc \
- actions-menu.inc \
- cmdline.c \
- cmdline.h \
- conf.c \
- conf.h \
- dialogs.c \
- dialogs.h \
- home.c \
- home.h \
- kbdbind.c \
- kbdbind.h \
- options.c \
- options.h \
- options.inc \
- opttypes.c \
- opttypes.h \
- timer.c \
- timer.h \
- urlhist.c \
- urlhist.h

src/config/cmdline.c

@@ -786,7 +786,7 @@ struct option_info cmdline_options_info[] = {
 		"\topenURL(URL, new-tab)     : open URL in new tab\n"
 		"\topenURL(URL, new-window)  : open URL in new window\n"
 		"\taddBookmark(URL)          : bookmark URL\n"
-		"\tpopUp(text)               : show text in a message box\n"
+		"\tinfoBox(text)             : show text in a message box\n"
 		"\txfeDoCommand(openBrowser) : open new window")),
 
 	INIT_OPT_INT("", N_("Connect to session ring with given ID"),

src/config/options.inc

@@ -568,7 +568,7 @@ static struct option_info config_options_info[] = {
 	INIT_OPT_BOOL("document.colors", N_("Increase contrast"),
 	        "increase_contrast", 0, 1,
 	        N_("Increase the contrast between the foreground and background colors\n"
-	           "to ensure readability. For example it disallows dark colors on a black\n"
+	           "to ensure readability. For example it disallows dark colors on a\n"
 	           "black background. Note, this is different from ensuring the contrast\n"
 	           "with the ensure_contrast option.")),
 

src/cookies/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp

src/cookies/Makefile

@@ -0,0 +1,12 @@
+path_to_top=../..
+include $(path_to_top)/Makefile.config
+
+OBJS = cookies.o dialogs.o parser.o
+
+all-l: libcookies.a
+libcookies.a: $(OBJS)
+
+parsetst: parser.o parsetst.o
+	$(call cmd,link) -L../util/libutil.a
+
+include $(path_to_top)/Makefile.lib

src/cookies/Makefile.am

@@ -1,24 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.13 2004/01/03 01:11:57 pasky Exp $
-
-include $(top_srcdir)/Makefile.base
-
-noinst_LIBRARIES = libcookies.a
-libcookies_a_SOURCES = \
- cookies.c \
- cookies.h \
- dialogs.c \
- dialogs.h \
- parser.c \
- parser.h
-
-TESTS = parsetst
-
-EXTRA_PROGRAMS = parsetst
-
-parsetst_SOURCES = \
- parser.h \
- parser.c \
- parsetst.c
-parsetst_DEPENDENCIES = testutils
-parsetst_LDADD = $(top_builddir)/src/util/libutil.a

src/dialogs/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp

src/dialogs/Makefile

@@ -0,0 +1,13 @@
+path_to_top=../..
+include $(path_to_top)/Makefile.config
+
+ifeq ($(CONFIG_EXMODE),yes)
+exmodeobj = exmode.o
+endif
+
+OBJS = document.o download.o edit.o $(exmodeobj) info.o menu.o options.o progress.o status.o
+
+all-l: libdialogs.a
+libdialogs.a: $(OBJS)
+
+include $(path_to_top)/Makefile.lib

src/dialogs/Makefile.am

@@ -1,31 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.26 2005/04/18 17:00:25 zas Exp $
-
-include $(top_srcdir)/Makefile.base
-
-if CONFIG_EXMODE
-exmodeobj = exmode.o
-endif
-
-noinst_LIBRARIES = libdialogs.a
-
-EXTRA_libdialogs_a_SOURCES = exmode.c exmode.h
-libdialogs_a_LIBADD = $(exmodeobj)
-
-libdialogs_a_SOURCES = \
- document.c \
- document.h \
- download.c \
- download.h \
- edit.c \
- edit.h \
- info.c \
- info.h \
- menu.c \
- menu.h \
- options.c \
- options.h \
- progress.c \
- progress.h \
- status.c \
- status.h

src/document/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp

src/document/Makefile

@@ -1,9 +1,7 @@
-## Process this file with automake to produce Makefile.in
+path_to_top=../..
-## $Id: Makefile.am,v 1.49 2005/07/15 04:37:55 miciah Exp $
+include $(path_to_top)/Makefile.config
 
-include $(top_srcdir)/Makefile.base
+ifeq ($(CONFIG_CSS),yes)
-
-if CONFIG_CSS
 cssdir = css
 cssobj = \
  css/apply.o \
@@ -15,7 +13,7 @@ cssobj = \
  css/value.o
 endif
 
-if CONFIG_DOM
+ifeq ($(CONFIG_DOM),yes)
 domdir = dom
 domobj = \
  $(domdir)/navigator.o \
@@ -32,9 +30,7 @@ endif
 
 SUBDIRS = $(cssdir) $(domdir) html plain $(sgmldir)
 
-noinst_LIBRARIES = libdocument.a
+SUB_OBJS = \
-
-libdocument_a_LIBADD = \
  $(cssobj) \
  $(domobj) \
  html/parser/forms.o \
@@ -50,18 +46,9 @@ libdocument_a_LIBADD = \
  plain/renderer.o \
  $(sgmlobj)
 
-libdocument_a_SOURCES = \
+OBJS = docdata.o document.o forms.o options.o refresh.o renderer.o $(SUB_OBJS)
- docdata.c \
- docdata.h \
- document.c \
- document.h \
- forms.c \
- forms.h \
- options.c \
- options.h \
- refresh.c \
- refresh.h \
- renderer.c \
- renderer.h \
- view.h
 
+all-l: libdocument.a
+libdocument.a: $(OBJS)
+
+include $(path_to_top)/Makefile.lib

src/document/css/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp

src/document/css/Makefile

@@ -0,0 +1,9 @@
+path_to_top=../../..
+include $(path_to_top)/Makefile.config
+
+OBJS = apply.o css.o parser.o property.o scanner.o stylesheet.o value.o
+
+# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
+all-l: $(OBJS)
+
+include $(path_to_top)/Makefile.lib

src/document/css/Makefile.am

@@ -1,31 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.11 2004/08/14 21:12:37 miciah Exp $
-
-include $(top_srcdir)/Makefile.base
-
-# We don't want to expose this outside of /src/document/ at all, and we can't
-# merge the whole library of these with libdocument.a. So we only compile
-# objects here and link them directly to libdocument.a in ../Makefile.am.
-
-# However, we apparently need to create the library in order to convince
-# automake to compile the objects :/. We DON'T use libcss.a ANYWHERE.
-
-EXTRA_DIST = README
-
-noinst_LIBRARIES = libcss.a
-libcss_a_SOURCES = \
- apply.c \
- apply.h \
- css.c \
- css.h \
- parser.c \
- parser.h \
- property.c \
- property.h \
- scanner.c \
- scanner.h \
- stylesheet.c \
- stylesheet.h \
- value.c \
- value.h
-

src/document/dom/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp

src/document/dom/Makefile

@@ -0,0 +1,9 @@
+path_to_top=../../..
+include $(path_to_top)/Makefile.config
+
+OBJS = navigator.o node.o renderer.o
+
+# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
+all-l: $(OBJS)
+
+include $(path_to_top)/Makefile.lib

src/document/dom/Makefile.am

@@ -1,20 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.3 2004/09/29 22:38:51 jonas Exp $
-
-include $(top_srcdir)/Makefile.base
-
-# We don't want to expose this outside of /src/document/ at all, and we can't
-# merge the whole library of these with libdocument.a. So we only compile
-# objects here and link them directly to libdocument.a in ../Makefile.am.
-
-# However, we apparently need to create the library in order to convience
-# automake to compile the objects :/. We DON'T use libcss.a ANYWHERE.
-
-noinst_LIBRARIES = libdom.a
-libdom_a_SOURCES = \
- navigator.c \
- navigator.h \
- node.c \
- node.h \
- renderer.c \
- renderer.h

src/document/html/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp

src/document/html/Makefile

@@ -0,0 +1,11 @@
+path_to_top=../../..
+include $(path_to_top)/Makefile.config
+
+SUBDIRS = parser
+
+OBJS = frames.o parser.o renderer.o tables.o
+
+# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
+all-l: $(OBJS)
+
+include $(path_to_top)/Makefile.lib

src/document/html/Makefile.am

@@ -1,28 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.18 2004/08/14 21:12:38 miciah Exp $
-
-include $(top_srcdir)/Makefile.base
-
-# We don't want to expose this outside of /src/document/ at all, and we can't
-# merge the whole library of these with libdocument.a. So we only compile
-# objects here and link them directly to libdocument.a in ../Makefile.am.
-
-# However, we apparently need to create the library in order to convince
-# automake to compile the objects :/. We DON'T use libhtml.a ANYWHERE.
-
-EXTRA_DIST = TODO
-
-SUBDIRS = parser
-
-noinst_LIBRARIES = libhtml.a
-libhtml_a_SOURCES = \
- frames.c \
- frames.h \
- internal.h \
- parser.c \
- parser.h \
- renderer.c \
- renderer.h \
- tables.c \
- tables.h
-

src/document/html/parser/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp

src/document/html/parser/Makefile

@@ -0,0 +1,9 @@
+path_to_top=../../../..
+include $(path_to_top)/Makefile.config
+
+OBJS = forms.o general.o link.o parse.o stack.o table.o
+
+# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
+all-l: $(OBJS)
+
+include $(path_to_top)/Makefile.lib

src/document/html/parser/Makefile.am

@@ -1,27 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.7 2005/07/15 04:37:55 miciah Exp $
-
-include $(top_srcdir)/Makefile.base
-
-# We don't want to expose this outside of /src/document/ at all, and we can't
-# merge the whole library of these with libdocument.a. So we only compile
-# objects here and link them directly to libdocument.a in ../Makefile.am.
-
-# However, we apparently need to create the library in order to convince
-# automake to compile the objects :/. We DON'T use libhtmlp.a ANYWHERE.
-
-noinst_LIBRARIES = libhtmlp.a
-libhtmlp_a_SOURCES = \
- forms.c \
- forms.h \
- general.c \
- general.h \
- link.c \
- link.h \
- parse.c \
- parse.h \
- stack.c \
- stack.h \
- table.c \
- table.h
-

src/document/plain/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp

src/document/plain/Makefile

@@ -0,0 +1,9 @@
+path_to_top=../../..
+include $(path_to_top)/Makefile.config
+
+OBJS = renderer.o
+
+# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
+all-l: $(OBJS)
+
+include $(path_to_top)/Makefile.lib

src/document/plain/Makefile.am

@@ -1,10 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.1 2003/11/10 21:29:30 jonas Exp $
-
-include $(top_srcdir)/Makefile.base
-
-noinst_LIBRARIES = libplain_document.a
-libplain_document_a_SOURCES = \
- renderer.c \
- renderer.h
-

src/document/sgml/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp

src/document/sgml/Makefile

@@ -0,0 +1,11 @@
+path_to_top=../../..
+include $(path_to_top)/Makefile.config
+
+SUBDIRS = html
+
+OBJS = sgml.o parser.o scanner.o
+
+# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
+all-l: $(OBJS)
+
+include $(path_to_top)/Makefile.lib

src/document/sgml/Makefile.am

@@ -1,24 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.3 2004/09/29 22:38:52 jonas Exp $
-
-include $(top_srcdir)/Makefile.base
-
-# We don't want to expose this outside of /src/document/ at all, and we can't
-# merge the whole library of these with libdocument.a. So we only compile
-# objects here and link them directly to libdocument.a in ../Makefile.am.
-
-# However, we apparently need to create the library in order to convience
-# automake to compile the objects :/. We DON'T use libcss.a ANYWHERE.
-
-SUBDIRS = html
-
-EXTRA_DIST = README
-
-noinst_LIBRARIES = libsgml.a
-libsgml_a_SOURCES = \
- parser.c \
- parser.h \
- scanner.c \
- scanner.h \
- sgml.c \
- sgml.h

src/document/sgml/html/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp

src/document/sgml/html/Makefile

@@ -0,0 +1,9 @@
+path_to_top=../../../..
+include $(path_to_top)/Makefile.config
+
+OBJS = html.o
+
+# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
+all-l: $(OBJS)
+
+include $(path_to_top)/Makefile.lib

src/document/sgml/html/Makefile.am

@@ -1,18 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.2 2004/09/24 00:44:59 jonas Exp $
-
-include $(top_srcdir)/Makefile.base
-
-# We don't want to expose this outside of /src/document/ at all, and we can't
-# merge the whole library of these with libdocument.a. So we only compile
-# objects here and link them directly to libdocument.a in ../Makefile.am.
-
-# However, we apparently need to create the library in order to convience
-# automake to compile the objects :/. We DON'T use libcss.a ANYWHERE.
-
-noinst_LIBRARIES = libhtml.a
-libhtml_a_SOURCES = \
- attribute.inc \
- element.inc \
- html.c \
- html.h

src/ecmascript/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp

src/ecmascript/Makefile

@@ -0,0 +1,13 @@
+path_to_top=../..
+include $(path_to_top)/Makefile.config
+INCLUDES += $(SPIDERMONKEY_CFLAGS)
+
+SUBDIRS = spidermonkey
+
+SM_OBJS = document.o form.o location.o navigator.o unibar.o window.o
+OBJS = ecmascript.o spidermonkey.o $(foreach obj,$(SM_OBJS),spidermonkey/$(obj))
+
+all-l: libecmascript.a
+libecmascript.a: $(OBJS)
+
+include $(path_to_top)/Makefile.lib

src/ecmascript/Makefile.am

@@ -1,22 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.10 2005/09/14 22:57:16 pasky Exp $
-
-include $(top_srcdir)/Makefile.base
-
-SUBDIRS=spidermonkey
-
-INCLUDES += $(SPIDERMONKEY_CFLAGS)
-
-noinst_LIBRARIES = libecmascript.a
-libecmascript_a_LIBADD = \
- spidermonkey/document.o \
- spidermonkey/form.o \
- spidermonkey/location.o \
- spidermonkey/navigator.o \
- spidermonkey/unibar.o \
- spidermonkey/window.o
-libecmascript_a_SOURCES = \
- ecmascript.c \
- ecmascript.h \
- spidermonkey.c \
- spidermonkey.h

src/ecmascript/spidermonkey/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp

src/ecmascript/spidermonkey/Makefile

@@ -0,0 +1,10 @@
+path_to_top=../../..
+include $(path_to_top)/Makefile.config
+INCLUDES += $(SPIDERMONKEY_CFLAGS)
+
+# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
+OBJS = document.o form.o location.o navigator.o unibar.o window.o
+
+all-l: $(OBJS)
+
+include $(path_to_top)/Makefile.lib

src/ecmascript/spidermonkey/Makefile.am

@@ -1,30 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.6 2005/09/14 22:57:17 pasky Exp $
-
-include $(top_srcdir)/Makefile.base
-
-INCLUDES += $(SPIDERMONKEY_CFLAGS)
-
-# We don't want to expose this outside of /src/ecmascript/ at all, and we can't
-# merge the whole library of these with libecmascript.a. So we only compile
-# objects here and link them directly to libecmascript.a in ../Makefile.am.
-
-# However, we apparently need to create the library in order to convince
-# automake to compile the objects :/. We DON'T use libbackend.a ANYWHERE.
-
-noinst_LIBRARIES = libbackend.a
-
-libbackend_a_SOURCES = \
- document.c \
- document.h \
- form.c \
- form.h \
- location.c \
- location.h \
- navigator.c \
- navigator.h \
- util.h \
- unibar.c \
- unibar.h \
- window.c \
- window.h

src/encoding/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.deps
-*.swp

src/encoding/Makefile

@@ -0,0 +1,17 @@
+path_to_top=../..
+include $(path_to_top)/Makefile.config
+
+ifeq ($(CONFIG_BZIP2),yes)
+bzip2obj	= bzip2.o
+endif
+
+ifeq ($(CONFIG_GZIP),yes)
+gzipobj		= gzip.o
+endif
+
+OBJS = encoding.o bzip2.o gzip.o
+
+all-l: libencoding.a
+libencoding.a: $(OBJS)
+
+include $(path_to_top)/Makefile.lib