[gnome-initial-setup] build: Avoid warning for duplicate variable definition



commit fe0205e8f8b2178a181e66c2eb02591c075276b0
Author: Michael Wood <michael g wood intel com>
Date:   Mon Jan 28 18:51:58 2013 +0000

    build: Avoid warning for duplicate variable definition
    
    Avoid re-declaring resource_files

 gnome-initial-setup/pages/location/Makefile.am |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/gnome-initial-setup/pages/location/Makefile.am b/gnome-initial-setup/pages/location/Makefile.am
index 361c2d3..89bb0ce 100644
--- a/gnome-initial-setup/pages/location/Makefile.am
+++ b/gnome-initial-setup/pages/location/Makefile.am
@@ -25,10 +25,10 @@ cc-datetime-resources.h: datetime.gresource.xml $(resource_files)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $<
 BUILT_SOURCES += cc-datetime-resources.c cc-datetime-resources.h
 
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/location.gresource.xml)
-location-resources.c: location.gresource.xml $(resource_files)
+resource_files_location = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/location.gresource.xml)
+location-resources.c: location.gresource.xml $(resource_files_location)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
-location-resources.h: location.gresource.xml $(resource_files)
+location-resources.h: location.gresource.xml $(resource_files_location)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $<
 BUILT_SOURCES += location-resources.c location-resources.h
 
@@ -45,4 +45,5 @@ libgislocation_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined
 EXTRA_DIST =				\
 	timedated1-interface.xml	\
 	$(resource_files)		\
+	$(resource_files_location)	\
 	datetime.gresource.xml



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]