[gitg] Update git.mk

From: Ignacio Casal Quinteiro <icq src gnome org>
To: commits-list gnome org
Cc:
Subject: [gitg] Update git.mk
Date: Sun, 7 Jul 2013 14:23:42 +0000 (UTC)
commit e7658190b9bd211c4ecdc4a4bb02990a6b3dd63c
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sun Jul 7 16:23:01 2013 +0200

    Update git.mk

 Makefile.am |   17 ++-------
 git.mk      |  112 +++++++++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 90 insertions(+), 39 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3f65eab..92d4000 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,25 +14,19 @@ EXTRA_DIST = \
        MAINTAINERS
 
 MAINTAINERCLEANFILES =                 \
+       $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
+       $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
+       $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
        INSTALL                 \
        configure               \
        build-aux/*             \
        intltool-extract.in     \
        intltool-merge.in       \
        intltool-update.in      \
-       aclocal.m4              \
-       config.guess            \
-       config.h.in             \
-       config.sub              \
-       depcomp                 \
        ABOUT-NLS               \
        config.rpath            \
-       install-sh              \
-       ltmain.sh               \
        omf.make                \
        xmldocs.make            \
-       missing                 \
-       mkinstalldirs           \
        m4/codeset.m4           \
        m4/gettext.m4           \
        m4/glibc21.m4           \
@@ -50,13 +44,8 @@ MAINTAINERCLEANFILES =               \
        m4/lib-ld.m4            \
        m4/lib-link.m4          \
        m4/lib-prefix.m4        \
-       m4/libtool.m4           \
        m4/lock.m4              \
        m4/longlong.m4          \
-       m4/lt~obsolete.m4       \
-       m4/ltoptions.m4         \
-       m4/ltsugar.m4           \
-       m4/ltversion.m4         \
        m4/nls.m4               \
        m4/po.m4                \
        m4/printf-posix.m4      \
diff --git a/git.mk b/git.mk
index ffa6c5e..7667636 100644
--- a/git.mk
+++ b/git.mk
@@ -1,14 +1,17 @@
 # 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,
 # is permitted in any medium without royalty provided the copyright
 # notice and this notice are preserved.
 #
-# The canonical source for this file is https://github.com/behdad/git.mk.
+# The latest version of this file can be downloaded from:
+#   https://raw.github.com/behdad/git.mk/master/git.mk
+# Bugs, etc, should be reported upstream at:
+#   https://github.com/behdad/git.mk
 #
 # To use in your project, import this file in your git repo's toplevel,
 # then do "make -f git.mk".  This modifies all Makefile.am files in
@@ -61,14 +64,62 @@
 #   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)/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
+#
+# 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"; \
@@ -80,7 +131,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"
@@ -88,11 +139,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 \
@@ -100,7 +154,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 \
@@ -108,7 +162,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) \
@@ -126,35 +180,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/Makevars.template \
-                               po/Rules-quot \
-                               "po/*.header" \
-                               "po/*.sin" \
-                               "po/*.sed" \
                                "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 \
@@ -164,14 +219,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) \
@@ -180,10 +244,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) \
@@ -200,7 +262,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' | \
@@ -214,12 +276,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 gitignore-recurse-maybe || 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 
gitignore-recurse || echo "Skipping $$subdir"); \
        done
 
 maintainer-clean: gitignore-clean
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]