[gnome-builder] build: cleanup idemm build a bit

[Christian Hergert <chergert src gnome org>]

commit 5269bdfe4701fa24db6dbaf833c75990d50be477
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jun 15 18:43:19 2016 -0400

    build: cleanup idemm build a bit
    
    Use gitignore, cleanup how subdirs work.

 libidemm/.gitignore        |   64 --------------------------------------------
 libidemm/Makefile.am       |   21 +++++++++-----
 libidemm/src/Makefile.am   |    4 +++
 libidemm/tools/Makefile.am |    2 +
 4 files changed, 19 insertions(+), 72 deletions(-)
---
diff --git a/libidemm/Makefile.am b/libidemm/Makefile.am
index f90139d..38d971d 100644
--- a/libidemm/Makefile.am
+++ b/libidemm/Makefile.am
@@ -15,15 +15,8 @@
 
 if ENABLE_IDEMM
 
-srcmm_subdirs = idemm
 idemm_include_HEADERS = idemm.h
 
-if MAINTAINER_MODE
-src_subdirs = src
-else
-src_subdirs =
-endif
-
 # TODO 
 # if ENABLE_DOCUMENTATION
 # doc_subdirs = docs
@@ -31,7 +24,7 @@ endif
 # doc_subdirs =
 # endif
 
-SUBDIRS = tools $(src_subdirs) $(srcmm_subdirs) # $(doc_subdirs)
+SUBDIRS = tools src idemm # $(doc_subdirs)
 
 idemm_includedir = $(includedir)/gnome-builder- VERSION@/$(IDEMM_MODULE_NAME)
 idemm_libincludedir = $(pkglibdir)/$(IDEMM_MODULE_NAME)/include
@@ -41,3 +34,15 @@ pkgconfigdir = $(pkglibdir)/pkgconfig
 pkgconfig_DATA = $(pkgconfig_files)
 
 endif
+
+GITIGNOREFILES = \
+       compile-binding.am \
+       dist-changelog.am \
+       doc-reference.am \
+       generate-binding.am \
+       idemmconfig.h \
+       stamp-h2 \
+       $(NULL)
+
+
+-include $(top_srcdir)/git.mk
diff --git a/libidemm/src/Makefile.am b/libidemm/src/Makefile.am
index 4c5e67b..93db830 100644
--- a/libidemm/src/Makefile.am
+++ b/libidemm/src/Makefile.am
@@ -1,3 +1,4 @@
+if MAINTAINER_MODE
 if ENABLE_IDEMM
 
 binding_name    = idemm
@@ -14,3 +15,6 @@ files_hg   = $(idemm_files_hg)
 include $(top_srcdir)/libidemm/generate-binding.am
 
 endif
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/libidemm/tools/Makefile.am b/libidemm/tools/Makefile.am
index 0393cfe..cb0ee75 100644
--- a/libidemm/tools/Makefile.am
+++ b/libidemm/tools/Makefile.am
@@ -24,3 +24,5 @@ AM_CPPFLAGS = \
        -I$(top_builddir)/contrib/pnl
 
 endif
+
+-include $(top_srcdir)/git.mk