summaryrefslogtreecommitdiff
path: root/demos/gtk-demo
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2012-05-13 20:00:27 +0200
committerCosimo Cecchi <cosimoc@gnome.org>2012-05-30 13:17:22 -0400
commit45d03130015ec456ac30f600e84121b8ee99a48d (patch)
tree0586eb7d433634a8b57796bc84fe4df44bae90ea /demos/gtk-demo
parent04e8a8a5ed61afe2c98e174acc3a2861b3702299 (diff)
downloadgtk+-45d03130015ec456ac30f600e84121b8ee99a48d.tar.gz
gtk-demo: Rename resources file
More tests want to use resources, so make that possible.
Diffstat (limited to 'demos/gtk-demo')
-rw-r--r--demos/gtk-demo/Makefile.am10
-rw-r--r--demos/gtk-demo/demo.gresource.xml (renamed from demos/gtk-demo/application.gresource.xml)0
2 files changed, 5 insertions, 5 deletions
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 820ed51d89..392eec8ddc 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -71,12 +71,12 @@ LDADDS = \
bin_PROGRAMS = gtk3-demo gtk3-demo-application
-BUILT_SOURCES = demos.h application_resources.c
+BUILT_SOURCES = demos.h demo_resources.c
EXTRA_DIST += \
$(IMAGEFILES) \
demo.ui \
- application.gresource.xml \
+ demo.gresource.xml \
application.ui \
menus.ui \
theming.ui \
@@ -105,12 +105,12 @@ gtk3_demo_LDFLAGS = -export-dynamic
gtk3_demo_application_SOURCES = \
application-standalone.c \
- application_resources.c
+ demo_resources.c
gtk3_demo_application_LDADD = $(LDADDS)
-application_resources.c: application.gresource.xml gtk-logo-24.png gtk-logo-48.png application.ui menus.ui
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/application.gresource.xml
+demo_resources.c: demo.gresource.xml gtk-logo-24.png gtk-logo-48.png application.ui menus.ui
+ $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/demo.gresource.xml
IMAGEFILES= alphatest.png \
apple-red.png \
diff --git a/demos/gtk-demo/application.gresource.xml b/demos/gtk-demo/demo.gresource.xml
index d4a5aeca16..d4a5aeca16 100644
--- a/demos/gtk-demo/application.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml