diff options
| author | Bertrand SIMONNET <bsimonnet@chromium.org> | 2014-08-20 15:43:23 -0700 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-20 20:49:45 +0000 |
| commit | 57696a2e8a5eb2df3177f5b52c512a14f3cab1f5 (patch) | |
| tree | 01646dc540fc6d36b4d5e00a1bce6d42564b3a30 /test | |
| parent | 7d214f4d5855c43a7aa0bec385d93e4a67a09f5f (diff) | |
| download | dbus-57696a2e8a5eb2df3177f5b52c512a14f3cab1f5.tar.gz | |
Link dbus-daemon and dbus-daemon-lauch-helper against libdbus
The shared can be used by dbus-daemon and dbus-daemon-launch-helper by exporting
the private symbols needed, reducing the size of dbus by about 500k.
The private symbols are exposed under the version
LIBDBUS_PRIVATE_@VERSION_NUMBER@.
[Altered by Simon McVittie and Ralf Habacker to clear up some
problematic linking.]
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83115
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 31 | ||||
| -rw-r--r-- | test/name-test/Makefile.am | 10 |
2 files changed, 7 insertions, 34 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 92fbdefb..723d7767 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -4,23 +4,15 @@ SUBDIRS= . name-test DIST_SUBDIRS=name-test -# CPPFLAGS for binaries that are normally dynamic AM_CPPFLAGS = \ -I$(top_srcdir) \ - $(DBUS_STATIC_BUILD_CPPFLAGS) \ + -DDBUS_COMPILATION \ $(GLIB_CFLAGS) \ $(NULL) # improve backtraces from test stuff AM_LDFLAGS = @R_DYNAMIC_LDFLAG@ -# CPPFLAGS for binaries that are always static -static_cppflags = \ - $(AM_CPPFLAGS) \ - -DDBUS_STATIC_BUILD \ - -DDBUS_COMPILATION \ - $(NULL) - noinst_LTLIBRARIES = libdbus-testutils.la libdbus_testutils_la_SOURCES = \ @@ -35,13 +27,11 @@ libdbus_testutils_la_SOURCES += \ $(NULL) endif -testutils_shared_if_possible_cppflags = $(static_cppflags) +testutils_shared_if_possible_cppflags = $(AM_CPPFLAGS) testutils_shared_if_possible_libs = libdbus-testutils.la -libdbus_testutils_la_CPPFLAGS = \ - $(static_cppflags) \ - $(NULL) libdbus_testutils_la_LIBADD = \ + $(top_builddir)/dbus/libdbus-1.la \ $(top_builddir)/dbus/libdbus-internal.la \ $(NULL) @@ -80,43 +70,31 @@ endif !DBUS_ENABLE_EMBEDDED_TESTS noinst_PROGRAMS= $(TEST_BINARIES) -test_service_CPPFLAGS = $(static_cppflags) test_service_LDADD = libdbus-testutils.la -test_names_CPPFLAGS = $(static_cppflags) test_names_LDADD = libdbus-testutils.la -## break_loader_CPPFLAGS = $(static_cppflags) ## break_loader_LDADD = $(top_builddir)/dbus/libdbus-internal.la -test_shell_service_CPPFLAGS = $(static_cppflags) test_shell_service_LDADD = libdbus-testutils.la test_shell_SOURCES = shell-test.c -test_shell_CPPFLAGS = $(static_cppflags) test_shell_LDADD = libdbus-testutils.la test_spawn_SOURCES = spawn-test.c -test_spawn_CPPFLAGS = $(static_cppflags) test_spawn_LDADD = $(top_builddir)/dbus/libdbus-internal.la test_printf_SOURCES = internals/printf.c -test_printf_CPPFLAGS = $(static_cppflags) test_printf_LDADD = $(top_builddir)/dbus/libdbus-internal.la test_refs_SOURCES = internals/refs.c -test_refs_CPPFLAGS = $(static_cppflags) test_refs_LDADD = libdbus-testutils.la $(GLIB_LIBS) test_syslog_SOURCES = internals/syslog.c -test_syslog_CPPFLAGS = $(static_cppflags) test_syslog_LDADD = libdbus-testutils.la $(GLIB_LIBS) manual_dir_iter_SOURCES = manual-dir-iter.c -manual_dir_iter_CPPFLAGS = $(static_cppflags) manual_dir_iter_LDADD = $(top_builddir)/dbus/libdbus-internal.la manual_paths_SOURCES = manual-paths.c -manual_paths_CPPFLAGS = $(static_cppflags) manual_paths_LDADD = $(top_builddir)/dbus/libdbus-internal.la manual_tcp_SOURCES = manual-tcp.c -manual_tcp_CPPFLAGS = $(static_cppflags) manual_tcp_LDADD = $(top_builddir)/dbus/libdbus-internal.la EXTRA_DIST = dbus-test-runner @@ -265,9 +243,6 @@ test_uid_permissions_LDADD = \ test_fdpass_SOURCES = \ fdpass.c \ $(NULL) -test_fdpass_CPPFLAGS = \ - $(static_cppflags) \ - $(NULL) test_fdpass_LDADD = \ libdbus-testutils.la \ $(GLIB_LIBS) \ diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index 8df98990..b28a7e86 100644 --- a/test/name-test/Makefile.am +++ b/test/name-test/Makefile.am @@ -1,8 +1,6 @@ -# Everything in this directory is statically-linked to libdbus-internal AM_CPPFLAGS = \ -I$(top_srcdir) \ -DDBUS_COMPILATION \ - -DDBUS_STATIC_BUILD \ $(NULL) # if assertions are enabled, improve backtraces @@ -34,10 +32,10 @@ if DBUS_ENABLE_EMBEDDED_TESTS ## build even when not doing "make check" noinst_PROGRAMS=test-pending-call-dispatch test-pending-call-timeout test-threads-init test-ids test-shutdown test-privserver test-privserver-client test-autolaunch -test_pending_call_dispatch_LDADD=$(top_builddir)/dbus/libdbus-internal.la -test_pending_call_timeout_LDADD=$(top_builddir)/dbus/libdbus-internal.la -test_threads_init_LDADD=$(top_builddir)/dbus/libdbus-internal.la -test_ids_LDADD=$(top_builddir)/dbus/libdbus-internal.la +test_pending_call_dispatch_LDADD=$(top_builddir)/dbus/libdbus-1.la +test_pending_call_timeout_LDADD=$(top_builddir)/dbus/libdbus-1.la +test_threads_init_LDADD=$(top_builddir)/dbus/libdbus-1.la +test_ids_LDADD=$(top_builddir)/dbus/libdbus-1.la test_shutdown_LDADD=../libdbus-testutils.la test_privserver_LDADD=../libdbus-testutils.la |