From ca7b8112c91f55f0a4b908e55854320b434d8f1f Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 23 Mar 2010 09:21:48 +0100 Subject: [PATCH] Renamed libdbus-convenience to libdbus-internal for automake (to stay in sync with cmake). --- bus/Makefile.am | 12 ++++++------ dbus/Makefile.am | 16 ++++++++-------- test/Makefile.am | 4 ++-- test/name-test/Makefile.am | 14 +++++++------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/bus/Makefile.am b/bus/Makefile.am index 1fe7c8f..31db351 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -78,7 +78,7 @@ dbus_daemon_SOURCES= \ dbus_daemon_CPPFLAGS = -DDBUS_STATIC_BUILD dbus_daemon_LDADD= \ - $(top_builddir)/dbus/libdbus-convenience.la \ + $(top_builddir)/dbus/libdbus-internal.la \ $(EFENCE) \ $(DBUS_BUS_LIBS) @@ -105,7 +105,7 @@ dbus_daemon_launch_helper_SOURCES= \ dbus_daemon_launch_helper_CPPFLAGS = -DDBUS_STATIC_BUILD dbus_daemon_launch_helper_LDADD= \ - $(top_builddir)/dbus/libdbus-convenience.la \ + $(top_builddir)/dbus/libdbus-internal.la \ $(DBUS_LAUNCHER_LIBS) dbus_daemon_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @@ -117,7 +117,7 @@ dbus_daemon_launch_helper_test_SOURCES= \ $(LAUNCH_HELPER_SOURCES) dbus_daemon_launch_helper_test_LDADD= \ - $(top_builddir)/dbus/libdbus-convenience.la \ + $(top_builddir)/dbus/libdbus-internal.la \ $(DBUS_LAUNCHER_LIBS) dbus_daemon_launch_helper_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @@ -131,7 +131,7 @@ bus_test_launch_helper_SOURCES= \ $(LAUNCH_HELPER_SOURCES) bus_test_launch_helper_LDADD= \ - $(top_builddir)/dbus/libdbus-convenience.la \ + $(top_builddir)/dbus/libdbus-internal.la \ $(DBUS_LAUNCHER_LIBS) bus_test_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @@ -176,7 +176,7 @@ bus_test_system_SOURCES= \ 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_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_BUS_LIBS) bus_test_system_LDFLAGS=@R_DYNAMIC_LDFLAG@ bus_test_SOURCES= \ @@ -184,7 +184,7 @@ bus_test_SOURCES= \ test-main.c bus_test_CPPFLAGS = -DDBUS_STATIC_BUILD -bus_test_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_BUS_LIBS) +bus_test_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_BUS_LIBS) bus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ ## mop up the gcov files diff --git a/dbus/Makefile.am b/dbus/Makefile.am index 5176bf6..48ec34f 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -25,7 +25,7 @@ dbus_res = versioninfo.o dbus_res_ldflag = -Wl,$(dbus_res) no_undefined = -no-undefined export_symbols = -export_symvols_convenience = +export_symvols_internal = libdbus_1_la_DEPENDENCIES = $(dbus_res) intllibs = @@ -37,7 +37,7 @@ no_undefined = ## don't export symbols that start with "_" (we use this ## convention for internal symbols) export_symbols = -export-symbols-regex "^[^_].*" -export_symbols_convenience = +export_symbols_internal = install-def-file: uninstall-def-file: @@ -232,7 +232,7 @@ libdbus_1_la_SOURCES= \ $(DBUS_LIB_SOURCES) \ $(DBUS_SHARED_SOURCES) -libdbus_convenience_la_SOURCES= \ +libdbus_internal_la_SOURCES= \ $(DBUS_LIB_SOURCES) \ $(DBUS_SHARED_SOURCES) \ $(DBUS_UTIL_SOURCES) @@ -243,15 +243,15 @@ EXTRA_DIST=dbus-arch-deps.h.in ## this library is the same as libdbus, but exports all the symbols ## and is only used for static linking within the dbus package. -noinst_LTLIBRARIES=libdbus-convenience.la +noinst_LTLIBRARIES=libdbus-internal.la 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@ +libdbus_internal_la_CPPFLAGS = -DDBUS_STATIC_BUILD +libdbus_internal_la_LIBADD=$(DBUS_CLIENT_LIBS) +libdbus_internal_la_LDFLAGS=$(export_symbols_internal) @R_DYNAMIC_LDFLAG@ ## note that TESTS has special meaning (stuff to use in make check) ## so if adding tests not to be run in make check, don't add them to @@ -270,7 +270,7 @@ noinst_PROGRAMS=$(TESTS) dbus_test_SOURCES= \ dbus-test-main.c -dbus_test_LDADD=libdbus-convenience.la $(DBUS_TEST_LIBS) +dbus_test_LDADD=libdbus-internal.la $(DBUS_TEST_LIBS) dbus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ install-data-local: install-def-file diff --git a/test/Makefile.am b/test/Makefile.am index 2f9a90c..ec0b9d8 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -61,9 +61,9 @@ test_sleep_forever_SOURCES = \ decode_gcov_SOURCES= \ decode-gcov.c -# When any programs are not linked to libdbus-convenience, fix this. +# When any programs are not linked to libdbus-internal, fix this. AM_CPPFLAGS=-DDBUS_STATIC_BUILD -TEST_LIBS=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_TEST_LIBS) +TEST_LIBS=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS) test_service_LDADD=libdbus-testutils.la $(TEST_LIBS) test_service_LDFLAGS=@R_DYNAMIC_LDFLAG@ diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index fa8c5fe..11dc56d 100644 --- a/test/name-test/Makefile.am +++ b/test/name-test/Makefile.am @@ -22,46 +22,46 @@ AM_CPPFLAGS = -DDBUS_STATIC_BUILD test_pending_call_dispatch_SOURCES = \ test-pending-call-dispatch.c -test_pending_call_dispatch_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_TEST_LIBS) +test_pending_call_dispatch_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS) test_pending_call_dispatch_LDFLAGS=@R_DYNAMIC_LDFLAG@ test_pending_call_timeout_SOURCES = \ test-pending-call-timeout.c -test_pending_call_timeout_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_TEST_LIBS) +test_pending_call_timeout_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS) test_pending_call_timeout_LDFLAGS=@R_DYNAMIC_LDFLAG@ test_threads_init_SOURCES = \ test-threads-init.c -test_threads_init_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_TEST_LIBS) +test_threads_init_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS) test_threads_init_LDFLAGS=@R_DYNAMIC_LDFLAG@ test_ids_SOURCES = \ test-ids.c -test_ids_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_TEST_LIBS) +test_ids_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS) test_ids_LDFLAGS=@R_DYNAMIC_LDFLAG@ test_shutdown_SOURCES = \ test-shutdown.c test_shutdown_CFLAGS= -test_shutdown_LDADD=$(top_builddir)/dbus/libdbus-convenience.la ../libdbus-testutils.la $(DBUS_TEST_LIBS) +test_shutdown_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la $(DBUS_TEST_LIBS) test_shutdown_LDFLAGS=@R_DYNAMIC_LDFLAG@ test_privserver_SOURCES = \ test-privserver.c test_privserver_CFLAGS= -test_privserver_LDADD=$(top_builddir)/dbus/libdbus-convenience.la ../libdbus-testutils.la $(DBUS_TEST_LIBS) +test_privserver_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la $(DBUS_TEST_LIBS) test_privserver_LDFLAGS=@R_DYNAMIC_LDFLAG@ test_privserver_client_SOURCES = \ test-privserver-client.c test_privserver_client_CFLAGS= -test_privserver_client_LDADD=$(top_builddir)/dbus/libdbus-convenience.la ../libdbus-testutils.la $(DBUS_TEST_LIBS) +test_privserver_client_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la $(DBUS_TEST_LIBS) test_privserver_client_LDFLAGS=@R_DYNAMIC_LDFLAG@ endif -- 2.7.4