callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update git.mk

Browse Source 
This fixes the .deps of subdirs (a11y, deprecated, inspector) not
showing up in .gitignore.
This commit is contained in:
Jasper St. Pierre 2014-12-12 17:38:27 -08:00
parent 4c0b2087c6
commit ce3d32ff43
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
git.mk
View File

@ -45,7 +45,8 @@
# build dir. # build dir.
# #
# This file knows how to handle autoconf, automake, libtool, gtk-doc, # 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: # This makefile provides the following targets:
# #
@ -90,6 +91,7 @@ GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
missing \ missing \
mkinstalldirs \ mkinstalldirs \
test-driver \ test-driver \
ylwrap \
; do echo "$$AUX_DIR/$$x"; done` \ ; do echo "$$AUX_DIR/$$x"; done` \
`cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \ `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \
head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done` 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) \ $(appdata_XML:.xml=.valid) \
; do echo "/$$x"; done; \ ; do echo "/$$x"; done; \
fi; \ 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 \ if test -f $(srcdir)/po/Makefile.in.in; then \
for x in \ for x in \
po/Makefile.in.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 \ if test "x$(am__dirstamp)" = x; then :; else \
echo "$(am__dirstamp)"; \ echo "$(am__dirstamp)"; \
fi; \ 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 \ for x in \
"*.lo" \ "*.lo" \
".libs" "_libs" \ ".libs" "_libs" \
@ -266,7 +273,6 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(TEST_LOGS) \ $(TEST_LOGS) \
$(TEST_LOGS:.log=.trs) \ $(TEST_LOGS:.log=.trs) \
$(TEST_SUITE_LOG) \ $(TEST_SUITE_LOG) \
"*.$(OBJEXT)" \
"*.gcda" \ "*.gcda" \
"*.gcno" \ "*.gcno" \
$(DISTCLEANFILES) \ $(DISTCLEANFILES) \
@ -276,7 +282,6 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
"*.tab.c" \ "*.tab.c" \
$(MAINTAINERCLEANFILES) \ $(MAINTAINERCLEANFILES) \
$(BUILT_SOURCES) \ $(BUILT_SOURCES) \
$(DEPDIR) \
$(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \ $(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
$(filter %_vala.stamp,$(DIST_COMMON)) \ $(filter %_vala.stamp,$(DIST_COMMON)) \
$(filter %.vapi,$(DIST_COMMON)) \ $(filter %.vapi,$(DIST_COMMON)) \
@ -290,6 +295,10 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
".*.sw[nop]" \ ".*.sw[nop]" \
".dirstamp" \ ".dirstamp" \
; do echo "/$$x"; done; \ ; do echo "/$$x"; done; \
for x in \
"*.$(OBJEXT)" \
$(DEPDIR) \
; do echo "$$x"; done; \
} | \ } | \
sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \ sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
sed 's@/[.]/@/@g' | \ sed 's@/[.]/@/@g' | \