Include $(top_srcdir)/Makefile.lib instead of $(path_to_top)/Makefile.lib

A step towards out of tree builds ...
2025-02-02 15:09:23 -05:00 · 2005-10-20 01:11:47 +02:00 · 2005-10-20 01:11:47 +02:00 · e39a4342d6
commit e39a4342d6
parent 7392b8c503
63 changed files with 63 additions and 64 deletions
--- a/2
+++ b/2
@ -45,5 +45,5 @@ ifeq ($(wildcard Makefile.config),)
 $(MAKECMDGOALS) default:
 	@echo "You need to first run ./configure"
 else
-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
 endif
--- a/doc/Makefile
+++ b/doc/Makefile
@ -198,4 +198,4 @@ $(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
+include $(top_srcdir)/Makefile.lib
--- a/doc/man/Makefile
+++ b/doc/man/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 SUBDIRS = man1 man5

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/doc/man/man1/Makefile
+++ b/doc/man/man1/Makefile
@ -7,4 +7,4 @@ elinks.1: elinks.1.in $(path_to_top)/configure.in

 MAN1 = elinks.1

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/doc/man/man5/Makefile
+++ b/doc/man/man5/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 MAN5 = elinks.conf.5 elinkskeys.5

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/po/Makefile
+++ b/po/Makefile
@ -113,4 +113,4 @@ dist: update-po distdir
 clean-local:
 	rm -f $(PACKAGE).po *.new.po $(srcdir)/$(POTFILES_ABS_LIST)

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/Makefile
+++ b/src/Makefile
@ -41,5 +41,4 @@ elinks: lib.o

 PROGS = elinks

-include $(path_to_top)/Makefile.lib
-
+include $(top_srcdir)/Makefile.lib
--- a/src/bfu/Makefile
+++ b/src/bfu/Makefile
@ -20,4 +20,4 @@ OBJS = \
 text.o \
 widget.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/bookmarks/Makefile
+++ b/src/bookmarks/Makefile
@ -4,4 +4,4 @@ include $(path_to_top)/Makefile.config
 SUBDIRS = backend
 OBJS	= bookmarks.o dialogs.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/bookmarks/backend/Makefile
+++ b/src/bookmarks/backend/Makefile
@ -4,4 +4,4 @@ include $(path_to_top)/Makefile.config
 OBJS-$(CONFIG_XBEL_BOOKMARKS) += xbel.o
 OBJS = common.o default.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/cache/Makefile
+++ b/src/cache/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = cache.o dialogs.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/config/Makefile
+++ b/src/config/Makefile
@ -3,4 +3,4 @@ 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

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/cookies/Makefile
+++ b/src/cookies/Makefile
@ -6,4 +6,4 @@ OBJS = cookies.o dialogs.o parser.o
 parsetst: parser.o parsetst.o
 	$(call cmd,link) -L../util/libutil.a

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/dialogs/Makefile
+++ b/src/dialogs/Makefile
@ -5,4 +5,4 @@ OBJS-$(CONFIG_EXMODE) += exmode.o

 OBJS = document.o download.o edit.o info.o menu.o options.o progress.o status.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/document/Makefile
+++ b/src/document/Makefile
@ -8,4 +8,4 @@ SUBDIRS = html plain

 OBJS = docdata.o document.o forms.o options.o refresh.o renderer.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/document/css/Makefile
+++ b/src/document/css/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = apply.o css.o parser.o property.o scanner.o stylesheet.o value.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/document/dom/Makefile
+++ b/src/document/dom/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = navigator.o node.o renderer.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/document/html/Makefile
+++ b/src/document/html/Makefile
@ -4,4 +4,4 @@ include $(path_to_top)/Makefile.config
 SUBDIRS = parser
 OBJS	= frames.o parser.o renderer.o tables.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/document/html/parser/Makefile
+++ b/src/document/html/parser/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = forms.o general.o link.o parse.o stack.o table.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/document/plain/Makefile
+++ b/src/document/plain/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = renderer.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/document/sgml/Makefile
+++ b/src/document/sgml/Makefile
@ -4,4 +4,4 @@ include $(path_to_top)/Makefile.config
 SUBDIRS = html
 OBJS	= sgml.o parser.o scanner.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/document/sgml/html/Makefile
+++ b/src/document/sgml/html/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = html.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/ecmascript/Makefile
+++ b/src/ecmascript/Makefile
@ -5,4 +5,4 @@ INCLUDES += $(SPIDERMONKEY_CFLAGS)
 SUBDIRS = spidermonkey
 OBJS	= ecmascript.o spidermonkey.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/ecmascript/spidermonkey/Makefile
+++ b/src/ecmascript/spidermonkey/Makefile
@ -4,4 +4,4 @@ INCLUDES += $(SPIDERMONKEY_CFLAGS)

 OBJS = document.o form.o location.o navigator.o unibar.o window.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/encoding/Makefile
+++ b/src/encoding/Makefile
@ -6,4 +6,4 @@ OBJS-$(CONFIG_GZIP)	+= gzip.o

 OBJS = encoding.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/formhist/Makefile
+++ b/src/formhist/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = formhist.o dialogs.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/globhist/Makefile
+++ b/src/globhist/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = globhist.o dialogs.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/intl/Makefile
+++ b/src/intl/Makefile
@ -5,4 +5,4 @@ SUBDIRS-$(CONFIG_NLS) += gettext

 OBJS = charsets.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/intl/gettext/Makefile
+++ b/src/intl/gettext/Makefile
@ -102,4 +102,4 @@ uninstall-local:
 	  : ; \
 	fi

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/main/Makefile
+++ b/src/main/Makefile
@ -5,4 +5,4 @@ OBJS-$(CONFIG_INTERLINK) += interlink.o

 OBJS = event.o main.o module.o select.o timer.o version.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/mime/Makefile
+++ b/src/mime/Makefile
@ -4,4 +4,4 @@ include $(path_to_top)/Makefile.config
 SUBDIRS = backend
 OBJS	= dialogs.o mime.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/mime/backend/Makefile
+++ b/src/mime/backend/Makefile
@ -6,4 +6,4 @@ OBJS-$(CONFIG_MIMETYPES)	+= mimetypes.o

 OBJS = common.o default.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/network/Makefile
+++ b/src/network/Makefile
@ -5,4 +5,4 @@ SUBDIRS-$(CONFIG_SSL) += ssl

 OBJS = connection.o dns.o progress.o socket.o state.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/network/ssl/Makefile
+++ b/src/network/ssl/Makefile
@ -5,4 +5,4 @@ INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS)

 OBJS = ssl.o socket.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/osdep/Makefile
+++ b/src/osdep/Makefile
@ -16,4 +16,4 @@ OBJS = \
 stub.o \
 sysname.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/osdep/beos/Makefile
+++ b/src/osdep/beos/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = beos.o overrides.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/osdep/os2/Makefile
+++ b/src/osdep/os2/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = os2.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/osdep/riscos/Makefile
+++ b/src/osdep/riscos/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = riscos.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/osdep/unix/Makefile
+++ b/src/osdep/unix/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = unix.o bsd.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/osdep/win32/Makefile
+++ b/src/osdep/win32/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = win32.o overrides.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/protocol/Makefile
+++ b/src/protocol/Makefile
@ -15,4 +15,4 @@ OBJS-$(CONFIG_DATA)		+= data.o

 OBJS = about.o date.o header.o protocol.o proxy.o uri.o user.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/protocol/auth/Makefile
+++ b/src/protocol/auth/Makefile
@ -6,4 +6,4 @@ INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS)

 OBJS = auth.o dialogs.o digest.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/protocol/bittorrent/Makefile
+++ b/src/protocol/bittorrent/Makefile
@ -14,4 +14,4 @@ OBJS = \
 piececache.o \
 tracker.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/protocol/file/Makefile
+++ b/src/protocol/file/Makefile
@ -5,4 +5,4 @@ OBJS-$(CONFIG_CGI) += cgi.o

 OBJS = file.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/protocol/finger/Makefile
+++ b/src/protocol/finger/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = finger.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/protocol/ftp/Makefile
+++ b/src/protocol/ftp/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = ftp.o parse.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/protocol/gopher/Makefile
+++ b/src/protocol/gopher/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = gopher.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/protocol/http/Makefile
+++ b/src/protocol/http/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = blacklist.o codes.o http.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/protocol/nntp/Makefile
+++ b/src/protocol/nntp/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = nntp.o connection.o response.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/protocol/rewrite/Makefile
+++ b/src/protocol/rewrite/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = rewrite.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/protocol/smb/Makefile
+++ b/src/protocol/smb/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = smb.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/scripting/Makefile
+++ b/src/scripting/Makefile
@ -9,4 +9,4 @@ SUBDIRS-$(CONFIG_RUBY)		+= ruby

 OBJS = scripting.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/scripting/guile/Makefile
+++ b/src/scripting/guile/Makefile
@ -5,4 +5,4 @@ INCLUDES += $(GUILE_CFLAGS)

 OBJS = guile.o hooks.o core.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/scripting/lua/Makefile
+++ b/src/scripting/lua/Makefile
@ -5,4 +5,4 @@ INCLUDES += $(LUA_CFLAGS)

 OBJS = lua.o hooks.o core.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/scripting/perl/Makefile
+++ b/src/scripting/perl/Makefile
@ -5,4 +5,4 @@ INCLUDES += $(PERL_CFLAGS)

 OBJS = perl.o hooks.o core.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/scripting/python/Makefile
+++ b/src/scripting/python/Makefile
@ -5,4 +5,4 @@ INCLUDES += $(PYTHON_CFLAGS)

 OBJS = python.o hooks.o core.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/scripting/ruby/Makefile
+++ b/src/scripting/ruby/Makefile
@ -5,4 +5,4 @@ INCLUDES += $(RUBY_CFLAGS)

 OBJS = ruby.o hooks.o core.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/session/Makefile
+++ b/src/session/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = download.o history.o location.o session.o task.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/terminal/Makefile
+++ b/src/terminal/Makefile
@ -14,4 +14,4 @@ OBJS = \
 terminal.o \
 window.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/util/Makefile
+++ b/src/util/Makefile
@ -26,4 +26,4 @@ OBJS = \
 string.o \
 time.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/viewer/Makefile
+++ b/src/viewer/Makefile
@ -4,4 +4,4 @@ include $(path_to_top)/Makefile.config
 SUBDIRS = dump text
 OBJS	= action.o timer.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/viewer/dump/Makefile
+++ b/src/viewer/dump/Makefile
@ -3,4 +3,4 @@ include $(path_to_top)/Makefile.config

 OBJS = dump.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib
--- a/src/viewer/text/Makefile
+++ b/src/viewer/text/Makefile
@ -5,4 +5,4 @@ OBJS-$(CONFIG_MARKS) += marks.o

 OBJS = draw.o form.o link.o search.o textarea.o view.o vs.o

-include $(path_to_top)/Makefile.lib
+include $(top_srcdir)/Makefile.lib