Simplify building of and linking with directories

Ditch the building of an archive (.a) in favour of linking all objects in a
directory into a lib.o file. This makes it easy to link in subdirectories
and more importantly keeps the build logic in the local subdirectories.

Note: after updating you will have to rm **/*.a if you do not make clean
before updating.

Makefile.lib

@@ -24,8 +24,9 @@ quiet_cmd_compile = '      [CC]   $<'
  masq_cmd_compile = $(COMPILE) -c $<
       cmd_compile = $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
 
-quiet_cmd_archive = '      [AR]   $@'
+# Rule to compile a set of .o files into one .o file
-      cmd_archive = $(AR) r $@ $^
+quiet_cmd_ld_objs = "      [LD]   $@"
+      cmd_ld_objs = $(LD) -r -o $@ $(filter $(OBJS), $^)
  
    quiet_cmd_link = '    [LINK]   $@'
          cmd_link = $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
@@ -55,14 +56,16 @@ endif
 			>> .deps/$(*F).P; \
 		rm .deps/$(*F).pp
 
-%.a:
-	$(call cmd,archive)
-
 ifdef OBJS
 CLEAN += $(OBJS)
 
 clean-local:
-	$(RM) $(CLEAN) *.a
+	$(RM) lib.o $(CLEAN)
+
+lib.o: $(OBJS)
+	$(call cmd,ld_objs)
+
+all-local: lib.o
 endif
 
 

src/Makefile

@@ -3,32 +3,32 @@ include $(path_to_top)/Makefile.config
 
 ifeq ($(CONFIG_BOOKMARKS),yes)
 bookmarksdir = bookmarks
-bookmarkslib = $(bookmarksdir)/libbookmarks.a
+bookmarkslib = $(bookmarksdir)/lib.o
 endif
 
 ifeq ($(CONFIG_COOKIES),yes)
 cookiesdir = cookies
-cookieslib = $(cookiesdir)/libcookies.a
+cookieslib = $(cookiesdir)/lib.o
 endif
 
 ifeq ($(CONFIG_FORMHIST),yes)
 formhistdir = formhist
-formhistlib = $(formhistdir)/libformhist.a
+formhistlib = $(formhistdir)/lib.o
 endif
 
 ifeq ($(CONFIG_GLOBHIST),yes)
 globhistdir = globhist
-globhistlib = $(globhistdir)/libglobhist.a
+globhistlib = $(globhistdir)/lib.o
 endif
 
 ifeq ($(CONFIG_ECMASCRIPT),yes)
 ecmascriptdir = ecmascript
-ecmascriptlib = $(ecmascriptdir)/libecmascript.a
+ecmascriptlib = $(ecmascriptdir)/lib.o
 endif
 
 ifeq ($(CONFIG_SCRIPTING),yes)
 scriptingdir = scripting
-scriptinglib = $(scriptingdir)/libscripting.a
+scriptinglib = $(scriptingdir)/lib.o
 endif
 
 SUBDIRS = \
@@ -59,29 +59,29 @@ SUBDIRS = \
 # strange reason. Try to swap randomly when ld will start to complain about
 # mysteriously unresolved symbols.
 ELINKSLIBS = \
- main/libmain.a \
+ main/lib.o \
  $(cookieslib) \
- viewer/libviewer.a \
+ viewer/lib.o \
- cache/libcache.a \
+ cache/lib.o \
- document/libdocument.a \
+ document/lib.o \
- intl/libintl.a \
+ intl/lib.o \
- session/libsession.a \
+ session/lib.o \
- network/libnetwork.a \
+ network/lib.o \
- terminal/libterminal.a \
+ terminal/lib.o \
  $(scriptinglib) \
- osdep/libosdep.a \
+ osdep/lib.o \
- protocol/libprotocol.a \
+ protocol/lib.o \
  $(bookmarkslib) \
  $(formhistlib) \
  $(globhistlib) \
  $(ecmascriptlib) \
- config/libconfig.a \
+ config/lib.o \
- dialogs/libdialogs.a \
+ dialogs/lib.o \
- mime/libmime.a \
+ mime/lib.o \
- bfu/libbfu.a \
+ bfu/lib.o \
- encoding/libencoding.a \
+ encoding/lib.o \
- $(INTLLIBS) \
+ intl/lib.o \
- util/libutil.a
+ util/lib.o
 
 # Get the GIT HEAD ID if possible
 ifdef CG_COMMIT_ID
@@ -89,12 +89,12 @@ BUILD_ID=$(shell $(CG_COMMIT_ID) 2> /dev/null)
 endif
 INCLUDES += -DBUILD_ID="\"$(BUILD_ID)\""
 
-OBJS = vernum.o
+OBJS = vernum.o $(ELINKSLIBS)
 vernum.o: FORCE
 FORCE:
 
 all-local: elinks
-elinks: $(OBJS) $(ELINKSLIBS)
+elinks: $(OBJS)
 	$(call cmd,link)
 
 install:

src/bfu/Makefile

@@ -23,7 +23,4 @@ OBJS = \
  text.o \
  widget.o
 
-all-local: libbfu.a
-libbfu.a: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/bookmarks/Makefile

@@ -10,7 +10,4 @@ endif
 BACK_OBJS = common.o default.o $(xbelobj)
 OBJS = bookmarks.o dialogs.o $(foreach obj,$(BACK_OBJS),backend/$(obj))
 
-all-local: libbookmarks.a
-libbookmarks.a: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/cache/Makefile

@@ -3,7 +3,4 @@ include $(path_to_top)/Makefile.config
 
 OBJS = cache.o dialogs.o
 
-all-local: libcache.a
-libcache.a: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/config/Makefile

@@ -3,7 +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
 
-all-local: libconfig.a
-libconfig.a: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/cookies/Makefile

@@ -3,9 +3,6 @@ include $(path_to_top)/Makefile.config
 
 OBJS = cookies.o dialogs.o parser.o
 
-all-local: libcookies.a
-libcookies.a: $(OBJS)
-
 parsetst: parser.o parsetst.o
 	$(call cmd,link) -L../util/libutil.a
 

src/dialogs/Makefile

@@ -7,7 +7,4 @@ endif
 
 OBJS = document.o download.o edit.o $(exmodeobj) info.o menu.o options.o progress.o status.o
 
-all-local: libdialogs.a
-libdialogs.a: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/document/Makefile

@@ -3,29 +3,15 @@ include $(path_to_top)/Makefile.config
 
 ifeq ($(CONFIG_CSS),yes)
 cssdir = css
-cssobj = \
+cssobj = $(cssdir)/lib.o
- css/apply.o \
- css/css.o \
- css/parser.o \
- css/property.o \
- css/scanner.o \
- css/stylesheet.o \
- css/value.o
 endif
 
 ifeq ($(CONFIG_DOM),yes)
 domdir = dom
-domobj = \
+domobj = $(domdir)/lib.o
- $(domdir)/navigator.o \
- $(domdir)/node.o \
- $(domdir)/renderer.o
 
 sgmldir = sgml
-sgmlobj = \
+sgmlobj = $(sgmldir)/lib.o
- $(sgmldir)/html/html.o \
- $(sgmldir)/parser.o \
- $(sgmldir)/scanner.o \
- $(sgmldir)/sgml.o
 endif
 
 SUBDIRS = $(cssdir) $(domdir) html plain $(sgmldir)
@@ -33,22 +19,10 @@ SUBDIRS = $(cssdir) $(domdir) html plain $(sgmldir)
 SUB_OBJS = \
  $(cssobj) \
  $(domobj) \
- html/parser/forms.o \
+ html/lib.o \
- html/parser/general.o \
+ plain/lib.o \
- html/parser/link.o \
- html/parser/parse.o \
- html/parser/stack.o \
- html/parser/table.o \
- html/frames.o \
- html/parser.o \
- html/renderer.o \
- html/tables.o \
- plain/renderer.o \
  $(sgmlobj)
 
 OBJS = docdata.o document.o forms.o options.o refresh.o renderer.o $(SUB_OBJS)
 
-all-local: libdocument.a
-libdocument.a: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/document/css/Makefile

@@ -3,7 +3,4 @@ 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-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/document/dom/Makefile

@@ -3,7 +3,4 @@ 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-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/document/html/Makefile

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

src/document/html/parser/Makefile

@@ -3,7 +3,4 @@ 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-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/document/plain/Makefile

@@ -3,7 +3,4 @@ include $(path_to_top)/Makefile.config
 
 OBJS = renderer.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/document/sgml/Makefile

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

src/document/sgml/html/Makefile

@@ -3,7 +3,4 @@ include $(path_to_top)/Makefile.config
 
 OBJS = html.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/ecmascript/Makefile

@@ -5,9 +5,6 @@ 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))
+OBJS = ecmascript.o spidermonkey.o spidermonkey/lib.o
-
-all-local: libecmascript.a
-libecmascript.a: $(OBJS)
 
 include $(path_to_top)/Makefile.lib

src/ecmascript/spidermonkey/Makefile

@@ -2,9 +2,6 @@ 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-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/encoding/Makefile

@@ -11,7 +11,4 @@ endif
 
 OBJS = encoding.o $(bzip2obj) $(gzipobj)
 
-all-local: libencoding.a
-libencoding.a: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/formhist/Makefile

@@ -3,7 +3,4 @@ include $(path_to_top)/Makefile.config
 
 OBJS = formhist.o dialogs.o
 
-all-local: libformhist.a
-libformhist.a: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/globhist/Makefile

@@ -3,7 +3,4 @@ include $(path_to_top)/Makefile.config
 
 OBJS = globhist.o dialogs.o
 
-all-local: libglobhist.a
-libglobhist.a: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/intl/Makefile

@@ -3,13 +3,11 @@ include $(path_to_top)/Makefile.config
 
 ifeq ($(CONFIG_NLS),yes)
 gettextdir = gettext
+gettextobj = $(gettextdir)/lib.o
 endif
 
 SUBDIRS = $(gettextdir)
 
-OBJS = charsets.o
+OBJS = charsets.o $(gettextobj)
-
-all-local: libintl.a
-libintl.a: $(OBJS)
 
 include $(path_to_top)/Makefile.lib

src/intl/gettext/Makefile

@@ -27,9 +27,6 @@ OBJS = \
  plural.o \
  textdomain.o
 
-all-local: libintl.a
-libintl.a: $(OBJS)
-
 
 # $(builddir)/charset.alias: $(srcdir)/config.charset
 $(builddir)/charset.alias: $(srcdir)/config.charset

src/main/Makefile

@@ -7,7 +7,4 @@ endif
 
 OBJS = event.o $(interlinkobj) main.o module.o select.o timer.o version.o
 
-all-local: libmain.a
-libmain.a: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/mime/Makefile

@@ -3,23 +3,9 @@ include $(path_to_top)/Makefile.config
 
 SUBDIRS = backend
 
-ifeq ($(CONFIG_MAILCAP),yes)
-mailcapobj = backend/mailcap.o
-endif
-
-ifeq ($(CONFIG_MIMETYPES),yes)
-mimetypesobj = backend/mimetypes.o
-endif
-
 OBJS = \
  dialogs.o \
  mime.o \
- backend/common.o \
+ backend/lib.o \
- backend/default.o \
- $(mailcapobj) \
- $(mimetypesobj)
-
-all-local: libmime.a
-libmime.a: $(OBJS)
 
 include $(path_to_top)/Makefile.lib

src/mime/backend/Makefile

@@ -11,7 +11,4 @@ endif
 
 OBJS = common.o default.o $(mailcapobj) $(mimetypesobj)
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/network/Makefile

@@ -3,14 +3,11 @@ include $(path_to_top)/Makefile.config
 
 ifeq ($(CONFIG_SSL),yes)
 ssldir = ssl
-sslobj = $(ssldir)/ssl.o $(ssldir)/socket.o
+sslobj = $(ssldir)/lib.o
 endif
 
 SUBDIRS = $(ssldir)
 
 OBJS = connection.o dns.o progress.o socket.o state.o $(sslobj)
 
-all-local: libnetwork.a
-libnetwork.a: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/network/ssl/Makefile

@@ -5,7 +5,4 @@ INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS)
 
 OBJS = ssl.o socket.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/osdep/Makefile

@@ -4,27 +4,27 @@ INCLUDES += $(X_CFLAGS)
 
 ifeq ($(CONFIG_BEOS),yes)
 beosdir = beos
-beosobj = $(beosdir)/beos.o $(beosdir)/overrides.o
+beosobj = $(beosdir)/lib.o
 endif
 
 ifeq ($(CONFIG_OS2),yes)
 os2dir = os2
-os2obj = $(os2dir)/os2.o
+os2obj = $(os2dir)/lib.o
 endif
 
 ifeq ($(CONFIG_RISCOS),yes)
 riscosdir = riscos
-riscosobj = $(riscosdir)/riscos.o
+riscosobj = $(riscosdir)/lib.o
 endif
 
 ifeq ($(CONFIG_UNIX),yes)
 unixdir = unix
-unixobj = $(unixdir)/bsd.o $(unixdir)/unix.o
+unixobj = $(unixdir)/lib.o
 endif
 
 ifeq ($(CONFIG_WIN32),yes)
 win32dir = win32
-win32obj = $(win32dir)/win32.o $(win32dir)/overrides.o
+win32obj = $(win32dir)/lib.o
 endif
 
 SUBDIRS = $(beosdir) $(os2dir) $(riscosdir) $(unixdir) $(win32dir)
@@ -42,7 +42,4 @@ OBJS = \
  $(unixobj) \
  $(win32obj)
 
-all-local: libosdep.a
-libosdep.a: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/osdep/beos/Makefile

@@ -3,7 +3,4 @@ include $(path_to_top)/Makefile.config
 
 OBJS = beos.o overrides.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/osdep/os2/Makefile

@@ -3,7 +3,4 @@ include $(path_to_top)/Makefile.config
 
 OBJS = os2.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/osdep/riscos/Makefile

@@ -3,7 +3,4 @@ include $(path_to_top)/Makefile.config
 
 OBJS = riscos.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/osdep/unix/Makefile

@@ -3,7 +3,4 @@ include $(path_to_top)/Makefile.config
 
 OBJS = unix.o bsd.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/osdep/win32/Makefile

@@ -3,7 +3,4 @@ include $(path_to_top)/Makefile.config
 
 OBJS = win32.o overrides.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/protocol/Makefile

@@ -1,62 +1,49 @@
 path_to_top=../..
 include $(path_to_top)/Makefile.config
 
-authobj = auth/auth.o auth/dialogs.o auth/digest.o
+authobj = auth/lib.o
-
-ifeq ($(CONFIG_CGI),yes)
-cgiobj = file/cgi.o
-endif
 
 ifeq ($(CONFIG_BITTORRENT),yes)
 bittorrentdir = bittorrent
-bittorrentobj = \
+bittorrentobj = $(bittorrentdir)/lib.o
- $(bittorrentdir)/bencoding.o \
- $(bittorrentdir)/bittorrent.o \
- $(bittorrentdir)/common.o \
- $(bittorrentdir)/connection.o \
- $(bittorrentdir)/dialogs.o \
- $(bittorrentdir)/peerconnect.o \
- $(bittorrentdir)/peerwire.o \
- $(bittorrentdir)/piececache.o \
- $(bittorrentdir)/tracker.o
 endif
 
 ifeq ($(CONFIG_DATA),yes)
 dataobj = data.o
 endif
 
-fileobj = file/file.o
+fileobj = file/lib.o
 
 ifeq ($(CONFIG_FINGER),yes)
 fingerdir = finger
-fingerobj = $(fingerdir)/finger.o
+fingerobj = $(fingerdir)/lib.o
 endif
 
 ifeq ($(CONFIG_FTP),yes)
 ftpdir = ftp
-ftpobj = $(ftpdir)/ftp.o $(ftpdir)/parse.o 
+ftpobj = $(ftpdir)/lib.o
 endif
 
 ifeq ($(CONFIG_GOPHER),yes)
 gopherdir = gopher
-gopherobj = $(gopherdir)/gopher.o
+gopherobj = $(gopherdir)/lib.o
 endif
 
-httpobj = http/blacklist.o http/codes.o http/http.o
+httpobj = http/lib.o
 
 ifeq ($(CONFIG_NNTP),yes)
 nntpdir = nntp
-nntpobj = $(nntpdir)/connection.o $(nntpdir)/nntp.o $(nntpdir)/response.o
+nntpobj = $(nntpdir)/lib.o
 endif
 
 ifeq ($(CONFIG_SMB),yes)
 smbdir = smb
-smbobj = $(smbdir)/smb.o
+smbobj = $(smbdir)/lib.o
 endif
 
 ifeq ($(CONFIG_URI_REWRITE),yes)
 rewritedir = rewrite
-rewriteobj = $(rewritedir)/rewrite.o
+rewriteobj = $(rewritedir)/lib.o
 endif
 
 SUBDIRS = \
@@ -84,9 +71,7 @@ SUB_OBJS = \
  $(nntpobj) \
  $(rewriteobj) \
  $(smbobj)
+
 OBJS = about.o date.o header.o protocol.o proxy.o uri.o user.o $(SUB_OBJS)
 
-all-local: libprotocol.a
-libprotocol.a: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/protocol/auth/Makefile

@@ -6,7 +6,4 @@ INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS)
 
 OBJS = auth.o dialogs.o digest.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/protocol/bittorrent/Makefile

@@ -5,7 +5,4 @@ INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS)
 
 OBJS = bencoding.o bittorrent.o common.o connection.o dialogs.o peerconnect.o peerwire.o piececache.o tracker.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/protocol/file/Makefile

@@ -7,7 +7,4 @@ endif
 
 OBJS = file.o $(cgiobj)
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/protocol/finger/Makefile

@@ -3,7 +3,4 @@ include $(path_to_top)/Makefile.config
 
 OBJS = finger.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/protocol/ftp/Makefile

@@ -3,7 +3,4 @@ include $(path_to_top)/Makefile.config
 
 OBJS = ftp.o parse.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/protocol/gopher/Makefile

@@ -3,7 +3,4 @@ include $(path_to_top)/Makefile.config
 
 OBJS = gopher.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/protocol/http/Makefile

@@ -3,7 +3,4 @@ include $(path_to_top)/Makefile.config
 
 OBJS = blacklist.o codes.o http.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/protocol/nntp/Makefile

@@ -3,7 +3,4 @@ include $(path_to_top)/Makefile.config
 
 OBJS = nntp.o connection.o response.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/protocol/rewrite/Makefile

@@ -3,7 +3,4 @@ include $(path_to_top)/Makefile.config
 
 OBJS = rewrite.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/protocol/smb/Makefile

@@ -3,7 +3,4 @@ include $(path_to_top)/Makefile.config
 
 OBJS = smb.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/scripting/Makefile

@@ -3,34 +3,31 @@ include $(path_to_top)/Makefile.config
 
 ifeq ($(CONFIG_GUILE),yes)
 guiledir = guile
-guileobj = $(guiledir)/core.o $(guiledir)/guile.o $(guiledir)/hooks.o
+guileobj = $(guiledir)/lib.o
 endif
 
 ifeq ($(CONFIG_LUA),yes)
 luadir = lua
-luaobj = $(luadir)/core.o $(luadir)/hooks.o $(luadir)/lua.o
+luaobj = $(luadir)/lib.o
 endif
 
 ifeq ($(CONFIG_PERL),yes)
 perldir = perl
-perlobj = $(perldir)/core.o $(perldir)/hooks.o $(perldir)/perl.o
+perlobj = $(perldir)/lib.o
 endif
 
 ifeq ($(CONFIG_PYTHON),yes)
 pythondir = python
-pythonobj = $(pythondir)/core.o $(pythondir)/hooks.o $(pythondir)/python.o
+pythonobj = $(pythondir)/lib.o
 endif
 
 ifeq ($(CONFIG_RUBY),yes)
 rubydir = ruby
-rubyobj = $(rubydir)/core.o $(rubydir)/hooks.o $(rubydir)/ruby.o
+rubyobj = $(rubydir)/lib.o
 endif
 
 SUBDIRS = $(guiledir) $(luadir) $(perldir) $(pythondir) $(rubydir)
 
 OBJS = scripting.o $(guileobj) $(luaobj) $(perlobj) $(pythonobj) $(rubyobj)
 
-all-local: libscripting.a
-libscripting.a: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/scripting/guile/Makefile

@@ -5,7 +5,4 @@ INCLUDES += $(GUILE_CFLAGS)
 
 OBJS = guile.o hooks.o core.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/scripting/lua/Makefile

@@ -5,7 +5,4 @@ INCLUDES += $(LUA_CFLAGS)
 
 OBJS = lua.o hooks.o core.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/scripting/perl/Makefile

@@ -5,7 +5,4 @@ INCLUDES += $(PERL_CFLAGS)
 
 OBJS = perl.o hooks.o core.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/scripting/python/Makefile

@@ -5,7 +5,4 @@ INCLUDES += $(PYTHON_CFLAGS)
 
 OBJS = python.o hooks.o core.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/scripting/ruby/Makefile

@@ -5,7 +5,4 @@ INCLUDES += $(RUBY_CFLAGS)
 
 OBJS = ruby.o hooks.o core.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/session/Makefile

@@ -3,7 +3,4 @@ include $(path_to_top)/Makefile.config
 
 OBJS = download.o history.o location.o session.o task.o
 
-all-local: libsession.a
-libsession.a: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/terminal/Makefile

@@ -17,7 +17,4 @@ OBJS = \
  terminal.o \
  window.o
 
-all-local: libterminal.a
-libterminal.a: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/util/Makefile

@@ -46,7 +46,4 @@ OBJS = \
  $(scannerobj) \
  $(sha1obj)
 
-all-local: libutil.a
-libutil.a: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/viewer/Makefile

@@ -3,24 +3,10 @@ include $(path_to_top)/Makefile.config
 
 SUBDIRS = dump text
 
-ifeq ($(CONFIG_MARKS),yes)
-marksobj = text/marks.o
-endif
-
 OBJS = \
  action.o \
  timer.o \
- dump/dump.o \
+ dump/lib.o \
- text/draw.o \
+ text/lib.o
- text/form.o \
- text/link.o \
- $(marksobj) \
- text/search.o \
- text/textarea.o \
- text/view.o \
- text/vs.o
-
-all-local: libviewer.a
-libviewer.a: $(OBJS)
 
 include $(path_to_top)/Makefile.lib

src/viewer/dump/Makefile

@@ -3,7 +3,4 @@ include $(path_to_top)/Makefile.config
 
 OBJS = dump.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib

src/viewer/text/Makefile

@@ -7,7 +7,4 @@ endif
 
 OBJS = draw.o form.o link.o $(marksobj) search.o textarea.o view.o vs.o
 
-# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
-all-local: $(OBJS)
-
 include $(path_to_top)/Makefile.lib