From 8c320d0c34ad5b3a31ac4f9024dba358a46ac725 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Fri, 26 Oct 2012 10:42:17 +0200 Subject: [PATCH] gio: Remove LDADD repetition from gio/tests Makefile Using a global LDADD for the basic libraries to link. https://bugzilla.gnome.org/show_bug.cgi?id=686921 --- gio/tests/Makefile.am | 122 +++++++------------------------------------------- 1 file changed, 16 insertions(+), 106 deletions(-) diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am index 2eed187..73aa30b 100644 --- a/gio/tests/Makefile.am +++ b/gio/tests/Makefile.am @@ -18,7 +18,7 @@ INCLUDES = \ noinst_PROGRAMS = $(TEST_PROGS) $(SAMPLE_PROGS) noinst_DATA = $(MISC_STUFF) -progs_ldadd = \ +LDADD = \ $(top_builddir)/glib/libglib-2.0.la \ $(top_builddir)/gthread/libgthread-2.0.la \ $(top_builddir)/gobject/libgobject-2.0.la \ @@ -150,152 +150,120 @@ TEST_PROGS += win32-streams endif io_stream_SOURCES = io-stream.c -io_stream_LDADD = $(progs_ldadd) actions_SOURCES = actions.c gdbus-sessionbus.c gdbus-sessionbus.h -actions_LDADD = $(progs_ldadd) memory_input_stream_SOURCES = memory-input-stream.c -memory_input_stream_LDADD = $(progs_ldadd) memory_output_stream_SOURCES = memory-output-stream.c -memory_output_stream_LDADD = $(progs_ldadd) g_file_SOURCES = g-file.c -g_file_LDADD = $(progs_ldadd) readwrite_SOURCES = readwrite.c -readwrite_LDADD = $(progs_ldadd) g_file_info_SOURCES = g-file-info.c -g_file_info_LDADD = $(progs_ldadd) converter_stream_SOURCES = converter-stream.c -converter_stream_LDADD = $(progs_ldadd) data_input_stream_SOURCES = data-input-stream.c -data_input_stream_LDADD = $(progs_ldadd) data_output_stream_SOURCES = data-output-stream.c -data_output_stream_LDADD = $(progs_ldadd) async_close_output_stream_SOURCES = async-close-output-stream.c -async_close_output_stream_LDADD = $(progs_ldadd) filter_cat_SOURCES = filter-cat.c -filter_cat_LDADD = $(progs_ldadd) g_icon_SOURCES = g-icon.c -g_icon_LDADD = $(progs_ldadd) buffered_input_stream_SOURCES = buffered-input-stream.c -buffered_input_stream_LDADD = $(progs_ldadd) buffered_output_stream_SOURCES = buffered-output-stream.c -buffered_output_stream_LDADD = $(progs_ldadd) live_g_file_SOURCES = live-g-file.c -live_g_file_LDADD = $(progs_ldadd) desktop_app_info_SOURCES = desktop-app-info.c -desktop_app_info_LDADD = $(progs_ldadd) unix_streams_SOURCES = unix-streams.c -unix_streams_LDADD = $(progs_ldadd) \ +unix_streams_LDADD = $(LDADD) \ $(top_builddir)/gthread/libgthread-2.0.la win32_streams_SOURCES = win32-streams.c -win32_streams_LDADD = $(progs_ldadd) \ +win32_streams_LDADD = $(LDADD) \ $(top_builddir)/gthread/libgthread-2.0.la unix_fd_SOURCES = unix-fd.c -unix_fd_LDADD = $(progs_ldadd) simple_async_result_SOURCES = simple-async-result.c -simple_async_result_LDADD = $(progs_ldadd) sleepy_stream_SOURCES = sleepy-stream.c -sleepy_stream_LDADD = $(progs_ldadd) filter_streams_SOURCES = filter-streams.c -filter_streams_LDADD = $(progs_ldadd) volumemonitor_SOURCES = volumemonitor.c -volumemonitor_LDADD = $(progs_ldadd) resolver_SOURCES = resolver.c -resolver_LDADD = $(progs_ldadd) \ +resolver_LDADD = $(LDADD) \ $(top_builddir)/gthread/libgthread-2.0.la socket_server_SOURCES = socket-server.c -socket_server_LDADD = $(progs_ldadd) \ +socket_server_LDADD = $(LDADD) \ $(top_builddir)/gthread/libgthread-2.0.la socket_client_SOURCES = socket-client.c \ gtlsconsoleinteraction.c \ gtlsconsoleinteraction.h -socket_client_LDADD = $(progs_ldadd) \ +socket_client_LDADD = $(LDADD) \ $(top_builddir)/gthread/libgthread-2.0.la echo_server_SOURCES = echo-server.c -echo_server_LDADD = $(progs_ldadd) \ +echo_server_LDADD = $(LDADD) \ $(top_builddir)/gthread/libgthread-2.0.la httpd_SOURCES = httpd.c -httpd_LDADD = $(progs_ldadd) \ +httpd_LDADD = $(LDADD) \ $(top_builddir)/gthread/libgthread-2.0.la send_data_SOURCES = send-data.c -send_data_LDADD = $(progs_ldadd) \ +send_data_LDADD = $(LDADD) \ $(top_builddir)/gthread/libgthread-2.0.la srvtarget_SOURCES = srvtarget.c -srvtarget_LDADD = $(progs_ldadd) network_address_SOURCE = network-address.c -network_address_LDADD = $(progs_ldadd) socket_SOURCE = socket.c -socket_LDADD = $(progs_ldadd) pollable_SOURCE = pollable.c -pollable_LDADD = $(progs_ldadd) contexts_SOURCES = contexts.c -contexts_LDADD = $(progs_ldadd) \ +contexts_LDADD = $(LDADD) \ $(top_builddir)/gthread/libgthread-2.0.la gsettings_SOURCES = gsettings.c -gsettings_LDADD = $(progs_ldadd) gschema_compile_SOURCES = gschema-compile.c -gschema_compile_LDADD = $(progs_ldadd) gdbus_daemon_SOURCES = gdbus-daemon.c $(top_srcdir)/gio/gdbusdaemon.c $(top_builddir)/gio/gdbus-daemon-generated.c -gdbus_daemon_LDADD = $(progs_ldadd) if HAVE_DBUS1 TEST_PROGS += gdbus-serialization gdbus_serialization_SOURCES = gdbus-serialization.c gdbus-tests.h gdbus-tests.c gdbus_serialization_CFLAGS = $(DBUS1_CFLAGS) -gdbus_serialization_LDADD = $(progs_ldadd) $(DBUS1_LIBS) +gdbus_serialization_LDADD = $(LDADD) $(DBUS1_LIBS) endif if HAVE_DBUS1 TEST_PROGS += gdbus-auth gdbus_auth_SOURCES = gdbus-auth.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c gdbus_auth_CFLAGS = $(DBUS1_CFLAGS) -gdbus_auth_LDADD = $(progs_ldadd) $(DBUS1_LIBS) +gdbus_auth_LDADD = $(LDADD) $(DBUS1_LIBS) endif gdbus_addresses_SOURCES = gdbus-addresses.c -gdbus_addresses_LDADD = $(progs_ldadd) gdbus_bz627724_SOURCES = gdbus-bz627724.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c -gdbus_bz627724_LDADD = $(progs_ldadd) gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c -gdbus_close_pending_LDADD = $(progs_ldadd) if OS_UNIX gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen @@ -322,13 +290,10 @@ BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h gdbus_test_codegen_SOURCES = gdbus-test-codegen.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c gdbus_test_codegen_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h -gdbus_test_codegen_LDADD = $(progs_ldadd) -gdbus_peer_object_manager_LDADD = $(progs_ldadd) endif # OS_UNIX gdbus_connection_SOURCES = gdbus-connection.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c -gdbus_connection_LDADD = $(progs_ldadd) gdbus_connection_flush_SOURCES = \ gdbus-connection-flush.c \ @@ -337,40 +302,28 @@ gdbus_connection_flush_SOURCES = \ test-pipe-unix.c \ test-pipe-unix.h \ $(NULL) -gdbus_connection_flush_LDADD = $(progs_ldadd) gdbus_connection_loss_SOURCES = gdbus-connection-loss.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c -gdbus_connection_loss_LDADD = $(progs_ldadd) gdbus_connection_slow_SOURCES = gdbus-connection-slow.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c -gdbus_connection_slow_LDADD = $(progs_ldadd) gdbus_message_SOURCES = gdbus-message.c -gdbus_message_LDADD = $(progs_ldadd) gdbus_names_SOURCES = gdbus-names.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c -gdbus_names_LDADD = $(progs_ldadd) gdbus_proxy_SOURCES = gdbus-proxy.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c -gdbus_proxy_LDADD = $(progs_ldadd) gdbus_proxy_threads_SOURCES = gdbus-proxy-threads.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c -gdbus_proxy_threads_LDADD = $(progs_ldadd) gdbus_proxy_well_known_name_SOURCES = gdbus-proxy-well-known-name.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c -gdbus_proxy_well_known_name_LDADD = $(progs_ldadd) gdbus_introspection_SOURCES = gdbus-introspection.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c -gdbus_introspection_LDADD = $(progs_ldadd) gdbus_threading_SOURCES = gdbus-threading.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c -gdbus_threading_LDADD = $(progs_ldadd) gdbus_export_SOURCES = gdbus-export.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c -gdbus_export_LDADD = $(progs_ldadd) gdbus_error_SOURCES = gdbus-error.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c -gdbus_error_LDADD = $(progs_ldadd) gdbus_non_socket_SOURCES = \ gdbus-non-socket.c \ @@ -381,100 +334,67 @@ gdbus_non_socket_SOURCES = \ test-pipe-unix.c \ test-pipe-unix.h \ $(NULL) -gdbus_non_socket_LDADD = $(progs_ldadd) gdbus_exit_on_close_SOURCES = gdbus-exit-on-close.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c -gdbus_exit_on_close_LDADD = $(progs_ldadd) gdbus_example_watch_name_SOURCES = gdbus-example-watch-name.c -gdbus_example_watch_name_LDADD = $(progs_ldadd) gdbus_example_watch_proxy_SOURCES = gdbus-example-watch-proxy.c -gdbus_example_watch_proxy_LDADD = $(progs_ldadd) gdbus_example_own_name_SOURCES = gdbus-example-own-name.c -gdbus_example_own_name_LDADD = $(progs_ldadd) gdbus_example_server_SOURCES = gdbus-example-server.c -gdbus_example_server_LDADD = $(progs_ldadd) gdbus_example_unix_fd_client_SOURCES = gdbus-example-unix-fd-client.c -gdbus_example_unix_fd_client_LDADD = $(progs_ldadd) gdbus_example_subtree_SOURCES = gdbus-example-subtree.c -gdbus_example_subtree_LDADD = $(progs_ldadd) gdbus_example_peer_SOURCES = gdbus-example-peer.c -gdbus_example_peer_LDADD = $(progs_ldadd) gdbus_example_proxy_subclass_SOURCES = gdbus-example-proxy-subclass.c -gdbus_example_proxy_subclass_LDADD = $(progs_ldadd) gdbus_example_export_SOURCES = gdbus-example-export.c -gdbus_example_export_LDADD = $(progs_ldadd) gdbus_connection_flush_helper_SOURCES = gdbus-connection-flush-helper.c -gdbus_connection_flush_helper_LDADD = $(progs_ldadd) appinfo_SOURCES = appinfo.c -appinfo_LDADD = $(progs_ldadd) resources_SOURCES = resources.c test_resources.c test_resources2.c test_resources2.h resources_DEPENDENCIES = test.gresource -resources_LDADD = $(progs_ldadd) appinfo_test_SOURCES = appinfo-test.c -appinfo_test_LDADD = $(progs_ldadd) contenttype_SOURCES = contenttype.c -contenttype_LDADD = $(progs_ldadd) mimeapps_SOURCES = mimeapps.c -mimeapps_LDADD = $(progs_ldadd) file_SOURCES = file.c -file_LDADD = $(progs_ldadd) fileattributematcher_SOURCES = fileattributematcher.c -fileattributematcher_LDADD = $(progs_ldadd) gapplication_SOURCES = gapplication.c gdbus-sessionbus.h gdbus-sessionbus.c gdbus-tests.h gdbus-tests.c -gapplication_LDADD = $(progs_ldadd) - -basic_application_LDADD = $(progs_ldadd) gapplication_example_open_SOURCES = gapplication-example-open.c -gapplication_example_open_LDADD = $(progs_ldadd) gapplication_example_cmdline_SOURCES = gapplication-example-cmdline.c -gapplication_example_cmdline_LDADD = $(progs_ldadd) gapplication_example_cmdline2_SOURCES = gapplication-example-cmdline2.c -gapplication_example_cmdline2_LDADD = $(progs_ldadd) gapplication_example_cmdline3_SOURCES = gapplication-example-cmdline3.c -gapplication_example_cmdline3_LDADD = $(progs_ldadd) gapplication_example_actions_SOURCES = gapplication-example-actions.c -gapplication_example_actions_LDADD = $(progs_ldadd) gapplication_example_dbushooks_SOURCES = gapplication-example-dbushooks.c -gapplication_example_dbushooks_LDADD = $(progs_ldadd) gmenumodel_SOURCES = gmenumodel.c gdbus-sessionbus.h gdbus-sessionbus.c -gmenumodel_LDADD = $(progs_ldadd) proxy_test_SOURCES = proxy-test.c -proxy_test_LDADD = $(progs_ldadd) inet_address_SOURCES = inet-address.c -inet_address_LDADD = $(progs_ldadd) permission_SOURCES = permission.c -permission_LDADD = $(progs_ldadd) task_SOURCES = task.c -task_LDADD = $(progs_ldadd) schema_tests = \ schema-tests/array-default-not-in-choices.gschema.xml \ @@ -550,34 +470,25 @@ schema_tests = \ schema-tests/wrong-category.gschema.xml proxy_SOURCES = proxy.c -proxy_LDADD = $(progs_ldadd) \ +proxy_LDADD = $(LDADD) \ $(top_builddir)/gthread/libgthread-2.0.la tls_certificate_SOURCES = tls-certificate.c gtesttlsbackend.c gtesttlsbackend.h -tls_certificate_LDADD = $(progs_ldadd) - -tls_interaction_LDADD = $(progs_ldadd) - -cancellable_LDADD = $(progs_ldadd) - -vfs_LDADD = $(progs_ldadd) - -network_monitor_LDADD = $(progs_ldadd) # ----------------------------------------------------------------------------- if OS_UNIX gdbus_example_objectmanager_server_SOURCES = gdbus-example-objectmanager-server.c gdbus_example_objectmanager_server_CFLAGS = -I$(top_builddir)/gio/tests/gdbus-object-manager-example -gdbus_example_objectmanager_server_LDADD = $(top_builddir)/gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.la $(progs_ldadd) +gdbus_example_objectmanager_server_LDADD = $(top_builddir)/gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.la $(LDADD) gdbus_example_objectmanager_client_SOURCES = gdbus-example-objectmanager-client.c gdbus_example_objectmanager_client_CFLAGS = -I$(top_builddir)/gio/tests/gdbus-object-manager-example -gdbus_example_objectmanager_client_LDADD = $(top_builddir)/gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.la $(progs_ldadd) +gdbus_example_objectmanager_client_LDADD = $(top_builddir)/gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.la $(LDADD) gdbus_peer_SOURCES = gdbus-peer.c gdbus-tests.h gdbus-tests.c gdbus_peer_CFLAGS = -I$(top_builddir)/gio/tests/gdbus-object-manager-example -gdbus_peer_LDADD = $(top_builddir)/gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.la $(progs_ldadd) +gdbus_peer_LDADD = $(top_builddir)/gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.la $(LDADD) endif OS_UNIX @@ -646,7 +557,6 @@ noinst_LTLIBRARIES = libresourceplugin.la libresourceplugin_la_SOURCES = resourceplugin.c plugin_resources.c libresourceplugin_la_LDFLAGS = -avoid-version -module $(no_undefined) -rpath $(libdir) -libresourceplugin_la_LIBADD = $(progs_ldadd) CLEANFILES = gdbus-test-codegen-generated.[ch] gdbus-test-codegen-generated-doc-*.xml test_resources2.[ch] plugin_resources.c -- 2.7.4