[libgdata/offline-testing] build: Update git.mk from upstream
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgdata/offline-testing] build: Update git.mk from upstream
- Date: Wed, 31 Jul 2013 07:21:19 +0000 (UTC)
commit 76bbd814324259b4abb3ec37bfc4c06965c07ec1
Author: Philip Withnall <philip tecnocode co uk>
Date: Tue Jul 30 14:17:58 2013 +0200
build: Update git.mk from upstream
git.mk | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 86 insertions(+), 20 deletions(-)
---
diff --git a/git.mk b/git.mk
index 2db6bd3..2a144a8 100644
--- a/git.mk
+++ b/git.mk
@@ -1,7 +1,7 @@
# git.mk
#
# Copyright 2009, Red Hat, Inc.
-# Copyright 2010,2011 Behdad Esfahbod
+# Copyright 2010,2011,2012,2013 Behdad Esfahbod
# Written by Behdad Esfahbod
#
# Copying and distribution of this file, with or without modification,
@@ -64,14 +64,65 @@
# example.
#
+
+
+###############################################################################
+# Variables user modules may want to add to toplevel MAINTAINERCLEANFILES:
+###############################################################################
+
+#
+# Most autotools-using modules should be fine including this variable in their
+# toplevel MAINTAINERCLEANFILES:
+GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
+ $(srcdir)/aclocal.m4 \
+ $(srcdir)/autoscan.log \
+ $(srcdir)/configure.scan \
+ `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:
+GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \
+ `$(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' $(srcdir)/configure.ac | \
+ while read f; do \
+ case $$f in Makefile|*/Makefile) \
+ test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \
+ done`
+#
+# Modules that use libtool /and/ use AC_CONFIG_MACRO_DIR([m4]) may also
+# include this:
+GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \
+ $(srcdir)/m4/libtool.m4 \
+ $(srcdir)/m4/ltoptions.m4 \
+ $(srcdir)/m4/ltsugar.m4 \
+ $(srcdir)/m4/ltversion.m4 \
+ $(srcdir)/m4/lt~obsolete.m4
+
+
+
+###############################################################################
+# Default rule is to install ourselves in all Makefile.am files:
+###############################################################################
+
git-all: git-mk-install
git-mk-install:
- @echo Installing git makefile
+ @echo "Installing git makefile"
@any_failed=; \
find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while
read x; do \
if grep 'include .*/git.mk' $$x >/dev/null; then \
- echo $$x already includes git.mk; \
+ echo "$$x already includes git.mk"; \
else \
failed=; \
echo "Updating $$x"; \
@@ -83,7 +134,7 @@ git-mk-install:
mv $$x.tmp $$x || failed=1; \
fi; \
if test x$$failed = x; then : else \
- echo Failed updating $$x; >&2 \
+ echo "Failed updating $$x"; >&2 \
any_failed=1; \
fi; \
fi; done; test -z "$$any_failed"
@@ -91,11 +142,14 @@ git-mk-install:
.PHONY: git-all git-mk-install
-### .gitignore generation
+
+###############################################################################
+# Actual .gitignore generation:
+###############################################################################
$(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 \
for x in \
$(DOC_MODULE)-decl-list.txt \
@@ -103,7 +157,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
tmpl/$(DOC_MODULE)-unused.sgml \
"tmpl/*.bak" \
xml html \
- ; do echo /$$x; done; \
+ ; do echo "/$$x"; done; \
fi; \
if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
for lc in $(DOC_LINGUAS); do \
@@ -111,7 +165,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(if $(DOC_MODULE),$(DOC_MODULE).xml) \
$(DOC_PAGES) \
$(DOC_INCLUDES) \
- ; do echo /$$lc/$$x; done; \
+ ; do echo "/$$lc/$$x"; done; \
done; \
for x in \
$(_DOC_OMF_ALL) \
@@ -129,30 +183,36 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(HELP_FILES) \
"$$lc.stamp" \
"$$lc.mo" \
- ; do echo /$$lc/$$x; done; \
+ ; do echo "/$$lc/$$x"; done; \
done; \
fi; \
if test "x$(gsettings_SCHEMAS)" = x; then :; else \
for x in \
$(gsettings_SCHEMAS:.xml=.valid) \
$(gsettings__enum_file) \
- ; do echo /$$x; done; \
+ ; do echo "/$$x"; done; \
fi; \
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 \
intltool-update.in \
- ; do echo /$$x; done; \
+ ; do echo "/$$x"; done; \
fi; \
if test -f $(srcdir)/configure; then \
for x in \
@@ -162,14 +222,23 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
stamp-h1 \
libtool \
config.lt \
- ; do echo /$$x; done; \
+ ; do echo "/$$x"; done; \
fi; \
if test "x$(DEJATOOL)" = x; then :; else \
for x in \
$(DEJATOOL) \
- ; do echo /$$x.sum; echo /$$x.log; done; \
+ ; do echo "/$$x.sum"; echo "/$$x.log"; done; \
echo /site.exp; \
fi; \
+ if test "x$(am__dirstamp)" = x; then :; else \
+ echo "$(am__dirstamp)"; \
+ fi; \
+ if test "x$(LTCOMPILE)" = x; then :; else \
+ for x in \
+ "*.lo" \
+ ".libs" "_libs" \
+ ; do echo "$$x"; done; \
+ fi; \
for x in \
.gitignore \
$(GITIGNOREFILES) \
@@ -178,10 +247,8 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
$(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
so_locations \
- .libs _libs \
$(MOSTLYCLEANFILES) \
"*.$(OBJEXT)" \
- "*.lo" \
$(DISTCLEANFILES) \
$(am__CONFIG_DISTCLEAN_FILES) \
$(CONFIG_CLEAN_FILES) \
@@ -198,7 +265,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
"*~" \
".*.sw[nop]" \
".dirstamp" \
- ; do echo /$$x; done; \
+ ; do echo "/$$x"; done; \
} | \
sed "s ^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
sed 's@/[.]/@/@g' | \
@@ -212,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
@@ -225,4 +292,3 @@ gitignore-clean:
-rm -f $(srcdir)/.gitignore
.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
