INN commit: branches/2.5/backends (Makefile)

[INN Commit]

    Date: Tuesday, September 23, 2014 @ 19:53:29
  Author: eagle
Revision: 9720

Re-add second $(LIBSTORAGE) when linking backends

Backend commands (such as nntpget) linked with both history
and storage libraries list $(LIBSTORAGE) in the link line twice.
This isn't a mistake; there are some unfortunate circular
dependencies that require listing $(LIBSTORAGE) both before
and after $(LIBINNHIST) in the link line or static linking will
fail.

Modified:
  branches/2.5/backends/Makefile

----------+
 Makefile |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: Makefile
===================================================================
--- Makefile	2014-09-22 19:19:40 UTC (rev 9719)
+++ Makefile	2014-09-24 02:53:29 UTC (rev 9720)
@@ -71,7 +71,9 @@
 
 ##  Compilation rules.
 
-BOTH		= $(LIBSTORAGE) $(LIBHIST) $(LIBINN)
+# $(LIBSTORAGE) must be listed twice to resolve circular dependencies
+# when doing static linking.
+BOTH		= $(LIBSTORAGE) $(LIBHIST) $(LIBSTORAGE) $(LIBINN)
 
 LINK 		= $(LIBLD) $(LDFLAGS) -o $@
 INNLIBS		= $(LIBINN) $(LIBS)