From 1de6b09fbdb314bac445f3a97aef83956c128c4a Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 23 Mar 2010 02:09:26 +0100 Subject: [PATCH] Update dll export for autoconf (to stay in sync with cmake). --- bus/Makefile.am | 8 ++++++-- dbus/Makefile.am | 38 +++++++------------------------------- test/Makefile.am | 2 ++ test/name-test/Makefile.am | 1 + 4 files changed, 16 insertions(+), 33 deletions(-) diff --git a/bus/Makefile.am b/bus/Makefile.am index c44fe6a78..1fe7c8f6d 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -76,6 +76,7 @@ dbus_daemon_SOURCES= \ $(BUS_SOURCES) \ main.c +dbus_daemon_CPPFLAGS = -DDBUS_STATIC_BUILD dbus_daemon_LDADD= \ $(top_builddir)/dbus/libdbus-convenience.la \ $(EFENCE) \ @@ -102,6 +103,7 @@ dbus_daemon_launch_helper_SOURCES= \ activation-helper-bin.c \ $(LAUNCH_HELPER_SOURCES) +dbus_daemon_launch_helper_CPPFLAGS = -DDBUS_STATIC_BUILD dbus_daemon_launch_helper_LDADD= \ $(top_builddir)/dbus/libdbus-convenience.la \ $(DBUS_LAUNCHER_LIBS) @@ -119,7 +121,7 @@ dbus_daemon_launch_helper_test_LDADD= \ $(DBUS_LAUNCHER_LIBS) dbus_daemon_launch_helper_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ -dbus_daemon_launch_helper_test_CPPFLAGS= \ +dbus_daemon_launch_helper_test_CPPFLAGS= -DDBUS_STATIC_BUILD \ -DACTIVATION_LAUNCHER_TEST ## we build yet another binary so we can do the OOM tests @@ -133,7 +135,7 @@ bus_test_launch_helper_LDADD= \ $(DBUS_LAUNCHER_LIBS) bus_test_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ -bus_test_launch_helper_CPPFLAGS= \ +bus_test_launch_helper_CPPFLAGS= -DDBUS_STATIC_BUILD \ -DACTIVATION_LAUNCHER_TEST \ -DACTIVATION_LAUNCHER_DO_OOM @@ -173,6 +175,7 @@ bus_test_system_SOURCES= \ utils.h \ test-system.c +bus_test_system_CPPFLAGS = -DDBUS_STATIC_BUILD bus_test_system_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_BUS_LIBS) bus_test_system_LDFLAGS=@R_DYNAMIC_LDFLAG@ @@ -180,6 +183,7 @@ bus_test_SOURCES= \ $(BUS_SOURCES) \ test-main.c +bus_test_CPPFLAGS = -DDBUS_STATIC_BUILD bus_test_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_BUS_LIBS) bus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ diff --git a/dbus/Makefile.am b/dbus/Makefile.am index 21490f954..5176bf661 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -16,17 +16,7 @@ lib_LTLIBRARIES=libdbus-1.la # if DBUS_WIN -built_sources_sys = dbus-1.def dbus-convenience.def - -# Note that -P suppresses line markers. -PREPROCESS = $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) -P -dbus-1.def: $(srcdir)/dbus-1.def.pre - $(PREPROCESS) - < $< > $@ - -dbus-convenience.def: $(srcdir)/dbus-convenience.def.pre - $(PREPROCESS) - < $< > $@ - -SUFFIXES = rc pre +SUFFIXES = rc .rc.o: $(WINDRES) $< -o $@ @@ -34,25 +24,13 @@ SUFFIXES = rc pre dbus_res = versioninfo.o dbus_res_ldflag = -Wl,$(dbus_res) no_undefined = -no-undefined +export_symbols = +export_symvols_convenience = - -### FIXME use the .def.in files depending on the current config -### or combine them in a single .def file as done in the cmake build -export_symbols = -export-symbols dbus-1.def -export_symbols_convenience = -export-symbols dbus-convenience.def - -install-def-file: - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - $(INSTALL) dbus-1.def $(DESTDIR)$(libdir)/dbus-1.def - -uninstall-def-file: - -rm $(DESTDIR)$(libdir)/dbus-1.def - -libdbus_1_la_DEPENDENCIES = $(dbus_res) dbus-1.def +libdbus_1_la_DEPENDENCIES = $(dbus_res) intllibs = else -built_sources_sys = dbus_res = dbus_res_ldflag = no_undefined = @@ -259,11 +237,8 @@ libdbus_convenience_la_SOURCES= \ $(DBUS_SHARED_SOURCES) \ $(DBUS_UTIL_SOURCES) -symbol_defs = dbus-1.def.pre dbus-1-symbols.def.in dbus-1-testsymbols.def.in dbus-1-verbosesymbols.def.in \ - dbus-convenience.def.pre dbus-internal-symbols.def.in dbus-internal-testsymbols.def.in - -BUILT_SOURCES=$(dbusarchinclude_HEADERS) $(built_sources_sys) -EXTRA_DIST=dbus-arch-deps.h.in $(symbol_defs) +BUILT_SOURCES=$(dbusarchinclude_HEADERS) +EXTRA_DIST=dbus-arch-deps.h.in ## this library is the same as libdbus, but exports all the symbols @@ -274,6 +249,7 @@ libdbus_1_la_CPPFLAGS= -Ddbus_1_EXPORTS libdbus_1_la_LIBADD= $(DBUS_CLIENT_LIBS) libdbus_1_la_LDFLAGS= $(export_symbols) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined @R_DYNAMIC_LDFLAG@ @PIC_LDFLAGS@ +libdbus_convenience_la_CPPFLAGS = -DDBUS_STATIC_BUILD libdbus_convenience_la_LIBADD=$(DBUS_CLIENT_LIBS) libdbus_convenience_la_LDFLAGS=$(export_symbols_convenience) @R_DYNAMIC_LDFLAG@ diff --git a/test/Makefile.am b/test/Makefile.am index ead399b63..2f9a90c9b 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -61,6 +61,8 @@ test_sleep_forever_SOURCES = \ decode_gcov_SOURCES= \ decode-gcov.c +# When any programs are not linked to libdbus-convenience, fix this. +AM_CPPFLAGS=-DDBUS_STATIC_BUILD TEST_LIBS=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_TEST_LIBS) test_service_LDADD=libdbus-testutils.la $(TEST_LIBS) diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index 9a508a126..fa8c5fedd 100644 --- a/test/name-test/Makefile.am +++ b/test/name-test/Makefile.am @@ -18,6 +18,7 @@ if DBUS_BUILD_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 +AM_CPPFLAGS = -DDBUS_STATIC_BUILD test_pending_call_dispatch_SOURCES = \ test-pending-call-dispatch.c -- 2.47.3