[gnome-control-center] panels: add --sourcedir=$(srcdir) when generating resource list

From: Cosimo Cecchi <cosimoc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-control-center] panels: add --sourcedir=$(srcdir) when generating resource list
Date: Mon, 7 Jan 2013 21:24:48 +0000 (UTC)
commit 8d5f2908b555fd862e22e96cd6ea2343065d9e47
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Jan 7 16:09:44 2013 -0500

    panels: add --sourcedir=$(srcdir) when generating resource list
    
    Like b8e93fb3334d605564672272259c8492072a521a but for all panels.

 panels/background/Makefile.am       |    2 +-
 panels/bluetooth/Makefile.am        |    2 +-
 panels/color/Makefile.am            |    2 +-
 panels/common/Makefile.am           |    2 +-
 panels/datetime/Makefile.am         |    2 +-
 panels/display/Makefile.am          |    2 +-
 panels/info/Makefile.am             |    2 +-
 panels/keyboard/Makefile.am         |    2 +-
 panels/mouse/Makefile.am            |    2 +-
 panels/network/Makefile.am          |    2 +-
 panels/notifications/Makefile.am    |    2 +-
 panels/online-accounts/Makefile.am  |    2 +-
 panels/power/Makefile.am            |    2 +-
 panels/privacy/Makefile.am          |    2 +-
 panels/region/Makefile.am           |    2 +-
 panels/screen/Makefile.am           |    2 +-
 panels/search/Makefile.am           |    2 +-
 panels/universal-access/Makefile.am |    2 +-
 panels/user-accounts/Makefile.am    |    2 +-
 panels/wacom/Makefile.am            |    2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
index 15d42f9..5541911 100644
--- a/panels/background/Makefile.am
+++ b/panels/background/Makefile.am
@@ -51,7 +51,7 @@ INCLUDES += $(SOCIALWEB_CFLAGS)
 libbackground_la_LIBADD += $(SOCIALWEB_LIBS)
 endif
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/background.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/background.gresource.xml)
 cc-background-resources.c: background.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_background $<
 cc-background-resources.h: background.gresource.xml $(resource_files)
diff --git a/panels/bluetooth/Makefile.am b/panels/bluetooth/Makefile.am
index 78303b6..93cc6d7 100644
--- a/panels/bluetooth/Makefile.am
+++ b/panels/bluetooth/Makefile.am
@@ -20,7 +20,7 @@ libbluetooth_la_SOURCES =			\
 
 libbluetooth_la_LIBADD = $(PANEL_LIBS) $(BLUETOOTH_LIBS)
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/bluetooth.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/bluetooth.gresource.xml)
 cc-bluetooth-resources.c: bluetooth.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_bluetooth $<
 cc-bluetooth-resources.h: bluetooth.gresource.xml $(resource_files)
diff --git a/panels/color/Makefile.am b/panels/color/Makefile.am
index dfa96df..c6706ba 100644
--- a/panels/color/Makefile.am
+++ b/panels/color/Makefile.am
@@ -22,7 +22,7 @@ libcolor_la_SOURCES =		\
 
 libcolor_la_LIBADD = $(PANEL_LIBS) $(COLOR_PANEL_LIBS)
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/color.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/color.gresource.xml)
 cc-color-resources.c: color.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_color $<
 cc-color-resources.h: color.gresource.xml $(resource_files)
diff --git a/panels/common/Makefile.am b/panels/common/Makefile.am
index 26e40a8..d8abed3 100644
--- a/panels/common/Makefile.am
+++ b/panels/common/Makefile.am
@@ -32,7 +32,7 @@ list_languages_SOURCES = list-languages.c
 list_languages_LDADD = liblanguage.la
 list_languages_CFLAGS = $(LIBLANGUAGE_CFLAGS)
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/common.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/common.gresource.xml)
 cc-common-resources.c: common.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_common $<
 cc-common-resources.h: common.gresource.xml $(resource_files)
diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am
index d9b9821..fc85592 100644
--- a/panels/datetime/Makefile.am
+++ b/panels/datetime/Makefile.am
@@ -69,7 +69,7 @@ timedated.h: Makefile.am timedated1-interface.xml
 		$(srcdir)/timedated1-interface.xml
 
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/datetime.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/datetime.gresource.xml)
 cc-datetime-resources.c: datetime.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_datetime $<
 cc-datetime-resources.h: datetime.gresource.xml $(resource_files)
diff --git a/panels/display/Makefile.am b/panels/display/Makefile.am
index 2110136..d569e45 100644
--- a/panels/display/Makefile.am
+++ b/panels/display/Makefile.am
@@ -18,7 +18,7 @@ libdisplay_la_SOURCES =		\
 
 libdisplay_la_LIBADD = $(PANEL_LIBS) $(DISPLAY_PANEL_LIBS)
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/display.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/display.gresource.xml)
 cc-display-resources.c: display.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_display $<
 cc-display-resources.h: display.gresource.xml $(resource_files)
diff --git a/panels/info/Makefile.am b/panels/info/Makefile.am
index 541fc9e..4923057 100644
--- a/panels/info/Makefile.am
+++ b/panels/info/Makefile.am
@@ -34,7 +34,7 @@ libinfo_la_SOURCES =		\
 
 libinfo_la_LIBADD = $(PANEL_LIBS) $(INFO_PANEL_LIBS)
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/info.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/info.gresource.xml)
 cc-info-resources.c: info.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_info $<
 cc-info-resources.h: info.gresource.xml $(resource_files)
diff --git a/panels/keyboard/Makefile.am b/panels/keyboard/Makefile.am
index 667fe98..bd9faea 100644
--- a/panels/keyboard/Makefile.am
+++ b/panels/keyboard/Makefile.am
@@ -25,7 +25,7 @@ libkeyboard_la_SOURCES =   \
 libkeyboard_la_CFLAGS = $(PANEL_CFLAGS) $(KEYBOARD_PANEL_CFLAGS) -I$(top_srcdir)/panels/common/
 libkeyboard_la_LIBADD = $(PANEL_LIBS) $(KEYBOARD_PANEL_LIBS)
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/keyboard.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/keyboard.gresource.xml)
 cc-keyboard-resources.c: keyboard.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_keyboard $<
 cc-keyboard-resources.h: keyboard.gresource.xml $(resource_files)
diff --git a/panels/mouse/Makefile.am b/panels/mouse/Makefile.am
index 20a26eb..6831eb3 100644
--- a/panels/mouse/Makefile.am
+++ b/panels/mouse/Makefile.am
@@ -37,7 +37,7 @@ noinst_PROGRAMS = test-gnome-mouse-test
 test_gnome_mouse_test_CPPFLAGS = $(INCLUDES)
 test_gnome_mouse_test_LDADD = $(PANEL_LIBS) $(MOUSE_PANEL_LIBS)
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/mouse.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/mouse.gresource.xml)
 cc-mouse-resources.c: mouse.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_mouse $<
 cc-mouse-resources.h: mouse.gresource.xml $(resource_files)
diff --git a/panels/network/Makefile.am b/panels/network/Makefile.am
index 2e07282..aa9f4e1 100644
--- a/panels/network/Makefile.am
+++ b/panels/network/Makefile.am
@@ -57,7 +57,7 @@ libnetwork_la_SOURCES =					\
 
 libnetwork_la_LIBADD = $(PANEL_LIBS) $(NETWORK_PANEL_LIBS) $(NETWORK_MANAGER_LIBS)
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/network.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/network.gresource.xml)
 cc-network-resources.c: network.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_network $<
 cc-network-resources.h: network.gresource.xml $(resource_files)
diff --git a/panels/notifications/Makefile.am b/panels/notifications/Makefile.am
index 0135b04..e51272e 100644
--- a/panels/notifications/Makefile.am
+++ b/panels/notifications/Makefile.am
@@ -21,7 +21,7 @@ libnotifications_la_SOURCES =		\
 
 libnotifications_la_LIBADD = $(NOTIFICATIONS_PANEL_LIBS) $(PANEL_LIBS)
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/notifications.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/notifications.gresource.xml)
 cc-notifications-resources.c: notifications.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_notifications $<
 cc-notifications-resources.h: notifications.gresource.xml $(resource_files)
diff --git a/panels/online-accounts/Makefile.am b/panels/online-accounts/Makefile.am
index 4ad9eb9..14271c8 100644
--- a/panels/online-accounts/Makefile.am
+++ b/panels/online-accounts/Makefile.am
@@ -26,7 +26,7 @@ libonline_accounts_la_SOURCES =		\
 libonline_accounts_la_LIBADD = $(PANEL_LIBS) $(ONLINE_ACCOUNTS_PANEL_LIBS)
 libonline_accounts_la_LDFLAGS = $(PANEL_LDFLAGS)
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/online-accounts.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/online-accounts.gresource.xml)
 cc-online-accounts-resources.c: online-accounts.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_online_accounts $<
 cc-online-accounts-resources.h: online-accounts.gresource.xml $(resource_files)
diff --git a/panels/power/Makefile.am b/panels/power/Makefile.am
index 79d5988..6c7c3f2 100644
--- a/panels/power/Makefile.am
+++ b/panels/power/Makefile.am
@@ -32,7 +32,7 @@ INCLUDES += $(NETWORK_MANAGER_CFLAGS)
 libpower_la_LIBADD += $(NETWORK_MANAGER_LIBS)
 endif
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/power.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/power.gresource.xml)
 cc-power-resources.c: power.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_power $<
 cc-power-resources.h: power.gresource.xml $(resource_files)
diff --git a/panels/privacy/Makefile.am b/panels/privacy/Makefile.am
index 0e7d98d..52aa54a 100644
--- a/panels/privacy/Makefile.am
+++ b/panels/privacy/Makefile.am
@@ -20,7 +20,7 @@ libprivacy_la_SOURCES =		\
 
 libprivacy_la_LIBADD = $(PANEL_LIBS) $(PRIVACY_PANEL_LIBS)
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/privacy.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/privacy.gresource.xml)
 cc-privacy-resources.c: privacy.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_privacy $<
 cc-privacy-resources.h: privacy.gresource.xml $(resource_files)
diff --git a/panels/region/Makefile.am b/panels/region/Makefile.am
index f66f5ef..8f6a6cb 100644
--- a/panels/region/Makefile.am
+++ b/panels/region/Makefile.am
@@ -30,7 +30,7 @@ libregion_la_SOURCES =	\
 
 libregion_la_LIBADD = $(PANEL_LIBS) $(REGION_PANEL_LIBS) $(builddir)/../common/liblanguage.la
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/region.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/region.gresource.xml)
 cc-region-resources.c: region.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_region $<
 cc-region-resources.h: region.gresource.xml $(resource_files)
diff --git a/panels/screen/Makefile.am b/panels/screen/Makefile.am
index 26bad74..0896ea8 100644
--- a/panels/screen/Makefile.am
+++ b/panels/screen/Makefile.am
@@ -19,7 +19,7 @@ libscreen_la_SOURCES =		\
 
 libscreen_la_LIBADD = $(PANEL_LIBS) $(SCREEN_PANEL_LIBS)
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/screen.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/screen.gresource.xml)
 cc-screen-resources.c: screen.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_screen $<
 cc-screen-resources.h: screen.gresource.xml $(resource_files)
diff --git a/panels/search/Makefile.am b/panels/search/Makefile.am
index fd23321..a66a875 100644
--- a/panels/search/Makefile.am
+++ b/panels/search/Makefile.am
@@ -23,7 +23,7 @@ libsearch_la_SOURCES =		\
 
 libsearch_la_LIBADD = $(PANEL_LIBS) $(SEARCH_PANEL_LIBS)
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/search.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/search.gresource.xml)
 cc-search-resources.c: search.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_search $<
 cc-search-resources.h: search.gresource.xml $(resource_files)
diff --git a/panels/universal-access/Makefile.am b/panels/universal-access/Makefile.am
index 62a990c..da5b25d 100644
--- a/panels/universal-access/Makefile.am
+++ b/panels/universal-access/Makefile.am
@@ -22,7 +22,7 @@ libuniversal_access_la_SOURCES =		\
 
 libuniversal_access_la_LIBADD = $(PANEL_LIBS) $(UNIVERSAL_ACCESS_PANEL_LIBS)
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/universal-access.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/universal-access.gresource.xml)
 cc-ua-resources.c: universal-access.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_universal_access $<
 cc-ua-resources.h: universal-access.gresource.xml $(resource_files)
diff --git a/panels/user-accounts/Makefile.am b/panels/user-accounts/Makefile.am
index 9debce4..b7aac2e 100644
--- a/panels/user-accounts/Makefile.am
+++ b/panels/user-accounts/Makefile.am
@@ -74,7 +74,7 @@ um-realm-generated.c: $(srcdir)/data/org.freedesktop.realmd.xml
 		--c-generate-object-manager $<
 um-realm-generated.h: um-realm-generated.c
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/user-accounts.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/user-accounts.gresource.xml)
 um-resources.c: user-accounts.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name um $<
 um-resources.h: user-accounts.gresource.xml $(resource_files)
diff --git a/panels/wacom/Makefile.am b/panels/wacom/Makefile.am
index 0c23db4..a37ecdb 100644
--- a/panels/wacom/Makefile.am
+++ b/panels/wacom/Makefile.am
@@ -58,7 +58,7 @@ test_wacom_SOURCES =			\
 test_wacom_CPPFLAGS = $(INCLUDES)
 test_wacom_LDADD = $(PANEL_LIBS) $(WACOM_PANEL_LIBS) $(builddir)/calibrator/libwacom-calibrator.la
 
-resource_files = $(shell glib-compile-resources --generate-dependencies $(srcdir)/wacom.gresource.xml)
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/wacom.gresource.xml)
 cc-wacom-resources.c: wacom.gresource.xml $(resource_files)
 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_wacom $<
 cc-wacom-resources.h: wacom.gresource.xml $(resource_files)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]