[gnome-control-center] Update git.mk
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] Update git.mk
- Date: Wed, 17 Jul 2013 08:03:03 +0000 (UTC)
commit 2d03196966bb14bddbce5eee9e57bdc6ef1b7718
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Mon Jul 15 11:54:31 2013 -0400
Update git.mk
git.mk | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/git.mk b/git.mk
index d11a9d2..2a144a8 100644
--- a/git.mk
+++ b/git.mk
@@ -75,18 +75,21 @@
# toplevel MAINTAINERCLEANFILES:
GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
$(srcdir)/aclocal.m4 \
- $(srcdir)/ar-lib \
$(srcdir)/autoscan.log \
- $(srcdir)/compile \
- $(srcdir)/config.guess \
- $(srcdir)/config.h.in \
- $(srcdir)/config.sub \
$(srcdir)/configure.scan \
- $(srcdir)/depcomp \
- $(srcdir)/install-sh \
- $(srcdir)/ltmain.sh \
- $(srcdir)/missing \
- $(srcdir)/mkinstalldirs
+ `AUX_DIR=$(srcdir)/$$($(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1'); for x in \
+ ar-lib \
+ compile \
+ config.guess \
+ 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
# removes automake-generated Makefile.in files:
@@ -192,13 +195,19 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
if test -f $(srcdir)/po/Makefile.in.in; then \
for x in \
po/Makefile.in.in \
+ po/Makefile.in.in~ \
po/Makefile.in \
po/Makefile \
+ po/Makevars.template \
po/POTFILES \
+ po/Rules-quot \
po/stamp-it \
po/.intltool-merge-cache \
"po/*.gmo" \
+ "po/*.header" \
"po/*.mo" \
+ "po/*.sed" \
+ "po/*.sin" \
po/$(GETTEXT_PACKAGE).pot \
intltool-extract.in \
intltool-merge.in \
@@ -270,12 +279,12 @@ gitignore-recurse-maybe:
@for subdir in $(DIST_SUBDIRS); do \
case " $(SUBDIRS) " in \
*" $$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; \
done
gitignore-recurse:
@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
maintainer-clean: gitignore-clean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]