Update git.mk to new upstream

This commit is contained in:
Behdad Esfahbod 2012-01-27 02:14:08 -05:00
parent 134aa7bc7e
commit bee74efbde
1 changed files with 33 additions and 11 deletions

44
git.mk
View File

@ -1,18 +1,20 @@
# git.mk # git.mk
# #
# Copyright 2009, Red Hat, Inc. # Copyright 2009, Red Hat, Inc.
# Copyright 2010,2011 Behdad Esfahbod
# Written by Behdad Esfahbod # Written by Behdad Esfahbod
# #
# Copying and distribution of this file, with or without modification, # Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright # are permitted in any medium without royalty provided the copyright
# notice and this notice are preserved. # notice and this notice are preserved.
# #
# The canonical source for this file is pango/git.mk, or whereever the # The canonical source for this file is https://github.com/behdad/git.mk.
# header of pango/git.mk suggests in the future.
# #
# To use in your project, import this file in your git repo's toplevel, # 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 # then do "make -f git.mk". This modifies all Makefile.am files in
# your project to include git.mk. # your project to -include git.mk. Remember to add that line to new
# Makefile.am files you create in your project, or just rerun the
# "make -f git.mk".
# #
# This enables automatic .gitignore generation. If you need to ignore # This enables automatic .gitignore generation. If you need to ignore
# more files, add them to the GITIGNOREFILES variable in your Makefile.am. # more files, add them to the GITIGNOREFILES variable in your Makefile.am.
@ -22,7 +24,7 @@
# #
# The only case that you need to manually add a file to GITIGNOREFILES is # The only case that you need to manually add a file to GITIGNOREFILES is
# when remove files in one of mostlyclean-local, clean-local, distclean-local, # when remove files in one of mostlyclean-local, clean-local, distclean-local,
# or maintainer-clean-local. # or maintainer-clean-local make targets.
# #
# Note that for files like editor backup, etc, there are better places to # Note that for files like editor backup, etc, there are better places to
# ignore them. See "man gitignore". # ignore them. See "man gitignore".
@ -30,17 +32,17 @@
# If "make maintainer-clean" removes the files but they are not recognized # If "make maintainer-clean" removes the files but they are not recognized
# by this script (that is, if "git status" shows untracked files still), send # by this script (that is, if "git status" shows untracked files still), send
# me the output of "git status" as well as your Makefile.am and Makefile for # me the output of "git status" as well as your Makefile.am and Makefile for
# the directories involved. # the directories involved and I'll diagnose.
# #
# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see # For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
# pango/Makefile.am. # Makefile.am.sample in the git.mk git repo.
# #
# Don't EXTRA_DIST this file. It is supposed to only live in git clones, # Don't EXTRA_DIST this file. It is supposed to only live in git clones,
# not tarballs. It serves no useful purpose in tarballs and clutters the # not tarballs. It serves no useful purpose in tarballs and clutters the
# 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, intltool. # gnome-doc-utils, yelp.m4, mallard, intltool, gsettings.
# #
# #
# KNOWN ISSUES: # KNOWN ISSUES:
@ -57,7 +59,8 @@ git-all: git-mk-install
git-mk-install: git-mk-install:
@echo Installing git makefile @echo Installing git makefile
@any_failed=; find $(top_srcdir) -name Makefile.am | while read x; do \ @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 \ if grep 'include .*/git.mk' $$x >/dev/null; then \
echo $$x already includes git.mk; \ echo $$x already includes git.mk; \
else \ else \
@ -93,18 +96,33 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
xml html \ xml html \
; do echo /$$x; done; \ ; do echo /$$x; done; \
fi; \ fi; \
if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \ if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
for x in \ for x in \
$(_DOC_C_DOCS) \ $(_DOC_C_DOCS) \
$(_DOC_LC_DOCS) \ $(_DOC_LC_DOCS) \
$(_DOC_OMF_ALL) \ $(_DOC_OMF_ALL) \
$(_DOC_DSK_ALL) \ $(_DOC_DSK_ALL) \
$(_DOC_HTML_ALL) \ $(_DOC_HTML_ALL) \
$(_DOC_MOFILES) \
$(_DOC_POFILES) \ $(_DOC_POFILES) \
$(DOC_H_FILE) \
"*/.xml2po.mo" \ "*/.xml2po.mo" \
"*/*.omf.out" \ "*/*.omf.out" \
; do echo /$$x; done; \ ; do echo /$$x; done; \
fi; \ fi; \
if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
for x in \
$(_HELP_LC_FILES) \
$(_HELP_LC_STAMPS) \
$(_HELP_MOFILES) \
; do echo /$$x; done; \
fi; \
if test "x$(gsettings_SCHEMAS)" = x; then :; else \
for x in \
$(gsettings_SCHEMAS:.xml=.valid) \
$(gsettings__enum_file) \
; 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 \
@ -159,6 +177,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
"*.bak" \ "*.bak" \
"*~" \ "*~" \
".*.sw[nop]" \ ".*.sw[nop]" \
".dirstamp" \
; do echo /$$x; done; \ ; do echo /$$x; done; \
} | \ } | \
sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \ sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
@ -172,8 +191,11 @@ gitignore-recurse-maybe:
$(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \ $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
fi; fi;
gitignore-recurse: gitignore-recurse:
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ @for subdir in $(DIST_SUBDIRS); do \
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir"); \ case " $(SUBDIRS) " in \
*" $$subdir "*) :;; \
*) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
esac; \
done done
gitignore: $(srcdir)/.gitignore gitignore-recurse gitignore: $(srcdir)/.gitignore gitignore-recurse