[gitg] Use non-recursive make to build data

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 7373ce01eade577cdd14d6b271d7b5a68dbbd947
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Sat Jan 4 15:33:31 2014 +0100

    Use non-recursive make to build data

 Makefile.am            |   20 +++++++++++++-------
 configure.ac           |    2 --
 data/Makefile.am       |   47 ++++++++++++++++++-----------------------------
 data/icons/Makefile.am |   39 ++++++++++++++++++---------------------
 4 files changed, 49 insertions(+), 59 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c965b18..a5ef7a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
 
-SUBDIRS = libgd data po tests
+SUBDIRS = libgd po tests
 
 DISTCLEANFILES = \
        intltool-extract \
@@ -78,20 +78,26 @@ GRESDEPS = $(srcdir)/$1 $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencie
 
 GRESGEN = $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target="$@" --sourcedir="$(dir $<)" --generate-source "$<"
 
-noinst_HEADERS  =
-GITIGNOREFILES  =
-CLEANFILES      =
-lib_LTLIBRARIES =
-bin_PROGRAMS    =
-SCALABLE_ICONS  =
+noinst_HEADERS    =
+GITIGNOREFILES    =
+CLEANFILES        =
+lib_LTLIBRARIES   =
+bin_PROGRAMS      =
+SCALABLE_ICONS    =
+gsettings_SCHEMAS =
 
 include libgitg/Makefile.am
 include libgitg-ext/Makefile.am
 include plugins/Makefile.am
 include gitg/Makefile.am
+include data/Makefile.am
 
 include icons.mk
 
+ INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_XML_NOMERGE_RULE@
+ GSETTINGS_RULES@
+
 %.typelib: %.gir
        $(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) --includedir=. -o $@ $<
 
diff --git a/configure.ac b/configure.ac
index ffb7183..421ff24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -287,9 +287,7 @@ Makefile
 libgd/Makefile
 libgitg/libgitg-1.0.pc
 libgitg-ext/libgitg-ext-1.0.pc
-data/Makefile
 data/gitg.desktop.in
-data/icons/Makefile
 data/org.gnome.gitg.gschema.xml.in
 po/Makefile.in
 tests/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index cd2fb32..c49af01 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,40 +1,29 @@
-SUBDIRS = icons
+data_desktopdir = $(datadir)/applications
+data_desktop_in_files = data/gitg.desktop.in
+data_desktop_DATA = $(data_desktop_in_files:.desktop.in=.desktop)
 
-desktopdir      = $(datadir)/applications
-desktop_in_files = gitg.desktop.in
-desktop_DATA    = $(desktop_in_files:.desktop.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
+data_appdatadir = $(datadir)/appdata
+data_appdata_DATA = data/gitg.appdata.xml
 
-appdatadir = $(datadir)/appdata
-appdata_DATA = gitg.appdata.xml
+data_mandir = $(mandir)
+data_man_MANS = data/gitg.1
 
-man_MANS = gitg.1
-
-gsettings_SCHEMAS = org.gnome.gitg.gschema.xml
+gsettings_SCHEMAS += data/org.gnome.gitg.gschema.xml
 
 if GLADE_CATALOG
-catalogdir = $(GLADE_CATALOG_DIR)
-dist_catalog_DATA = gitg-glade.xml
+data_catalogdir = $(GLADE_CATALOG_DIR)
+dist_data_catalog_DATA = data/gitg-glade.xml
 endif
 
- INTLTOOL_XML_NOMERGE_RULE@
-
- GSETTINGS_RULES@
-
-EXTRA_DIST =                           \
-       $(desktop_in_files)             \
-       $(man_MANS)                     \
-       gitg.appdata.xml                \
-       org.gnome.gitg.gschema.xml.in.in
-
-CLEANFILES =                           \
-       $(desktop_DATA)                 \
-       $(gsettings_SCHEMAS)
+EXTRA_DIST +=                                  \
+       $(data_desktop_in_files)                \
+       $(data_man_MANS)                        \
+       data/gitg.appdata.xml                   \
+       data/org.gnome.gitg.gschema.xml.in.in
 
-DISTCLEANFILES =                       \
-       $(desktop_DATA)                 \
-       $(gsettings_SCHEMAS)
+CLEANFILES += $(data_desktop_DATA)
+DISTCLEANFILES += $(data_desktop_DATA)
 
--include $(top_srcdir)/git.mk
+include data/icons/Makefile.am
 
 # vi:ts=8:noet
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 61377ab..efe3337 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,10 +1,10 @@
-public_icons_themes = \
+data_icons_public_icons_themes = \
        hicolor \
        HighContrastLargePrint \
        HighContrastLargePrintInverse \
        LowContrastLargePrint
 
-public_icons = \
+data_icons_public_icons = \
        hicolor_apps_16x16_gitg.png \
        hicolor_apps_22x22_gitg.png \
        hicolor_apps_24x24_gitg.png \
@@ -13,33 +13,33 @@ public_icons = \
        hicolor_apps_256x256_gitg.png \
        hicolor_apps_512x512_gitg.png
 
-gtk_update_icon_cache = gtk-update-icon-cache -f -t
+data_icons_gtk_update_icon_cache = gtk-update-icon-cache -f -t
 
-update-icon-cache:
+data-icons-update-icon-cache:
        @-if test -z "$(DESTDIR)"; then \
                echo "Updating Gtk icon cache."; \
-               for theme in $(public_icons_themes); do \
-                       $(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
+               for theme in $(data_icons_public_icons_themes); do \
+                       $(data_icons_gtk_update_icon_cache) $(datadir)/icons/$$theme; \
                done; \
        else \
                echo "*** Icon cache not updated.  After (un)install, run this:"; \
-               for theme in $(public_icons_themes); do \
-                       echo "***   $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
+               for theme in $(data_icons_public_icons_themes); do \
+                       echo "***   $(data_icons_gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
                done; \
        fi
 
-install-icons:
-       for icon in $(public_icons); do \
+data-icons-install-icons:
+       for icon in $(data_icons_public_icons); do \
                THEME=`echo $$icon | cut -d_ -f1`; \
                CONTEXT=`echo $$icon | cut -d_ -f2`; \
                SIZE=`echo $$icon | cut -d_ -f3`; \
                ICONFILE=`echo $$icon | cut -d_ -f4`; \
                mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-               $(INSTALL_DATA) $(srcdir)/$$icon 
$(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+               $(INSTALL_DATA) $(srcdir)/data/icons/$$icon 
$(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
        done;
 
-uninstall-icons:
-       -for icon in $(public_icons); do \
+data-icons-uninstall-icons:
+       -for icon in $(data_icons_public_icons); do \
                THEME=`echo $$icon | cut -d_ -f1`; \
                CONTEXT=`echo $$icon | cut -d_ -f2`; \
                SIZE=`echo $$icon | cut -d_ -f3`; \
@@ -47,15 +47,12 @@ uninstall-icons:
                rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
        done;
 
-install-data-local: install-icons
-install-data-hook: update-icon-cache
+install-data-local: data-icons-install-icons
+install-data-hook: data-icons-update-icon-cache
 
-uninstall-local: uninstall-icons
-uninstall-hook: update-icon-cache
+uninstall-local: data-icons-uninstall-icons
+uninstall-hook: data-icons-update-icon-cache
 
-EXTRA_DIST =                           \
-       $(public_icons)
-
--include $(top_srcdir)/git.mk
+EXTRA_DIST += $(data_icons_public_icons)
 
 # vi:ts=8:noet