From 77bcc77c287602f8912f455311e7b99629ae25a1 Mon Sep 17 00:00:00 2001
From: Georg Hopp <georg@steffers.org>
Date: Wed, 13 Apr 2016 17:59:49 +0200
Subject: [PATCH] fix build system

---
 configure.ac    |  2 +-
 src/Makefile.am | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8cabfbb..7ab0436 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AC_INIT([taskrambler],
 LT_INIT
 AM_INIT_AUTOMAKE
 #AM_INIT_AUTOMAKE([subdir-objects])
-AM_SILENT_RULES([yes])
+AM_SILENT_RULES([no])
 AC_COPYRIGHT([Copyright © 2013 Georg Hopp])
 AC_REVISION([m4_esyscmd_s([git describe --always])])
 AC_CONFIG_SRCDIR([src/taskrambler.c])
diff --git a/src/Makefile.am b/src/Makefile.am
index 3a465d9..637dda6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,8 @@ TR = ./application/.libs/libapplication.a \
      ./config/.libs/libconfig.a \
      ./router/.libs/librouter.a
 
-TRLIBS = -ltrbase -ltrhash -ltrio -ltrdata -ltrutils -ltrhttpserver
+TRFLIBS = -ltrbase -ltrhash -ltrio -ltrdata
+TRLIBS = $(TRFLIBS) -ltrutils -ltrhttpserver
 USEDLIBS = -lrt -lssl -lcrypto -lldap -lgdbm -luuid
 
 AM_CFLAGS += -I../include/
@@ -33,13 +34,16 @@ libtrutils_la_LIBADD  =
 
 libtrhttpserver_la_SOURCES =
 libtrhttpserver_la_CFLAGS  = $(AM_CFLAGS)
-libtrhttpserver_la_LIBADD  = $(TRHTTPSERVER)
+libtrhttpserver_la_LIBADD  = $(TRHTTPSERVER) $(TRFLIBS)
 
 taskrambler_SOURCES = taskrambler.c $(IFACE) $(UTILS)
 taskrambler_CFLAGS  = $(AM_CFLAGS)
 taskrambler_LDADD   = $(TRLIBS) $(TR) $(USEDLIBS)
 taskrambler_LDFLAGS = -Wl,--export-dynamic \
-		      -Wl,--whole-archive,./application/.libs/libapplication.a,--no-whole-archive
+		      -Wl,--whole-archive \
+		      -Wl,./application/.libs/libapplication.a \
+		      -Wl,--no-whole-archive \
+		      -Wl,--as-needed
 
 SUBDIRS = asset auth http \
 	  server session application \