[gedit/wip/non-recursive-make: 2/2] Make pixmaps/ non-recursively

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

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

    Make pixmaps/ non-recursively

 Makefile.am         |    3 ++-
 configure.ac        |    1 -
 pixmaps/Makefile.am |   11 +++--------
 3 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5ecc7a5..8da330b 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 docs tests win32 osx
+SUBDIRS = libgd gedit po plugins docs tests win32 osx
 
 if !OS_OSX
 SUBDIRS += help
@@ -85,6 +85,7 @@ gsettings_SCHEMAS =
 dist_gsettingsschema_DATA =
 
 include data/Makefile.am
+include pixmaps/Makefile.am
 
 EXTRA_DIST += $(gsettings_SCHEMAS:.gschema.xml=.gschema.xml.in)
 CLEANFILES += $(gsettings_SCHEMAS)
diff --git a/configure.ac b/configure.ac
index 46d4c59..911b49b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -445,7 +445,6 @@ docs/reference/Makefile
 gedit/Makefile
 help/Makefile
 libgd/Makefile
-pixmaps/Makefile
 plugins/Makefile
 plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml.in
 plugins/checkupdate/Makefile
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index c9dadf1..c39b8ea 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -1,9 +1,4 @@
-logodir = $(datadir)/gedit/logo
-logo_DATA = gedit-logo.png
+pixmaps_logodir = $(datadir)/gedit/logo
+dist_pixmaps_logo_DATA = pixmaps/gedit-logo.png
 
-EXTRA_DIST = \
-       $(icon_DATA) \
-       $(logo_DATA) \
-       gedit.ico
-
--include $(top_srcdir)/git.mk
+EXTRA_DIST += pixmaps/gedit.ico