diff options
| author | Simon McVittie <smcv@debian.org> | 2018-01-22 16:53:50 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2018-01-22 18:27:20 +0000 |
| commit | b031d671abde479facccd9da2e08e33922c9fc74 (patch) | |
| tree | d099243faa0697755ad8a6e78abdd1c835c6d9fc | |
| parent | b6f7c810cf97914b6b90836f3d59ea256f318bcb (diff) | |
| download | dbus-glib-b031d671abde479facccd9da2e08e33922c9fc74.tar.gz | |
Build libdbus-gmain into a separate convenience library
Signed-off-by: Simon McVittie <smcv@debian.org>
| -rw-r--r-- | dbus/Makefile.am | 11 | ||||
| -rw-r--r-- | test/core/Makefile.am | 20 |
2 files changed, 30 insertions, 1 deletions
diff --git a/dbus/Makefile.am b/dbus/Makefile.am index ae56918..2c1a79e 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -10,6 +10,7 @@ AM_CPPFLAGS = \ -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" lib_LTLIBRARIES=libdbus-glib-1.la +noinst_LTLIBRARIES = libdbus-gmain.la CLEANFILES = $(BUILT_SOURCES) @@ -24,6 +25,11 @@ DBUS_GLIB_INTERNALS = \ dbus-gvalue-utils.c \ dbus-gvalue-utils.h +libdbus_gmain_la_SOURCES = \ + dbus-gmain.c \ + dbus-gmain.h \ + $(NULL) + libdbus_glib_1_la_SOURCES = \ dbus-glib.c \ dbus-gmain.c \ @@ -55,8 +61,11 @@ libdbus_glib_1_la_LIBADD= $(DBUS_LIBS) $(DBUS_GLIB_LIBS) ## convention for internal symbols) libdbus_glib_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined +libdbus_gmain_la_LIBADD = $(DBUS_LIBS) $(DBUS_GLIB_LIBS) +libdbus_gmain_la_LDFLAGS = -no-undefined + # convenience lib used here and by dbus-viewer -noinst_LTLIBRARIES=libdbus-gtool.la +noinst_LTLIBRARIES += libdbus-gtool.la libdbus_gtool_la_SOURCES = $(DBUS_GLIB_INTERNALS) \ dbus-gidl.c \ diff --git a/test/core/Makefile.am b/test/core/Makefile.am index d1be953..096e327 100644 --- a/test/core/Makefile.am +++ b/test/core/Makefile.am @@ -60,10 +60,24 @@ THREAD_APPS=test-thread-server test-thread-client test-profile test_thread_server_SOURCES= \ test-thread-server.c \ test-thread.h +test_thread_server_LDADD = \ + $(DBUS_GLIB_THREADS_LIBS) \ + $(DBUS_GLIB_LIBS) \ + $(DBUS_LIBS) \ + $(top_builddir)/dbus/libdbus-gmain.la \ + $(top_builddir)/test/lib/libtest.la \ + $(NULL) test_thread_client_SOURCES= \ test-thread-client.c \ test-thread.h +test_thread_client_LDADD = \ + $(DBUS_GLIB_THREADS_LIBS) \ + $(DBUS_GLIB_LIBS) \ + $(DBUS_LIBS) \ + $(top_builddir)/dbus/libdbus-gmain.la \ + $(top_builddir)/test/lib/libtest.la \ + $(NULL) ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we ## build even when not doing "make check" @@ -97,6 +111,12 @@ manual_test_invalid_usage_SOURCES = \ test_30574_SOURCES = \ 30574.c +test_30574_LDADD = \ + $(DBUS_GLIB_LIBS) \ + $(DBUS_LIBS) \ + $(top_builddir)/dbus/libdbus-gmain.la \ + $(top_builddir)/test/lib/libtest.la \ + $(NULL) test_private_SOURCES = \ my-object.c \ |