[shotwell] Update git.mk use

[Jens Georg <jensgeorg src gnome org>]

commit 1a24435b8d23f180d92ca957a86542badb699908
Author: Jens Georg <mail jensge org>
Date:   Mon Jul 18 19:51:14 2016 +0200

    Update git.mk use
    
    Signed-off-by: Jens Georg <mail jensge org>

 .gitignore            |  315 -------------------------------------------------
 Makefile.am           |   12 ++-
 app-icons/Makefile.am |    2 +
 help/Makefile.am      |    2 +
 icons/Makefile.am     |    2 +
 misc/Makefile.am      |    2 +
 test/.gitignore       |    1 -
 ui/Makefile.am        |    2 +
 8 files changed, 21 insertions(+), 317 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 6c760c1..a2d2eec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,9 +20,19 @@ AUTHORS:
 dist-hook: dist-ChangeLog
        find $(distdir) -name "*.c" -o -name "shotwell*.h" -o -name "shotwell*.vapi" -o -name "*vala.stamp" 
-exec rm {} \;
 
+INTAINERCLEANFILES = \
+       $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
+       $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
+       $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL)
+
 GITIGNOREFILES = \
-       **/*.swp \
+       ABOUT-NLS \
+       plugins/**/*.h \
+       plugins/**/*.vapi \
+       **/*.sw[nop] \
+       **/*~ \
        *.o \
+       m4/* \
        aclocal.m4 \
        build-aux \
        ChangeLog \
diff --git a/app-icons/Makefile.am b/app-icons/Makefile.am
index c301a24..703705c 100644
--- a/app-icons/Makefile.am
+++ b/app-icons/Makefile.am
@@ -37,3 +37,5 @@ uninstall-update-icon-cache:
                $(AM_V_at)$(POST_UNINSTALL)
                        test -n "$(DESTDIR)" || $(UPDATE_ICON_CACHE) "$(iconthemedir)"
 
+
+-include $(top_srcdir)/git.mk
diff --git a/help/Makefile.am b/help/Makefile.am
index 12dff81..53c1448 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -55,3 +55,5 @@ HELP_FILES = \
        view-sidebar.page
 
 HELP_LINGUAS = cs de el es hu pt_BR sv
+
+-include $(top_srcdir)/git.mk
diff --git a/icons/Makefile.am b/icons/Makefile.am
index e0613da..79724ee 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -50,3 +50,5 @@ dist_images_DATA = \
        videos-page.png \
        zoom-in.png \
        zoom-out.png
+
+-include $(top_srcdir)/git.mk
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 67533bf..6804401 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -30,3 +30,5 @@ dist_noinst_DATA = \
        $(srcdir)/shotwell-viewer.desktop.in.in \
        $(gsettings_SCHEMAS) \
        $(appdata_in_files)
+
+-include $(top_srcdir)/git.mk
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 3240db0..6010b27 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -25,3 +25,5 @@ dist_ui_DATA = \
        top.ui \
        trash.ui
 
+
+-include $(top_srcdir)/git.mk