summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2013-08-06 21:39:57 +0100
committerColin Walters <walters@verbum.org>2013-08-06 21:39:57 +0100
commit8aa16ea8a15ec6d6ea866aa7c175c72ed4b1d2c5 (patch)
tree624f0e2c6a76708ce06a897f2c557fda7dce39df
parent4a0fabd4e7cb83a409c30a3a8aac83179e53ad43 (diff)
downloadgnome-settings-daemon-8aa16ea8a15ec6d6ea866aa7c175c72ed4b1d2c5.tar.gz
build: Fix srcdir != builddir
-rw-r--r--plugins/a11y-keyboard/Makefile.am2
-rw-r--r--plugins/a11y-settings/Makefile.am2
-rw-r--r--plugins/clipboard/Makefile.am1
-rw-r--r--plugins/cursor/Makefile.am2
-rw-r--r--plugins/dummy/Makefile.am1
-rw-r--r--plugins/housekeeping/Makefile.am2
-rw-r--r--plugins/keyboard/Makefile.am1
-rw-r--r--plugins/media-keys/Makefile.am2
-rw-r--r--plugins/mouse/Makefile.am2
-rw-r--r--plugins/orientation/Makefile.am2
-rw-r--r--plugins/power/Makefile.am1
-rw-r--r--plugins/print-notifications/Makefile.am2
-rw-r--r--plugins/remote-display/Makefile.am2
-rw-r--r--plugins/rfkill/Makefile.am2
-rw-r--r--plugins/screensaver-proxy/Makefile.am2
-rw-r--r--plugins/smartcard/Makefile.am2
-rw-r--r--plugins/sound/Makefile.am2
-rw-r--r--plugins/updates/Makefile.am1
-rw-r--r--plugins/wacom/Makefile.am4
-rw-r--r--plugins/xrandr/Makefile.am2
-rw-r--r--plugins/xsettings/Makefile.am2
21 files changed, 39 insertions, 0 deletions
diff --git a/plugins/a11y-keyboard/Makefile.am b/plugins/a11y-keyboard/Makefile.am
index 5dd66276..e65625c4 100644
--- a/plugins/a11y-keyboard/Makefile.am
+++ b/plugins/a11y-keyboard/Makefile.am
@@ -11,6 +11,7 @@ gsd_test_a11y_keyboard_SOURCES = \
gsd_test_a11y_keyboard_CFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-DGTKBUILDERDIR=\""$(pkgdatadir)"\" \
@@ -37,6 +38,7 @@ liba11y_keyboard_la_SOURCES = \
liba11y_keyboard_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-DGTKBUILDERDIR=\""$(gtkbuilderdir)"\" \
$(AM_CPPFLAGS)
diff --git a/plugins/a11y-settings/Makefile.am b/plugins/a11y-settings/Makefile.am
index c4231437..a779bead 100644
--- a/plugins/a11y-settings/Makefile.am
+++ b/plugins/a11y-settings/Makefile.am
@@ -9,6 +9,7 @@ gsd_test_a11y_settings_SOURCES = \
gsd_test_a11y_settings_CFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
$(PLUGIN_CFLAGS) \
@@ -30,6 +31,7 @@ liba11y_settings_la_SOURCES = \
liba11y_settings_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
$(AM_CPPFLAGS)
diff --git a/plugins/clipboard/Makefile.am b/plugins/clipboard/Makefile.am
index dd3e124e..6fccd8d4 100644
--- a/plugins/clipboard/Makefile.am
+++ b/plugins/clipboard/Makefile.am
@@ -19,6 +19,7 @@ libclipboard_la_SOURCES = \
libclipboard_la_CPPFLAGS = \
$(PLUGIN_CFLAGS) \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
$(AM_CPPFLAGS)
diff --git a/plugins/cursor/Makefile.am b/plugins/cursor/Makefile.am
index 988dfbae..d7666ff9 100644
--- a/plugins/cursor/Makefile.am
+++ b/plugins/cursor/Makefile.am
@@ -10,6 +10,7 @@ libcursor_la_SOURCES = \
libcursor_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common/ \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
$(AM_CPPFLAGS)
@@ -38,6 +39,7 @@ gsd_test_cursor_SOURCES = \
gsd_test_cursor_CPPFLAGS = \
-I$(top_srcdir)/data/ \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
index 792d45d7..9b78fec2 100644
--- a/plugins/dummy/Makefile.am
+++ b/plugins/dummy/Makefile.am
@@ -10,6 +10,7 @@ libdummy_la_SOURCES = \
libdummy_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
$(AM_CPPFLAGS)
diff --git a/plugins/housekeeping/Makefile.am b/plugins/housekeeping/Makefile.am
index 0e21d189..8469185a 100644
--- a/plugins/housekeeping/Makefile.am
+++ b/plugins/housekeeping/Makefile.am
@@ -41,6 +41,7 @@ gsd_test_housekeeping_SOURCES = \
gsd_test_housekeeping_CPPFLAGS = \
-I$(top_srcdir)/data/ \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
@@ -68,6 +69,7 @@ libhousekeeping_la_SOURCES = \
libhousekeeping_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
$(AM_CPPFLAGS)
diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am
index 7addef82..88802e9d 100644
--- a/plugins/keyboard/Makefile.am
+++ b/plugins/keyboard/Makefile.am
@@ -23,6 +23,7 @@ libkeyboard_la_SOURCES = \
libkeyboard_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/data \
-I$(top_srcdir)/plugins/common \
-DDATADIR=\""$(pkgdatadir)"\" \
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index 28d1c371..63d3219a 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -46,6 +46,7 @@ libmedia_keys_la_SOURCES = \
libmedia_keys_la_CPPFLAGS = \
-I$(top_srcdir)/data/ \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-I$(top_srcdir)/plugins/media-keys/gvc \
-DBINDIR=\"$(bindir)\" \
@@ -93,6 +94,7 @@ gsd_test_media_keys_SOURCES = \
gsd_test_media_keys_CPPFLAGS = \
-I$(top_srcdir)/data/ \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-I$(top_srcdir)/plugins/media-keys/gvc \
-DBINDIR=\"$(bindir)\" \
diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am
index 514b6f40..a22d6c96 100644
--- a/plugins/mouse/Makefile.am
+++ b/plugins/mouse/Makefile.am
@@ -9,6 +9,7 @@ libmouse_la_SOURCES = \
libmouse_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common/ \
-I$(top_srcdir)/data/ \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
@@ -61,6 +62,7 @@ gsd_test_mouse_SOURCES = \
gsd_test_mouse_CPPFLAGS = \
-I$(top_srcdir)/data/ \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
diff --git a/plugins/orientation/Makefile.am b/plugins/orientation/Makefile.am
index 3ece5401..0c061819 100644
--- a/plugins/orientation/Makefile.am
+++ b/plugins/orientation/Makefile.am
@@ -9,6 +9,7 @@ gsd_test_orientation_SOURCES = \
gsd_test_orientation_CFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
$(ORIENTATION_CFLAGS) \
@@ -31,6 +32,7 @@ liborientation_la_SOURCES = \
liborientation_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common/ \
-I$(top_srcdir)/data/ \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
diff --git a/plugins/power/Makefile.am b/plugins/power/Makefile.am
index 42ab1265..00216640 100644
--- a/plugins/power/Makefile.am
+++ b/plugins/power/Makefile.am
@@ -21,6 +21,7 @@ libpower_la_SOURCES = \
libpower_la_CPPFLAGS = \
-I$(top_srcdir)/data/ \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-DGTKBUILDERDIR=\""$(pkgdatadir)"\" \
diff --git a/plugins/print-notifications/Makefile.am b/plugins/print-notifications/Makefile.am
index ce22eb5a..1f11adaf 100644
--- a/plugins/print-notifications/Makefile.am
+++ b/plugins/print-notifications/Makefile.am
@@ -10,6 +10,7 @@ libprint_notifications_la_SOURCES = \
libprint_notifications_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
$(AM_CPPFLAGS) \
@@ -57,6 +58,7 @@ gsd_test_print_notifications_SOURCES = \
gsd_test_print_notifications_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
diff --git a/plugins/remote-display/Makefile.am b/plugins/remote-display/Makefile.am
index c359743a..0e8b46d3 100644
--- a/plugins/remote-display/Makefile.am
+++ b/plugins/remote-display/Makefile.am
@@ -9,6 +9,7 @@ libremote_display_la_SOURCES = \
libremote_display_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
$(AM_CPPFLAGS)
@@ -31,6 +32,7 @@ gsd_test_remote_display_SOURCES = \
gsd_test_remote_display_CPPFLAGS = \
-I$(top_srcdir)/data/ \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
index 73bf107c..0d5cc2d3 100644
--- a/plugins/rfkill/Makefile.am
+++ b/plugins/rfkill/Makefile.am
@@ -12,6 +12,7 @@ gsd_test_rfkill_SOURCES = \
gsd_test_rfkill_CFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
$(PLUGIN_CFLAGS) \
@@ -35,6 +36,7 @@ librfkill_la_SOURCES = \
librfkill_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/data/ \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
diff --git a/plugins/screensaver-proxy/Makefile.am b/plugins/screensaver-proxy/Makefile.am
index 5b5e812c..c6084c63 100644
--- a/plugins/screensaver-proxy/Makefile.am
+++ b/plugins/screensaver-proxy/Makefile.am
@@ -9,6 +9,7 @@ libscreensaver_proxy_la_SOURCES = \
libscreensaver_proxy_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
$(AM_CPPFLAGS)
@@ -31,6 +32,7 @@ gsd_test_screensaver_proxy_SOURCES = \
gsd_test_screensaver_proxy_CPPFLAGS = \
-I$(top_srcdir)/data/ \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
diff --git a/plugins/smartcard/Makefile.am b/plugins/smartcard/Makefile.am
index b0e972bc..e0b85f38 100644
--- a/plugins/smartcard/Makefile.am
+++ b/plugins/smartcard/Makefile.am
@@ -37,6 +37,7 @@ gsd_test_smartcard_SOURCES = \
gsd_test_smartcard_CPPFLAGS = \
-I$(top_srcdir)/data/ \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DLIBDIR=\""$(libdir)"\" \
@@ -72,6 +73,7 @@ libsmartcard_la_SOURCES = \
libsmartcard_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-I$(top_srcdir)/plugins/common \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
diff --git a/plugins/sound/Makefile.am b/plugins/sound/Makefile.am
index ee66f6dc..e7dce725 100644
--- a/plugins/sound/Makefile.am
+++ b/plugins/sound/Makefile.am
@@ -9,6 +9,7 @@ gsd_test_sound_SOURCES = \
gsd_test_sound_CFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
$(SOUND_CFLAGS) \
@@ -32,6 +33,7 @@ libsound_la_SOURCES = \
libsound_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
$(AM_CPPFLAGS)
diff --git a/plugins/updates/Makefile.am b/plugins/updates/Makefile.am
index d921401b..cbba81f7 100644
--- a/plugins/updates/Makefile.am
+++ b/plugins/updates/Makefile.am
@@ -15,6 +15,7 @@ libupdates_la_SOURCES = \
libupdates_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
$(AM_CPPFLAGS)
diff --git a/plugins/wacom/Makefile.am b/plugins/wacom/Makefile.am
index 7ba81645..01ee14a4 100644
--- a/plugins/wacom/Makefile.am
+++ b/plugins/wacom/Makefile.am
@@ -20,6 +20,7 @@ libgsdwacom_la_SOURCES = \
libgsdwacom_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common/ \
-I$(top_srcdir)/data/ \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
@@ -106,6 +107,7 @@ gsd_test_wacom_SOURCES = \
gsd_test_wacom_CPPFLAGS = \
-I$(top_srcdir)/data/ \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DBINDIR=\"$(bindir)\" \
-DPIXMAPDIR=\""$(pkgdatadir)"\" \
@@ -137,6 +139,7 @@ gsd_list_wacom_SOURCES = \
gsd_list_wacom_CPPFLAGS = \
-I$(top_srcdir)/data/ \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DBINDIR=\"$(bindir)\" \
-DPIXMAPDIR=\""$(pkgdatadir)"\" \
@@ -172,6 +175,7 @@ gsd_test_wacom_osd_SOURCES = \
gsd_test_wacom_osd_CPPFLAGS = \
-I$(top_srcdir)/data/ \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DBINDIR=\"$(bindir)\" \
-DPIXMAPDIR=\""$(pkgdatadir)"\" \
diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am
index 3277a3ee..f6bf4fe1 100644
--- a/plugins/xrandr/Makefile.am
+++ b/plugins/xrandr/Makefile.am
@@ -39,6 +39,7 @@ gsd_test_xrandr_SOURCES = \
gsd_test_xrandr_CPPFLAGS = \
-I$(top_srcdir)/data/ \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
@@ -67,6 +68,7 @@ libxrandr_la_SOURCES = \
libxrandr_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/data/ \
-I$(top_srcdir)/plugins/common/ \
-DBINDIR=\"$(bindir)\" \
diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am
index 194b4bb3..467fc850 100644
--- a/plugins/xsettings/Makefile.am
+++ b/plugins/xsettings/Makefile.am
@@ -21,6 +21,7 @@ test_gtk_modules_LDADD = \
test_gtk_modules_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/data/ \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-DGTK_MODULES_DIRECTORY=\""$(libdir)/gnome-settings-daemon-@GSD_API_VERSION@/gtk-modules/"\" \
@@ -65,6 +66,7 @@ libxsettings_la_SOURCES = \
libxsettings_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/data/ \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-DGTK_MODULES_DIRECTORY=\""$(libdir)/gnome-settings-daemon-@GSD_API_VERSION@/gtk-modules/"\" \