diff options
-rw-r--r-- | plugins/a11y-keyboard/Makefile.am | 8 | ||||
-rw-r--r-- | plugins/a11y-settings/Makefile.am | 8 | ||||
-rw-r--r-- | plugins/clipboard/Makefile.am | 10 | ||||
-rw-r--r-- | plugins/color/Makefile.am | 10 | ||||
-rw-r--r-- | plugins/datetime/Makefile.am | 8 | ||||
-rw-r--r-- | plugins/dummy/Makefile.am | 10 | ||||
-rw-r--r-- | plugins/housekeeping/Makefile.am | 10 | ||||
-rw-r--r-- | plugins/keyboard/Makefile.am | 10 | ||||
-rw-r--r-- | plugins/media-keys/Makefile.am | 10 | ||||
-rw-r--r-- | plugins/mouse/Makefile.am | 10 | ||||
-rw-r--r-- | plugins/orientation/Makefile.am | 8 | ||||
-rw-r--r-- | plugins/power/Makefile.am | 12 | ||||
-rw-r--r-- | plugins/print-notifications/Makefile.am | 10 | ||||
-rw-r--r-- | plugins/rfkill/Makefile.am | 8 | ||||
-rw-r--r-- | plugins/screensaver-proxy/Makefile.am | 10 | ||||
-rw-r--r-- | plugins/sharing/Makefile.am | 10 | ||||
-rw-r--r-- | plugins/smartcard/Makefile.am | 12 | ||||
-rw-r--r-- | plugins/sound/Makefile.am | 8 | ||||
-rw-r--r-- | plugins/wacom/Makefile.am | 10 | ||||
-rw-r--r-- | plugins/xrandr/Makefile.am | 10 | ||||
-rw-r--r-- | plugins/xsettings/Makefile.am | 10 |
21 files changed, 101 insertions, 101 deletions
diff --git a/plugins/a11y-keyboard/Makefile.am b/plugins/a11y-keyboard/Makefile.am index e65625c4..840cc7d6 100644 --- a/plugins/a11y-keyboard/Makefile.am +++ b/plugins/a11y-keyboard/Makefile.am @@ -2,14 +2,14 @@ NULL = plugin_name = a11y-keyboard -libexec_PROGRAMS = gsd-test-a11y-keyboard +libexec_PROGRAMS = gsd-a11y-keyboard -gsd_test_a11y_keyboard_SOURCES = \ +gsd_a11y_keyboard_SOURCES = \ gsd-a11y-keyboard-manager.h \ gsd-a11y-keyboard-manager.c \ test-a11y-keyboard.c -gsd_test_a11y_keyboard_CFLAGS = \ +gsd_a11y_keyboard_CFLAGS = \ -I$(top_srcdir)/gnome-settings-daemon \ -I$(top_builddir)/gnome-settings-daemon \ -I$(top_srcdir)/plugins/common \ @@ -20,7 +20,7 @@ gsd_test_a11y_keyboard_CFLAGS = \ $(SETTINGS_PLUGIN_CFLAGS) \ $(AM_CFLAGS) -gsd_test_a11y_keyboard_LDADD = \ +gsd_a11y_keyboard_LDADD = \ $(top_builddir)/gnome-settings-daemon/libgsd.la \ $(top_builddir)/plugins/common/libcommon.la \ $(LIBNOTIFY_LIBS) \ diff --git a/plugins/a11y-settings/Makefile.am b/plugins/a11y-settings/Makefile.am index a779bead..afa55892 100644 --- a/plugins/a11y-settings/Makefile.am +++ b/plugins/a11y-settings/Makefile.am @@ -1,13 +1,13 @@ plugin_name = a11y-settings -libexec_PROGRAMS = gsd-test-a11y-settings +libexec_PROGRAMS = gsd-a11y-settings -gsd_test_a11y_settings_SOURCES = \ +gsd_a11y_settings_SOURCES = \ gsd-a11y-settings-manager.h \ gsd-a11y-settings-manager.c \ test-a11y-settings.c -gsd_test_a11y_settings_CFLAGS = \ +gsd_a11y_settings_CFLAGS = \ -I$(top_srcdir)/gnome-settings-daemon \ -I$(top_builddir)/gnome-settings-daemon \ -I$(top_srcdir)/plugins/common \ @@ -16,7 +16,7 @@ gsd_test_a11y_settings_CFLAGS = \ $(SETTINGS_PLUGIN_CFLAGS) \ $(AM_CFLAGS) -gsd_test_a11y_settings_LDADD = \ +gsd_a11y_settings_LDADD = \ $(top_builddir)/gnome-settings-daemon/libgsd.la \ $(top_builddir)/plugins/common/libcommon.la \ $(SETTINGS_PLUGIN_LIBS) diff --git a/plugins/clipboard/Makefile.am b/plugins/clipboard/Makefile.am index 2dc2bcc5..2a3d74c7 100644 --- a/plugins/clipboard/Makefile.am +++ b/plugins/clipboard/Makefile.am @@ -36,8 +36,8 @@ libclipboard_la_LIBADD = \ $(SETTINGS_PLUGIN_LIBS) \ $(NULL) -libexec_PROGRAMS = gsd-test-clipboard -gsd_test_clipboard_SOURCES = \ +libexec_PROGRAMS = gsd-clipboard +gsd_clipboard_SOURCES = \ test-clipboard.c \ gsd-clipboard-manager.h \ gsd-clipboard-manager.c \ @@ -47,9 +47,9 @@ gsd_test_clipboard_SOURCES = \ list.c \ $(NULL) -gsd_test_clipboard_CFLAGS = $(libclipboard_la_CFLAGS) -gsd_test_clipboard_CPPFLAGS = $(libclipboard_la_CPPFLAGS) -gsd_test_clipboard_LDADD = $(libclipboard_la_LIBADD) $(top_builddir)/gnome-settings-daemon/libgsd.la +gsd_clipboard_CFLAGS = $(libclipboard_la_CFLAGS) +gsd_clipboard_CPPFLAGS = $(libclipboard_la_CPPFLAGS) +gsd_clipboard_LDADD = $(libclipboard_la_LIBADD) $(top_builddir)/gnome-settings-daemon/libgsd.la plugin_in_files = \ clipboard.gnome-settings-plugin.in \ diff --git a/plugins/color/Makefile.am b/plugins/color/Makefile.am index 3b56dd10..c177604c 100644 --- a/plugins/color/Makefile.am +++ b/plugins/color/Makefile.am @@ -65,8 +65,8 @@ gcm_self_test_LDADD = \ TESTS = gcm-self-test -libexec_PROGRAMS = gsd-test-color -gsd_test_color_SOURCES = \ +libexec_PROGRAMS = gsd-color +gsd_color_SOURCES = \ test-color.c \ gcm-edid.c \ gcm-edid.h \ @@ -80,9 +80,9 @@ gsd_test_color_SOURCES = \ gsd-color-state.h \ $(NULL) -gsd_test_color_CFLAGS = $(libcolor_la_CFLAGS) -gsd_test_color_CPPFLAGS = $(libcolor_la_CPPFLAGS) -gsd_test_color_LDADD = $(libcolor_la_LIBADD) $(top_builddir)/gnome-settings-daemon/libgsd.la $(LIBM) +gsd_color_CFLAGS = $(libcolor_la_CFLAGS) +gsd_color_CPPFLAGS = $(libcolor_la_CPPFLAGS) +gsd_color_LDADD = $(libcolor_la_LIBADD) $(top_builddir)/gnome-settings-daemon/libgsd.la $(LIBM) plugin_in_files = \ color.gnome-settings-plugin.in diff --git a/plugins/datetime/Makefile.am b/plugins/datetime/Makefile.am index e8d8a4d9..46764191 100644 --- a/plugins/datetime/Makefile.am +++ b/plugins/datetime/Makefile.am @@ -14,9 +14,9 @@ BUILT_SOURCES = \ tzdatadir = $(pkgdatadir)/datetime dist_tzdata_DATA = backward -libexec_PROGRAMS = gsd-test-datetime +libexec_PROGRAMS = gsd-datetime -gsd_test_datetime_SOURCES = \ +gsd_datetime_SOURCES = \ $(BUILT_SOURCES) \ gsd-datetime-manager.c \ gsd-datetime-manager.h \ @@ -28,7 +28,7 @@ gsd_test_datetime_SOURCES = \ weather-tz.c \ weather-tz.h -gsd_test_datetime_CFLAGS = \ +gsd_datetime_CFLAGS = \ -I$(top_srcdir)/gnome-settings-daemon \ -I$(top_builddir)/gnome-settings-daemon \ -I$(top_srcdir)/plugins/common \ @@ -39,7 +39,7 @@ gsd_test_datetime_CFLAGS = \ $(SETTINGS_PLUGIN_CFLAGS) \ $(AM_CFLAGS) -gsd_test_datetime_LDADD = \ +gsd_datetime_LDADD = \ $(top_builddir)/gnome-settings-daemon/libgsd.la \ $(top_builddir)/plugins/common/libcommon.la \ $(DATETIME_LIBS) \ diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am index 9d9716b6..e9e9d80d 100644 --- a/plugins/dummy/Makefile.am +++ b/plugins/dummy/Makefile.am @@ -25,17 +25,17 @@ libdummy_la_LDFLAGS = \ libdummy_la_LIBADD = \ $(SETTINGS_PLUGIN_LIBS) -libexec_PROGRAMS = gsd-test-dummy -gsd_test_dummy_SOURCES = \ +libexec_PROGRAMS = gsd-dummy +gsd_dummy_SOURCES = \ test-dummy.c \ gsd-dummy-manager.c \ gsd-dummy-manager.h -gsd_test_dummy_CFLAGS = $(libdummy_la_CFLAGS) -gsd_test_dummy_CPPFLAGS = \ +gsd_dummy_CFLAGS = $(libdummy_la_CFLAGS) +gsd_dummy_CPPFLAGS = \ -I$(top_srcdir)/plugins/common \ $(libdummy_la_CPPFLAGS) -gsd_test_dummy_LDADD = $(libdummy_la_LIBADD) $(top_builddir)/gnome-settings-daemon/libgsd.la +gsd_dummy_LDADD = $(libdummy_la_LIBADD) $(top_builddir)/gnome-settings-daemon/libgsd.la plugin_in_files = \ dummy.gnome-settings-plugin.in diff --git a/plugins/housekeeping/Makefile.am b/plugins/housekeeping/Makefile.am index bf739b5d..be45172b 100644 --- a/plugins/housekeeping/Makefile.am +++ b/plugins/housekeeping/Makefile.am @@ -38,15 +38,15 @@ gsd_purge_temp_test_CFLAGS = \ $(LIBNOTIFY_CFLAGS) \ $(AM_CFLAGS) -libexec_PROGRAMS = gsd-test-housekeeping +libexec_PROGRAMS = gsd-housekeeping -gsd_test_housekeeping_SOURCES = \ +gsd_housekeeping_SOURCES = \ test-housekeeping.c \ gsd-housekeeping-manager.c \ gsd-housekeeping-manager.h \ $(COMMON_FILES) -gsd_test_housekeeping_CPPFLAGS = \ +gsd_housekeeping_CPPFLAGS = \ -I$(top_srcdir)/data/ \ -I$(top_srcdir)/gnome-settings-daemon \ -I$(top_builddir)/gnome-settings-daemon \ @@ -55,13 +55,13 @@ gsd_test_housekeeping_CPPFLAGS = \ -DLIBEXECDIR=\""$(libexecdir)"\" \ $(AM_CPPFLAGS) -gsd_test_housekeeping_CFLAGS = \ +gsd_housekeeping_CFLAGS = \ $(PLUGIN_CFLAGS) \ $(SETTINGS_PLUGIN_CFLAGS) \ $(MOUSE_CFLAGS) \ $(AM_CFLAGS) -gsd_test_housekeeping_LDADD = \ +gsd_housekeeping_LDADD = \ $(top_builddir)/gnome-settings-daemon/libgsd.la \ $(top_builddir)/plugins/common/libcommon.la \ $(SETTINGS_DAEMON_LIBS) \ diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am index 86bd26c9..cb9e10a2 100644 --- a/plugins/keyboard/Makefile.am +++ b/plugins/keyboard/Makefile.am @@ -36,16 +36,16 @@ libkeyboard_la_LIBADD = \ $(SETTINGS_PLUGIN_LIBS) \ $(NULL) -libexec_PROGRAMS = gsd-test-keyboard -gsd_test_keyboard_SOURCES = \ +libexec_PROGRAMS = gsd-keyboard +gsd_keyboard_SOURCES = \ test-keyboard.c \ gsd-keyboard-manager.h \ gsd-keyboard-manager.c \ $(NULL) -gsd_test_keyboard_CFLAGS = $(libkeyboard_la_CFLAGS) -gsd_test_keyboard_CPPFLAGS = $(libkeyboard_la_CPPFLAGS) -gsd_test_keyboard_LDADD = $(libkeyboard_la_LIBADD) $(top_builddir)/gnome-settings-daemon/libgsd.la +gsd_keyboard_CFLAGS = $(libkeyboard_la_CFLAGS) +gsd_keyboard_CPPFLAGS = $(libkeyboard_la_CPPFLAGS) +gsd_keyboard_LDADD = $(libkeyboard_la_LIBADD) $(top_builddir)/gnome-settings-daemon/libgsd.la plugin_in_files = \ keyboard.gnome-settings-plugin.in \ diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am index d8f2e6ab..c4c5428a 100644 --- a/plugins/media-keys/Makefile.am +++ b/plugins/media-keys/Makefile.am @@ -77,9 +77,9 @@ plugin_in_files = \ plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin) -libexec_PROGRAMS = gsd-test-media-keys +libexec_PROGRAMS = gsd-media-keys -gsd_test_media_keys_SOURCES = \ +gsd_media_keys_SOURCES = \ gsd-media-keys-manager.c \ gsd-media-keys-manager.h \ gsd-screenshot-utils.h \ @@ -92,7 +92,7 @@ gsd_test_media_keys_SOURCES = \ $(BUILT_SOURCES) \ $(NULL) -gsd_test_media_keys_CPPFLAGS = \ +gsd_media_keys_CPPFLAGS = \ -I$(top_srcdir)/data/ \ -I$(top_srcdir)/gnome-settings-daemon \ -I$(top_builddir)/gnome-settings-daemon \ @@ -104,13 +104,13 @@ gsd_test_media_keys_CPPFLAGS = \ -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ $(AM_CPPFLAGS) -gsd_test_media_keys_CFLAGS = \ +gsd_media_keys_CFLAGS = \ $(PLUGIN_CFLAGS) \ $(SETTINGS_PLUGIN_CFLAGS) \ $(MEDIA_KEYS_CFLAGS) \ $(AM_CFLAGS) -gsd_test_media_keys_LDADD = \ +gsd_media_keys_LDADD = \ $(top_builddir)/gnome-settings-daemon/libgsd.la \ $(top_builddir)/plugins/common/libcommon.la \ $(top_builddir)/plugins/media-keys/gvc/libgvc.la \ diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am index a22d6c96..2e8e983d 100644 --- a/plugins/mouse/Makefile.am +++ b/plugins/mouse/Makefile.am @@ -52,14 +52,14 @@ gsd_locate_pointer_LDADD = \ $(MOUSE_LIBS) \ -lm -libexec_PROGRAMS += gsd-test-mouse +libexec_PROGRAMS += gsd-mouse -gsd_test_mouse_SOURCES = \ +gsd_mouse_SOURCES = \ test-mouse.c \ gsd-mouse-manager.c \ gsd-mouse-manager.h -gsd_test_mouse_CPPFLAGS = \ +gsd_mouse_CPPFLAGS = \ -I$(top_srcdir)/data/ \ -I$(top_srcdir)/gnome-settings-daemon \ -I$(top_builddir)/gnome-settings-daemon \ @@ -68,13 +68,13 @@ gsd_test_mouse_CPPFLAGS = \ -DLIBEXECDIR=\""$(libexecdir)"\" \ $(AM_CPPFLAGS) -gsd_test_mouse_CFLAGS = \ +gsd_mouse_CFLAGS = \ $(PLUGIN_CFLAGS) \ $(SETTINGS_PLUGIN_CFLAGS) \ $(MOUSE_CFLAGS) \ $(AM_CFLAGS) -gsd_test_mouse_LDADD = \ +gsd_mouse_LDADD = \ $(top_builddir)/gnome-settings-daemon/libgsd.la \ $(top_builddir)/plugins/common/libcommon.la \ $(SETTINGS_DAEMON_LIBS) \ diff --git a/plugins/orientation/Makefile.am b/plugins/orientation/Makefile.am index 0c061819..a1d145ed 100644 --- a/plugins/orientation/Makefile.am +++ b/plugins/orientation/Makefile.am @@ -1,13 +1,13 @@ plugin_name = orientation -libexec_PROGRAMS = gsd-test-orientation +libexec_PROGRAMS = gsd-orientation -gsd_test_orientation_SOURCES = \ +gsd_orientation_SOURCES = \ gsd-orientation-manager.h \ gsd-orientation-manager.c \ test-orientation.c -gsd_test_orientation_CFLAGS = \ +gsd_orientation_CFLAGS = \ -I$(top_srcdir)/gnome-settings-daemon \ -I$(top_builddir)/gnome-settings-daemon \ -I$(top_srcdir)/plugins/common \ @@ -17,7 +17,7 @@ gsd_test_orientation_CFLAGS = \ $(SETTINGS_PLUGIN_CFLAGS) \ $(AM_CFLAGS) -gsd_test_orientation_LDADD = \ +gsd_orientation_LDADD = \ $(top_builddir)/gnome-settings-daemon/libgsd.la \ $(top_builddir)/plugins/common/libcommon.la \ $(ORIENTATION_LIBS) \ diff --git a/plugins/power/Makefile.am b/plugins/power/Makefile.am index cd8e6ba4..6579108b 100644 --- a/plugins/power/Makefile.am +++ b/plugins/power/Makefile.am @@ -63,8 +63,8 @@ gsd_backlight_helper_SOURCES = \ gsd-backlight-linux.h \ gsd-backlight-helper.c -noinst_PROGRAMS = gsd-test-power -gsd_test_power_SOURCES = \ +noinst_PROGRAMS = gsd-power +gsd_power_SOURCES = \ gpm-common.c \ gpm-common.h \ gsd-backlight-linux.c \ @@ -77,9 +77,9 @@ gsd_test_power_SOURCES = \ gsd-power-constants.h \ test-power.c -gsd_test_power_CFLAGS = $(libpower_la_CFLAGS) -gsd_test_power_CPPFLAGS = $(libpower_la_CPPFLAGS) -gsd_test_power_LDADD = \ +gsd_power_CFLAGS = $(libpower_la_CFLAGS) +gsd_power_CPPFLAGS = $(libpower_la_CPPFLAGS) +gsd_power_LDADD = \ -lm \ $(top_builddir)/plugins/common/libcommon.la \ $(top_builddir)/gnome-settings-daemon/libgsd.la \ @@ -143,7 +143,7 @@ gsd_power_enums_update_LDFLAGS = $(POWER_LIBS) EXTRA_DIST += gsd-power-constants-update.pl gsdpowerconstants.py gsdpowerenums.py test.py -check-local: $(top_builddir)/tests/shiftkey gsd-test-power test.py gsdpowerconstants.py gsdpowerenums.py +check-local: $(top_builddir)/tests/shiftkey gsd-power test.py gsdpowerconstants.py gsdpowerenums.py # This is how you run a single test # BUILDDIR=$(builddir) TOP_BUILDDIR=$(top_builddir) ${PYTHON} $(srcdir)/test.py PowerPluginTest.test_sleep_inactive_blank BUILDDIR=$(builddir) TOP_BUILDDIR=$(top_builddir) ${PYTHON} $(srcdir)/test.py diff --git a/plugins/print-notifications/Makefile.am b/plugins/print-notifications/Makefile.am index 1f11adaf..9a1a4511 100644 --- a/plugins/print-notifications/Makefile.am +++ b/plugins/print-notifications/Makefile.am @@ -49,14 +49,14 @@ gsd_printer_LDADD = \ $(CUPS_LIBS) \ $(LIBNOTIFY_LIBS) -libexec_PROGRAMS += gsd-test-print-notifications +libexec_PROGRAMS += gsd-print-notifications -gsd_test_print_notifications_SOURCES = \ +gsd_print_notifications_SOURCES = \ gsd-print-notifications-manager.c \ gsd-print-notifications-manager.h \ test-print-notifications.c -gsd_test_print_notifications_CPPFLAGS = \ +gsd_print_notifications_CPPFLAGS = \ -I$(top_srcdir)/gnome-settings-daemon \ -I$(top_builddir)/gnome-settings-daemon \ -I$(top_srcdir)/plugins/common \ @@ -65,12 +65,12 @@ gsd_test_print_notifications_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(CUPS_CPPFLAGS) -gsd_test_print_notifications_CFLAGS = \ +gsd_print_notifications_CFLAGS = \ $(PLUGIN_CFLAGS) \ $(SETTINGS_PLUGIN_CFLAGS) \ $(AM_CFLAGS) -gsd_test_print_notifications_LDADD = \ +gsd_print_notifications_LDADD = \ $(top_builddir)/gnome-settings-daemon/libgsd.la \ $(SETTINGS_DAEMON_LIBS) \ $(SETTINGS_PLUGIN_LIBS) \ diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am index fed7adc2..488eac55 100644 --- a/plugins/rfkill/Makefile.am +++ b/plugins/rfkill/Makefile.am @@ -1,8 +1,8 @@ plugin_name = rfkill -libexec_PROGRAMS = gsd-test-rfkill +libexec_PROGRAMS = gsd-rfkill -gsd_test_rfkill_SOURCES = \ +gsd_rfkill_SOURCES = \ gsd-rfkill-manager.h \ gsd-rfkill-manager.c \ rfkill-glib.c \ @@ -10,7 +10,7 @@ gsd_test_rfkill_SOURCES = \ rfkill.h \ test-rfkill.c -gsd_test_rfkill_CFLAGS = \ +gsd_rfkill_CFLAGS = \ -I$(top_srcdir)/gnome-settings-daemon \ -I$(top_builddir)/gnome-settings-daemon \ -I$(top_srcdir)/plugins/common \ @@ -19,7 +19,7 @@ gsd_test_rfkill_CFLAGS = \ $(SETTINGS_PLUGIN_CFLAGS) \ $(AM_CFLAGS) -gsd_test_rfkill_LDADD = \ +gsd_rfkill_LDADD = \ $(top_builddir)/gnome-settings-daemon/libgsd.la \ $(top_builddir)/plugins/common/libcommon.la \ $(SETTINGS_PLUGIN_LIBS) diff --git a/plugins/screensaver-proxy/Makefile.am b/plugins/screensaver-proxy/Makefile.am index c6084c63..e118ee3d 100644 --- a/plugins/screensaver-proxy/Makefile.am +++ b/plugins/screensaver-proxy/Makefile.am @@ -22,14 +22,14 @@ libscreensaver_proxy_la_LDFLAGS = $(GSD_PLUGIN_LDFLAGS) libscreensaver_proxy_la_LIBADD = $(SETTINGS_PLUGIN_LIBS) -libexec_PROGRAMS = gsd-test-screensaver-proxy +libexec_PROGRAMS = gsd-screensaver-proxy -gsd_test_screensaver_proxy_SOURCES = \ +gsd_screensaver_proxy_SOURCES = \ test-screensaver-proxy.c \ gsd-screensaver-proxy-manager.c \ gsd-screensaver-proxy-manager.h -gsd_test_screensaver_proxy_CPPFLAGS = \ +gsd_screensaver_proxy_CPPFLAGS = \ -I$(top_srcdir)/data/ \ -I$(top_srcdir)/gnome-settings-daemon \ -I$(top_builddir)/gnome-settings-daemon \ @@ -38,12 +38,12 @@ gsd_test_screensaver_proxy_CPPFLAGS = \ -DLIBEXECDIR=\""$(libexecdir)"\" \ $(AM_CPPFLAGS) -gsd_test_screensaver_proxy_CFLAGS = \ +gsd_screensaver_proxy_CFLAGS = \ $(PLUGIN_CFLAGS) \ $(SETTINGS_PLUGIN_CFLAGS) \ $(AM_CFLAGS) -gsd_test_screensaver_proxy_LDADD = \ +gsd_screensaver_proxy_LDADD = \ $(top_builddir)/gnome-settings-daemon/libgsd.la \ $(top_builddir)/plugins/common/libcommon.la \ $(SETTINGS_DAEMON_LIBS) \ diff --git a/plugins/sharing/Makefile.am b/plugins/sharing/Makefile.am index 5b55c025..a5051c12 100644 --- a/plugins/sharing/Makefile.am +++ b/plugins/sharing/Makefile.am @@ -25,15 +25,15 @@ libsharing_la_LDFLAGS = $(GSD_PLUGIN_LDFLAGS) libsharing_la_LIBADD = $(SETTINGS_PLUGIN_LIBS) $(SHARING_LIBS) -noinst_PROGRAMS = gsd-test-sharing -gsd_test_sharing_SOURCES = \ +noinst_PROGRAMS = gsd-sharing +gsd_sharing_SOURCES = \ gsd-sharing-manager.c \ gsd-sharing-manager.h \ test-sharing.c -gsd_test_sharing_CFLAGS = $(libsharing_la_CFLAGS) -gsd_test_sharing_CPPFLAGS = $(libsharing_la_CPPFLAGS) -gsd_test_sharing_LDADD = \ +gsd_sharing_CFLAGS = $(libsharing_la_CFLAGS) +gsd_sharing_CPPFLAGS = $(libsharing_la_CPPFLAGS) +gsd_sharing_LDADD = \ $(top_builddir)/gnome-settings-daemon/libgsd.la \ $(SHARING_LIBS) \ $(SETTINGS_PLUGIN_LIBS) diff --git a/plugins/smartcard/Makefile.am b/plugins/smartcard/Makefile.am index 65b3f10b..baf97160 100644 --- a/plugins/smartcard/Makefile.am +++ b/plugins/smartcard/Makefile.am @@ -5,7 +5,7 @@ dbus_built_sources = org.gnome.SettingsDaemon.Smartcard.c org.gnome.SettingsDaem enum_built_sources = gsd-smartcard-enum-types.h gsd-smartcard-enum-types.c BUILT_SOURCES = $(dbus_built_sources) $(enum_built_sources) -libexec_PROGRAMS = gsd-test-smartcard +libexec_PROGRAMS = gsd-smartcard plugin_LTLIBRARIES = \ libsmartcard.la @@ -24,7 +24,7 @@ gsd-smartcard-enum-types.h: gsd-smartcard-enum-types.h.in $(libsmartcard_headers gsd-smartcard-enum-types.c: gsd-smartcard-enum-types.c.in $(libsmartcard_headers) $(AM_V_GEN) $(GLIB_MKENUMS) --template $^ > $@ -gsd_test_smartcard_SOURCES = \ +gsd_smartcard_SOURCES = \ gsd-smartcard-service.c \ gsd-smartcard-service.h \ gsd-smartcard-manager.c \ @@ -32,11 +32,11 @@ gsd_test_smartcard_SOURCES = \ gsd-smartcard-utils.c \ test-smartcard.c -nodist_gsd_test_smartcard_SOURCES = \ +nodist_gsd_smartcard_SOURCES = \ $(dbus_built_sources) \ $(enum_built_sources) -gsd_test_smartcard_CPPFLAGS = \ +gsd_smartcard_CPPFLAGS = \ -I$(top_srcdir)/data/ \ -I$(top_srcdir)/gnome-settings-daemon \ -I$(top_builddir)/gnome-settings-daemon \ @@ -47,14 +47,14 @@ gsd_test_smartcard_CPPFLAGS = \ -DGSD_SMARTCARD_MANAGER_NSS_DB=\""$(NSS_DATABASE)"\" \ $(AM_CPPFLAGS) -gsd_test_smartcard_CFLAGS = \ +gsd_smartcard_CFLAGS = \ $(PLUGIN_CFLAGS) \ $(SETTINGS_PLUGIN_CFLAGS) \ $(MEDIA_KEYS_CFLAGS) \ $(NSS_CFLAGS) \ $(AM_CFLAGS) -gsd_test_smartcard_LDADD = \ +gsd_smartcard_LDADD = \ $(top_builddir)/gnome-settings-daemon/libgsd.la \ $(top_builddir)/plugins/common/libcommon.la \ $(NSS_LIBS) \ diff --git a/plugins/sound/Makefile.am b/plugins/sound/Makefile.am index e7dce725..c8fa2042 100644 --- a/plugins/sound/Makefile.am +++ b/plugins/sound/Makefile.am @@ -1,13 +1,13 @@ plugin_name = sound -libexec_PROGRAMS = gsd-test-sound +libexec_PROGRAMS = gsd-sound -gsd_test_sound_SOURCES = \ +gsd_sound_SOURCES = \ gsd-sound-manager.h \ gsd-sound-manager.c \ test-sound.c -gsd_test_sound_CFLAGS = \ +gsd_sound_CFLAGS = \ -I$(top_srcdir)/gnome-settings-daemon \ -I$(top_builddir)/gnome-settings-daemon \ -I$(top_srcdir)/plugins/common \ @@ -17,7 +17,7 @@ gsd_test_sound_CFLAGS = \ $(SETTINGS_PLUGIN_CFLAGS) \ $(AM_CFLAGS) -gsd_test_sound_LDADD = \ +gsd_sound_LDADD = \ $(top_builddir)/gnome-settings-daemon/libgsd.la \ $(top_builddir)/plugins/common/libcommon.la \ $(SOUND_LIBS) \ diff --git a/plugins/wacom/Makefile.am b/plugins/wacom/Makefile.am index 6274e439..baced3a5 100644 --- a/plugins/wacom/Makefile.am +++ b/plugins/wacom/Makefile.am @@ -87,9 +87,9 @@ endif EXTRA_DIST += org.gnome.settings-daemon.plugins.wacom.policy.in.in -libexec_PROGRAMS += gsd-test-wacom gsd-list-wacom gsd-test-wacom-osd +libexec_PROGRAMS += gsd-wacom gsd-list-wacom gsd-test-wacom-osd -gsd_test_wacom_SOURCES = \ +gsd_wacom_SOURCES = \ test-wacom.c \ gsd-wacom-manager.c \ gsd-wacom-manager.h \ @@ -105,7 +105,7 @@ gsd_test_wacom_SOURCES = \ gsd-wacom-device.h \ gsd-wacom-resources.c -gsd_test_wacom_CPPFLAGS = \ +gsd_wacom_CPPFLAGS = \ -I$(top_srcdir)/data/ \ -I$(top_srcdir)/gnome-settings-daemon \ -I$(top_builddir)/gnome-settings-daemon \ @@ -118,13 +118,13 @@ gsd_test_wacom_CPPFLAGS = \ -DSCHEMA_NAME=\""gsdwacom"\" \ $(AM_CPPFLAGS) -gsd_test_wacom_CFLAGS = \ +gsd_wacom_CFLAGS = \ $(PLUGIN_CFLAGS) \ $(SETTINGS_PLUGIN_CFLAGS) \ $(WACOM_CFLAGS) \ $(AM_CFLAGS) -gsd_test_wacom_LDADD = \ +gsd_wacom_LDADD = \ $(top_builddir)/gnome-settings-daemon/libgsd.la \ $(top_builddir)/plugins/common/libcommon.la \ $(SETTINGS_DAEMON_LIBS) \ diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am index f6bf4fe1..9fe8a8c7 100644 --- a/plugins/xrandr/Makefile.am +++ b/plugins/xrandr/Makefile.am @@ -29,14 +29,14 @@ uninstall-local: rm -f $(DESTDIR)$(icondir)/32x32/$(context)/gsd-xrandr.png rm -f $(DESTDIR)$(icondir)/scalable/$(context)/gsd-xrandr.svg -libexec_PROGRAMS = gsd-test-xrandr +libexec_PROGRAMS = gsd-xrandr -gsd_test_xrandr_SOURCES = \ +gsd_xrandr_SOURCES = \ test-xrandr.c \ gsd-xrandr-manager.c \ gsd-xrandr-manager.h -gsd_test_xrandr_CPPFLAGS = \ +gsd_xrandr_CPPFLAGS = \ -I$(top_srcdir)/data/ \ -I$(top_srcdir)/gnome-settings-daemon \ -I$(top_builddir)/gnome-settings-daemon \ @@ -45,13 +45,13 @@ gsd_test_xrandr_CPPFLAGS = \ -DLIBEXECDIR=\""$(libexecdir)"\" \ $(AM_CPPFLAGS) -gsd_test_xrandr_CFLAGS = \ +gsd_xrandr_CFLAGS = \ $(PLUGIN_CFLAGS) \ $(SETTINGS_PLUGIN_CFLAGS) \ $(XRANDR_CFLAGS) \ $(AM_CFLAGS) -gsd_test_xrandr_LDADD = \ +gsd_xrandr_LDADD = \ $(top_builddir)/gnome-settings-daemon/libgsd.la \ $(top_builddir)/plugins/common/libcommon.la \ $(SETTINGS_DAEMON_LIBS) \ diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am index e35ff0be..93c6f6c0 100644 --- a/plugins/xsettings/Makefile.am +++ b/plugins/xsettings/Makefile.am @@ -66,9 +66,9 @@ test_wm_button_layout_translations_LDADD = \ $(XSETTINGS_LIBS) \ $(NULL) -libexec_PROGRAMS = gsd-test-xsettings +libexec_PROGRAMS = gsd-xsettings -gsd_test_xsettings_SOURCES = \ +gsd_xsettings_SOURCES = \ gsd-xsettings-gtk.c \ gsd-xsettings-gtk.h \ gsd-xsettings-manager.c \ @@ -85,9 +85,9 @@ gsd_test_xsettings_SOURCES = \ wm-button-layout-translation.h \ test-xsettings.c -gsd_test_xsettings_CFLAGS = $(libxsettings_la_CFLAGS) $(PLUGIN_CFLAGS) -gsd_test_xsettings_CPPFLAGS = $(libxsettings_la_CPPFLAGS) -I$(top_srcdir)/plugins/common -gsd_test_xsettings_LDADD = $(libxsettings_la_LIBADD) +gsd_xsettings_CFLAGS = $(libxsettings_la_CFLAGS) $(PLUGIN_CFLAGS) +gsd_xsettings_CPPFLAGS = $(libxsettings_la_CPPFLAGS) -I$(top_srcdir)/plugins/common +gsd_xsettings_LDADD = $(libxsettings_la_LIBADD) plugin_LTLIBRARIES = \ libxsettings.la \ |