Update git.mk

This commit is contained in:
Behdad Esfahbod 2013-08-06 15:19:23 -04:00
parent 38d5c58d23
commit 722252743d
1 changed files with 23 additions and 14 deletions

37
git.mk
View File

@ -75,18 +75,21 @@
# toplevel MAINTAINERCLEANFILES: # toplevel MAINTAINERCLEANFILES:
GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \ GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
$(srcdir)/aclocal.m4 \ $(srcdir)/aclocal.m4 \
$(srcdir)/ar-lib \
$(srcdir)/autoscan.log \ $(srcdir)/autoscan.log \
$(srcdir)/compile \
$(srcdir)/config.guess \
$(srcdir)/config.h.in \
$(srcdir)/config.sub \
$(srcdir)/configure.scan \ $(srcdir)/configure.scan \
$(srcdir)/depcomp \ `AUX_DIR=$(srcdir)/$$($(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' $(srcdir)/configure.ac); for x in \
$(srcdir)/install-sh \ ar-lib \
$(srcdir)/ltmain.sh \ compile \
$(srcdir)/missing \ config.guess \
$(srcdir)/mkinstalldirs config.sub \
depcomp \
install-sh \
ltmain.sh \
missing \
mkinstalldirs \
; do echo "$$AUX_DIR/$$x"; done` \
`$(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' $(srcdir)/configure.ac | \
head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
# #
# All modules should also be fine including the following variable, which # All modules should also be fine including the following variable, which
# removes automake-generated Makefile.in files: # removes automake-generated Makefile.in files:
@ -145,8 +148,8 @@ git-mk-install:
############################################################################### ###############################################################################
$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(AM_V_GEN) \ @echo "git.mk: Generating $@"
{ \ @{ \
if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \ if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
for x in \ for x in \
$(DOC_MODULE)-decl-list.txt \ $(DOC_MODULE)-decl-list.txt \
@ -192,13 +195,19 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
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 \
po/Makefile.in.in~ \
po/Makefile.in \ po/Makefile.in \
po/Makefile \ po/Makefile \
po/Makevars.template \
po/POTFILES \ po/POTFILES \
po/Rules-quot \
po/stamp-it \ po/stamp-it \
po/.intltool-merge-cache \ po/.intltool-merge-cache \
"po/*.gmo" \ "po/*.gmo" \
"po/*.header" \
"po/*.mo" \ "po/*.mo" \
"po/*.sed" \
"po/*.sin" \
po/$(GETTEXT_PACKAGE).pot \ po/$(GETTEXT_PACKAGE).pot \
intltool-extract.in \ intltool-extract.in \
intltool-merge.in \ intltool-merge.in \
@ -270,12 +279,12 @@ gitignore-recurse-maybe:
@for subdir in $(DIST_SUBDIRS); do \ @for subdir in $(DIST_SUBDIRS); do \
case " $(SUBDIRS) " in \ case " $(SUBDIRS) " in \
*" $$subdir "*) :;; \ *" $$subdir "*) :;; \
*) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse-maybe || echo "Skipping $$subdir");; \ *) test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir");; \
esac; \ esac; \
done done
gitignore-recurse: gitignore-recurse:
@for subdir in $(DIST_SUBDIRS); do \ @for subdir in $(DIST_SUBDIRS); do \
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir"); \ test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir"); \
done done
maintainer-clean: gitignore-clean maintainer-clean: gitignore-clean