- link libraries at correct place

diff --git a/client/Makefile.am b/client/Makefile.am
index d6c033240c19fcb3f43b3519f3d00822734311ea..5cc1ca66dbc7a25d0a95981cea9b181ac2c9a34b 100644 (file)
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -15,6 +15,5 @@ snapper_SOURCES =                     \
        commands.cc     commands.h      \
        cleanup.cc      cleanup.h
 
-snapper_LDADD = ../snapper/libsnapper.la utils/libutils.la ../dbus/libdbus.la  \
-       -ldbus-1 -lboost_thread-mt
+snapper_LDADD = ../snapper/libsnapper.la utils/libutils.la ../dbus/libdbus.la
 

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index bec1acdc07b91a9c910a5a0ddf8117d8d7916da3..0e8cc52514f7f9043a7c0e76eceaf044fbf689bc 100644 (file)
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Makefile.am for snapper/utils/dbus
+# Makefile.am for snapper/dbus
 #
 
 INCLUDES = -I$(top_srcdir) -I/usr/include/dbus-1.0 -I$(libdir)/dbus-1.0/include
@@ -10,3 +10,6 @@ libdbus_la_SOURCES =                                  \
        DBusMessage.cc          DBusMessage.h           \
        DBusConnection.cc       DBusConnection.h        \
        DBusMainLoop.cc         DBusMainLoop.h
+
+libdbus_la_LIBADD = -ldbus-1
+

diff --git a/examples/Makefile.am b/examples/Makefile.am
index ca51334977e2927c1a9f77188b5f844f5966029e..f0fe1b809c44caedd5c9f7478ef732c465051376 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -4,7 +4,7 @@
 
 INCLUDES = -I$(top_srcdir)
 
-LDADD = ../snapper/libsnapper.la -lboost_thread-mt
+LDADD = ../snapper/libsnapper.la
 
 noinst_PROGRAMS = List ListAll Create CmpDirs CreateTimeline SnapTest
 

diff --git a/server/Makefile.am b/server/Makefile.am
index 8faab9355c76d02f6921164f812d588e12a575a6..4d4b994024c2a2b197a9e9e16de3482de6a945b6 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -14,6 +14,5 @@ snapperd_SOURCES =                                    \
        Background.cc           Background.h            \
        Types.cc                Types.h
 
-snapperd_LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la   \
-       -ldbus-1 -lboost_thread-mt -lrt
+snapperd_LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lrt
 

diff --git a/snapper/Makefile.am b/snapper/Makefile.am
index 55bf74166f0a8fd8fe24816db6610a25488abae4..943b51bef8cd9db662a95cc02e5ad5cea80a8ad6 100644 (file)
--- a/snapper/Makefile.am
+++ b/snapper/Makefile.am
@@ -31,7 +31,7 @@ libsnapper_la_SOURCES =                                       \
        SnapperDefines.h
 
 libsnapper_la_LDFLAGS = -version-info @LIBVERSION_INFO@
-libsnapper_la_LIBADD = -lxml2 -lz -lm
+libsnapper_la_LIBADD = -lboost_thread-mt -lxml2 -lz -lm
 
 pkgincludedir = $(includedir)/snapper
 

diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am
index 6221a7ae74442c0ee445b6216875e85cf8e1af9c..be44b3d08c35a1666d133dc043c747fea38dccaf 100644 (file)
--- a/testsuite-real/Makefile.am
+++ b/testsuite-real/Makefile.am
@@ -6,7 +6,7 @@ CXXFLAGS += -std=gnu++0x
 
 INCLUDES = -I$(top_srcdir)
 
-LDADD = ../snapper/libsnapper.la -lboost_thread-mt
+LDADD = ../snapper/libsnapper.la
 
 noinst_SCRIPTS = run-all