[gedit/wip/non-recursive-make] Make data/ non-recursively

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

commit 50486f4b14f2390577f8f6b992459fbd3c26f534
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Sun Jan 12 01:12:01 2014 +0100

    Make data/ non-recursively

 Makefile.am      |   16 ++++++++++-
 configure.ac     |    1 -
 data/Makefile.am |   80 +++++++++++++++++++++--------------------------------
 3 files changed, 47 insertions(+), 50 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 25fe07a..fa3f7ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
 
-SUBDIRS = libgd gedit pixmaps po plugins data docs tests win32 osx
+SUBDIRS = libgd gedit pixmaps po plugins docs tests win32 osx
 
 if !OS_OSX
 SUBDIRS += help
@@ -79,6 +79,20 @@ MAINTAINERCLEANFILES =               \
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc
 
+gsettings_SCHEMAS =
+dist_gsettingsschema_DATA =
+
+include data/Makefile.am
+
+EXTRA_DIST += $(gsettings_SCHEMAS:.gschema.xml=.gschema.xml.in)
+CLEANFILES += $(gsettings_SCHEMAS)
+DISTCLEANFILES += $(gsettings_SCHEMAS)
+MAINTAINERCLEANFILES += $(gsettings_SCHEMAS:.xml=.valid)
+
+ INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_XML_RULE@
+ GSETTINGS_RULES@
+
 CHANGELOG_START = GEDIT_2_26_1
 
 dist-hook:
diff --git a/configure.ac b/configure.ac
index 12fd70f..46d4c59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -440,7 +440,6 @@ Makefile
 data/gedit.desktop.in
 data/gedit.pc
 data/org.gnome.gedit.gschema.xml
-data/Makefile
 docs/Makefile
 docs/reference/Makefile
 gedit/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 5d8564d..c4d9a76 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,72 +1,56 @@
-desktopdir      = $(datadir)/applications
-desktop_in_files = gedit.desktop.in
-desktop_DATA    = $(desktop_in_files:.desktop.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
+data_desktopdir = $(datadir)/applications
+data_desktop_in_files = data/gedit.desktop.in
+data_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
- INTLTOOL_XML_RULE@
+data_appdatadir = $(datadir)/appdata
+data_appdata_in_files = data/gedit.appdata.xml.in
+data_appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = gedit.appdata.xml.in
+data_servicedir = $(datadir)/dbus-1/services
+data_service_in_files = data/org.gnome.gedit.service.in
+data_service_DATA = $(service_in_files:.service.in=.service)
 
-servicedir = $(datadir)/dbus-1/services
-service_in_files = org.gnome.gedit.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-$(service_DATA): $(service_in_files) Makefile
+$(data_service_DATA): $(data_service_in_files) Makefile
        @sed -e "s|\ bindir\@|$(bindir)|" $<> $@
 
-man_MANS = gedit.1
+dist_man_MANS = data/gedit.1
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gedit.pc
+data_pkgconfigdir = $(libdir)/pkgconfig
+data_pkgconfig_DATA = data/gedit.pc
 
-bugreportdir = $(libexecdir)/gedit
-dist_bugreport_SCRIPTS = gedit-bugreport.sh
+data_bugreportdir = $(libexecdir)/gedit
+dist_data_bugreport_SCRIPTS = data/gedit-bugreport.sh
 
 gsettings_ENUM_NAMESPACE = org.gnome.gedit
 gsettings_ENUM_FILES = $(top_srcdir)/gedit/*.h
-gsettings_SCHEMAS = org.gnome.gedit.gschema.xml
 
- GSETTINGS_RULES@
+gsettings_SCHEMAS += data/org.gnome.gedit.gschema.xml
 
 if OS_OSX
-gsettingsschema_DATA = gedit-osx.gschema.override
+dist_gsettingsschema_DATA += data/gedit-osx.gschema.override
 endif
 
-convertdir = $(datadir)/GConf/gsettings
-convert_DATA = gedit.convert
+data_convertdir = $(datadir)/GConf/gsettings
+dist_data_convert_DATA = data/gedit.convert
 
 if OS_OSX
-geditdatadir = $(datadir)/gedit
-geditdata_DATA = osx.accels osx.css
+data_geditdatadir = $(datadir)/gedit
+dist_data_geditdata_DATA = osx.accels osx.css
 endif
 
 EXTRA_DIST =                                   \
-       $(desktop_in_files)                     \
-       $(appdata_in_files)                     \
-       $(service_in_files)                     \
-       $(man_MANS)                             \
-       gedit.pc.in                             \
-       org.gnome.gedit.gschema.xml.in          \
-       gedit.convert                           \
-       osx.accels                              \
-       osx.css                                 \
-       gedit-osx.gschema.override
+       $(data_desktop_in_files)                \
+       $(data_appdata_in_files)                \
+       $(data_service_in_files)                \
+       data/gedit.pc.in
 
 CLEANFILES =                           \
-       $(appdata_DATA)                 \
-       $(desktop_DATA)                 \
-       $(service_DATA)                 \
-       $(pkgconfig_DATA)               \
-       $(gsettings_SCHEMAS)
+       $(data_appdata_DATA)            \
+       $(data_desktop_DATA)            \
+       $(data_service_DATA)            \
+       $(data_pkgconfig_DATA)
 
 DISTCLEANFILES =                       \
-       $(desktop_DATA)                 \
-       $(service_DATA)                 \
-       $(pkgconfig_DATA)               \
-       $(gsettings_SCHEMAS)
-
-MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
-
--include $(top_srcdir)/git.mk
+       $(data_desktop_DATA)            \
+       $(data_service_DATA)            \
+       $(data_pkgconfig_DATA)