summaryrefslogtreecommitdiff
path: root/git.mk
diff options
context:
space:
mode:
authorWilliam Jon McCann <william.jon.mccann@gmail.com>2014-04-25 13:52:52 -0400
committerWilliam Jon McCann <william.jon.mccann@gmail.com>2014-04-25 14:02:47 -0400
commitf20c36b818afed352a344505748a2c97ec3dd7ce (patch)
tree4ef86b6404e4e01e78fa5d3f52899debd369ee76 /git.mk
parentb6042e902cf4fe3fcbcb6c07aa0a94e88d2b238e (diff)
parent526e07c5d7c2ad16a1be2144553925d0720a7bba (diff)
downloadadwaita-icon-theme-f20c36b818afed352a344505748a2c97ec3dd7ce.tar.gz
Merge gnome-icon-theme-symbolic
Diffstat (limited to 'git.mk')
-rw-r--r--git.mk11
1 files changed, 9 insertions, 2 deletions
diff --git a/git.mk b/git.mk
index 18c07f684..563848804 100644
--- a/git.mk
+++ b/git.mk
@@ -45,7 +45,7 @@
# build dir.
#
# This file knows how to handle autoconf, automake, libtool, gtk-doc,
-# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu.
+# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu, appdata.
#
# This makefile provides the following targets:
#
@@ -202,6 +202,11 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(gsettings__enum_file) \
; do echo "/$$x"; done; \
fi; \
+ if test "x$(appdata_XML)" = x; then :; else \
+ for x in \
+ $(appdata_XML:.xml=.valid) \
+ ; do echo "/$$x"; done; \
+ fi; \
if test -f $(srcdir)/po/Makefile.in.in; then \
for x in \
po/Makefile.in.in \
@@ -262,6 +267,8 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(TEST_LOGS:.log=.trs) \
$(TEST_SUITE_LOG) \
"*.$(OBJEXT)" \
+ "*.gcda" \
+ "*.gcno" \
$(DISTCLEANFILES) \
$(am__CONFIG_DISTCLEAN_FILES) \
$(CONFIG_CLEAN_FILES) \
@@ -273,7 +280,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
$(filter %_vala.stamp,$(DIST_COMMON)) \
$(filter %.vapi,$(DIST_COMMON)) \
- $(filter %$(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))),$(DIST_COMMON)) \
+ $(filter $(addprefix %,$(notdir $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))))),$(DIST_COMMON)) \
Makefile \
Makefile.in \
"*.orig" \