[gnome-software] Spruce up the building of resources
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] Spruce up the building of resources
- Date: Thu, 15 Aug 2013 12:06:22 +0000 (UTC)
commit 9a509feb592288d5b211fe8e2087943b1512c8e3
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Aug 15 08:05:44 2013 -0400
Spruce up the building of resources
glib-compile-resources can generate dependencies for us,
so use that. Also, use the standard macro for the binary.
configure.ac | 1 +
src/Makefile.am | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 429ef87..d7f9415 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,6 +65,7 @@ GETTEXT_PACKAGE=AC_PACKAGE_NAME
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE(GETTEXT_PACKAGE, "AC_PACKAGE_NAME", [gnome-software])
+AM_PATH_GLIB_2_0
AM_GLIB_GNU_GETTEXT
GLIB_GSETTINGS
diff --git a/src/Makefile.am b/src/Makefile.am
index 6b67614..6d398a4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,10 +52,11 @@ gnome_software_LDADD = \
gnome_software_CFLAGS = \
$(WARNINGFLAGS_C)
-gs-resources.c: gnome-software.gresource.xml $(srcdir)/gnome-software.ui
- glib-compile-resources --sourcedir=$(srcdir) --target=$@ --generate-source --c-name gs
$(srcdir)/gnome-software.gresource.xml
-gs-resources.h: gnome-software.gresource.xml
- glib-compile-resources --sourcedir=$(srcdir) --target=$@ --generate-header --c-name gs
$(srcdir)/gnome-software.gresource.xml
+gs-resources.c: gnome-software.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)
--generate-dependencies $(srcdir)/gnome-software.gresource.xml)
+ $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --target=$@ --generate-source --c-name gs
$(srcdir)/gnome-software.gresource.xml
+
+gs-resources.h: gnome-software.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)
--generate-dependencies $(srcdir)/gnome-software.gresource.xml)
+ $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --target=$@ --generate-header --c-name gs
$(srcdir)/gnome-software.gresource.xml
BUILT_SOURCES = \
gs-resources.c \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]