[gtk+] Update git.mk



commit ce3d32ff4310713eb211c06f491d248a8bddb573
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Dec 12 17:38:27 2014 -0800

    Update git.mk
    
    This fixes the .deps of subdirs (a11y, deprecated, inspector) not
    showing up in .gitignore.

 git.mk |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/git.mk b/git.mk
index 5638488..af15798 100644
--- a/git.mk
+++ b/git.mk
@@ -45,7 +45,8 @@
 # build dir.
 #
 # This file knows how to handle autoconf, automake, libtool, gtk-doc,
-# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu, appdata.
+# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu, appdata,
+# appstream.
 #
 # This makefile provides the following targets:
 #
@@ -90,6 +91,7 @@ GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
                missing \
                mkinstalldirs \
                test-driver \
+               ylwrap \
         ; do echo "$$AUX_DIR/$$x"; done` \
        `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \
        head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
@@ -207,6 +209,11 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                                $(appdata_XML:.xml=.valid) \
                        ; do echo "/$$x"; done; \
                fi; \
+               if test "x$(appstream_XML)" = x; then :; else \
+                       for x in \
+                               $(appstream_XML:.xml=.valid) \
+                       ; do echo "/$$x"; done; \
+               fi; \
                if test -f $(srcdir)/po/Makefile.in.in; then \
                        for x in \
                                po/Makefile.in.in \
@@ -248,7 +255,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                if test "x$(am__dirstamp)" = x; then :; else \
                        echo "$(am__dirstamp)"; \
                fi; \
-               if test "x$(LTCOMPILE)" = x -a "x$(GTKDOC_RUN)" = x; then :; else \
+               if test "x$(LTCOMPILE)" = x -a "x$(LTCXXCOMPILE)" = x -a "x$(GTKDOC_RUN)" = x; then :; else \
                        for x in \
                                "*.lo" \
                                ".libs" "_libs" \
@@ -266,7 +273,6 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                        $(TEST_LOGS) \
                        $(TEST_LOGS:.log=.trs) \
                        $(TEST_SUITE_LOG) \
-                       "*.$(OBJEXT)" \
                        "*.gcda" \
                        "*.gcno" \
                        $(DISTCLEANFILES) \
@@ -276,7 +282,6 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                        "*.tab.c" \
                        $(MAINTAINERCLEANFILES) \
                        $(BUILT_SOURCES) \
-                       $(DEPDIR) \
                        $(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
                        $(filter %_vala.stamp,$(DIST_COMMON)) \
                        $(filter %.vapi,$(DIST_COMMON)) \
@@ -290,6 +295,10 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                        ".*.sw[nop]" \
                        ".dirstamp" \
                ; do echo "/$$x"; done; \
+               for x in \
+                       "*.$(OBJEXT)" \
+                       $(DEPDIR) \
+               ; do echo "$$x"; done; \
        } | \
        sed "s ^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
        sed 's@/[.]/@/@g' | \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]