http://old.nabble.com/relinking-error-td27796838.html
Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
lib/Makefile.am | 91 +++++++++++++++++++++++++++++++------------------------
1 files changed, 51 insertions(+), 40 deletions(-)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 90c6248..e4356fc 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -23,9 +23,9 @@ MAINTAINERCLEANFILES = Makefile.in
noinst_HEADERS = ipc_int.h util_int.h
-#pkgconfigdir = $(libdir)/pkgconfig
-#pkgconfig_DATA = libqbhash.pc
-#libqbhash_la_LIBADD =
+lib_LIBRARIES = libqbplugin.a
+
+libqbplugin_a_SOURCES = plugin_loader.c
#
# Here are a set of rules to help you update your library version information:
@@ -38,52 +38,63 @@ noinst_HEADERS = ipc_int.h util_int.h
# If any interfaces have been removed since the last public release, then set age to 0.
#
-lib_LTLIBRARIES = libqbhash.la libqbpoll.la libqbtimer.la libqblogsys.la \
- libqbtsafe.la libqbwthread.la libqbipcc.la libqbipcs.la \
- libqbutil.la
-
-lib_LIBRARIES = libqbplugin.a
-
-libqbplugin_a_SOURCES = plugin_loader.c
+lib_LTLIBRARIES = libqbutil.la libqbtsafe.la
+# make sure libraries that use libqbutil are listed below.
+lib_LTLIBRARIES += libqbhash.la libqbpoll.la libqbtimer.la libqblogsys.la
+lib_LTLIBRARIES += libqbwthread.la libqbipcc.la libqbipcs.la
libqbutil_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
libqbutil_la_LDFLAGS = -version-info 0:0:0
libqbutil_la_SOURCES = util.c
-libqbhash_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-libqbhash_la_LDFLAGS = -version-info 0:0:0
-libqbhash_la_SOURCES = hash.c
-libqbhash_la_LIBADD = libqbutil.la
-
-libqbpoll_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-libqbpoll_la_LDFLAGS = -version-info 0:0:0
-libqbpoll_la_SOURCES = poll.c
-libqbpoll_la_LIBADD = libqbutil.la
-
-libqbtimer_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-libqbtimer_la_LDFLAGS = -version-info 0:0:0
-libqbtimer_la_SOURCES = timer.c
-
-libqblogsys_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-libqblogsys_la_LDFLAGS = -version-info 0:0:0
-libqblogsys_la_SOURCES = logsys.c
-
libqbtsafe_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
libqbtsafe_la_LDFLAGS = -version-info 0:0:0
libqbtsafe_la_SOURCES = tsafe.c
-libqbwthread_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-libqbwthread_la_LDFLAGS = -version-info 0:0:0
-libqbwthread_la_SOURCES = wthread.c
-libqbwthread_la_LIBADD = libqbutil.la
-libqbipcc_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-libqbipcc_la_LDFLAGS = -version-info 0:0:0
-libqbipcc_la_SOURCES = ipcc.c
-libqbipcc_la_LIBADD = libqbutil.la
+#
+# libs dependant on qbutil
+#
-libqbipcs_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-libqbipcs_la_LDFLAGS = -version-info 0:0:0
-libqbipcs_la_SOURCES = ipcs.c
-libqbipcs_la_LIBADD = libqbutil.la
+libqbhash_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
+libqbhash_la_LDFLAGS = -version-info 0:0:0
+libqbhash_la_SOURCES = hash.c
+libqbhash_la_LIBADD = libqbutil.la
+libqbhash_la_DEPENDENCIES = libqbutil.la
+
+libqbpoll_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
+libqbpoll_la_LDFLAGS = -version-info 0:0:0
+libqbpoll_la_SOURCES = poll.c
+libqbpoll_la_LIBADD = libqbutil.la
+libqbpoll_la_DEPENDENCIES = libqbutil.la
+
+libqbtimer_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
+libqbtimer_la_LDFLAGS = -version-info 0:0:0
+libqbtimer_la_SOURCES = timer.c
+libqbtimer_la_LIBADD = libqbutil.la
+libqbtimer_la_DEPENDENCIES = libqbutil.la
+
+libqbwthread_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
+libqbwthread_la_LDFLAGS = -version-info 0:0:0
+libqbwthread_la_SOURCES = wthread.c
+libqbwthread_la_LIBADD = libqbutil.la
+libqbwthread_la_DEPENDENCIES = libqbutil.la
+
+libqbipcc_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
+libqbipcc_la_LDFLAGS = -version-info 0:0:0
+libqbipcc_la_SOURCES = ipcc.c
+libqbipcc_la_LIBADD = libqbutil.la
+libqbipcc_la_DEPENDENCIES = libqbutil.la
+
+libqbipcs_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
+libqbipcs_la_LDFLAGS = -version-info 0:0:0
+libqbipcs_la_SOURCES = ipcs.c
+libqbipcs_la_LIBADD = libqbutil.la
+libqbipcs_la_DEPENDENCIES = libqbutil.la
+
+libqblogsys_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
+libqblogsys_la_LDFLAGS = -version-info 0:0:0
+libqblogsys_la_SOURCES = logsys.c
+libqblogsys_la_LIBADD = libqbutil.la
+libqblogsys_la_DEPENDENCIES = libqbutil.la
--
1.6.6.1