]> hydra-www.ietfng.org Git - gtetrinet/commitdiff
Use Behdad's git.mk to generate .gitignore files.
authorJordi Mallach <jordi@debian.org>
Mon, 2 May 2011 01:29:25 +0000 (03:29 +0200)
committerJordi Mallach <jordi@debian.org>
Mon, 2 May 2011 01:29:25 +0000 (03:29 +0200)
Makefile.am
doc/Makefile.am
git.mk [new file with mode: 0644]
icons/Makefile.am
src/Makefile.am
src/images/Makefile.am
themes/Makefile.am
themes/default/Makefile.am
themes/small/Makefile.am

index 75cc0d17a217d1ca1d051c84d2c88738db255de4..ab903670028779fc63af198638a9517a6a3b5722 100644 (file)
@@ -35,3 +35,5 @@ dist-hook:
        else \
                echo A git clone is required to generate a ChangeLog >&2; \
        fi
+
+-include $(top_srcdir)/git.mk
index 76d7df2ef3494cc2d8ba7d361e063f52417bce50..19ede15082b28aff6c91ec36155b5fa90e0f3aff 100644 (file)
@@ -1,2 +1,4 @@
 man_MANS   = gtetrinet.6
 EXTRA_DIST = $(man_MANS)
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644 (file)
index 0000000..f244116
--- /dev/null
+++ b/git.mk
@@ -0,0 +1,196 @@
+# git.mk
+#
+# Copyright 2009, Red Hat, Inc.
+# Written by Behdad Esfahbod
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+#
+# The canonical source for this file is pango/git.mk, or whereever the
+# header of pango/git.mk suggests in the future.
+#
+# 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
+# your project to include git.mk.
+#
+# This enables automatic .gitignore generation.  If you need to ignore
+# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
+# But think twice before doing that.  If a file has to be in .gitignore,
+# chances are very high that it's a generated file and should be in one
+# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
+#
+# 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,
+# or maintainer-clean-local.
+#
+# Note that for files like editor backup, etc, there are better places to
+# ignore them.  See "man gitignore".
+#
+# 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
+# me the output of "git status" as well as your Makefile.am and Makefile for
+# the directories involved.
+#
+# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
+# pango/Makefile.am.
+#
+# 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
+# build dir.
+#
+# This file knows how to handle autoconf, automake, libtool, gtk-doc,
+# gnome-doc-utils, intltool, GSettings.
+#
+#
+# KNOWN ISSUES:
+#
+# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
+#   submodule doesn't find us.  If you have configure.{in,ac} files in
+#   subdirs, add a proxy git.mk file in those dirs that simply does:
+#   "include $(top_srcdir)/../git.mk".  Add more ..'s to your taste.
+#   And add those files to git.  See vte/gnome-pty-helper/git.mk for
+#   example.
+#
+
+git-all: git-mk-install
+
+git-mk-install:
+       @echo Installing git makefile
+       @any_failed=; find $(top_srcdir) -name Makefile.am | while read x; do \
+               if grep 'include .*/git.mk' $$x >/dev/null; then \
+                       echo $$x already includes git.mk; \
+               else \
+                       failed=; \
+                       echo "Updating $$x"; \
+                       { cat $$x; \
+                         echo ''; \
+                         echo '-include $$(top_srcdir)/git.mk'; \
+                       } > $$x.tmp || failed=1; \
+                       if test x$$failed = x; then \
+                               mv $$x.tmp $$x || failed=1; \
+                       fi; \
+                       if test x$$failed = x; then : else \
+                               echo Failed updating $$x; >&2 \
+                               any_failed=1; \
+                       fi; \
+       fi; done; test -z "$$any_failed"
+
+.PHONY: git-all git-mk-install
+
+
+### .gitignore generation
+
+$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
+       $(AM_V_GEN) \
+       { \
+               if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
+                       for x in \
+                               $(DOC_MODULE)-decl-list.txt \
+                               $(DOC_MODULE)-decl.txt \
+                               tmpl/$(DOC_MODULE)-unused.sgml \
+                               "tmpl/*.bak" \
+                               xml html \
+                       ; do echo /$$x; done; \
+               fi; \
+               if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
+                       for x in \
+                               $(_DOC_C_DOCS) \
+                               $(_DOC_LC_DOCS) \
+                               $(_DOC_OMF_ALL) \
+                               $(_DOC_DSK_ALL) \
+                               $(_DOC_HTML_ALL) \
+                               $(_DOC_POFILES) \
+                               $(_DOC_MOFILES) \
+                               $(DOC_H_FILE) \
+                               "*/.xml2po.mo" \
+                               "*/*.omf.out" \
+                       ; 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 \
+                       for x in \
+                               po/Makefile.in.in \
+                               po/Makefile.in \
+                               po/Makefile \
+                               po/POTFILES \
+                               po/stamp-it \
+                               po/.intltool-merge-cache \
+                               "po/*.gmo" \
+                               "po/*.mo" \
+                               po/$(GETTEXT_PACKAGE).pot \
+                               intltool-extract.in \
+                               intltool-merge.in \
+                               intltool-update.in \
+                       ; do echo /$$x; done; \
+               fi; \
+               if test -f $(srcdir)/configure; then \
+                       for x in \
+                               autom4te.cache \
+                               configure \
+                               config.h \
+                               stamp-h1 \
+                               libtool \
+                               config.lt \
+                       ; do echo /$$x; done; \
+               fi; \
+               for x in \
+                       .gitignore \
+                       $(GITIGNOREFILES) \
+                       $(CLEANFILES) \
+                       $(PROGRAMS) \
+                       $(check_PROGRAMS) \
+                       $(EXTRA_PROGRAMS) \
+                       $(LTLIBRARIES) \
+                       so_locations \
+                       .libs _libs \
+                       $(MOSTLYCLEANFILES) \
+                       "*.$(OBJEXT)" \
+                       "*.lo" \
+                       $(DISTCLEANFILES) \
+                       $(am__CONFIG_DISTCLEAN_FILES) \
+                       $(CONFIG_CLEAN_FILES) \
+                       TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
+                       "*.tab.c" \
+                       $(MAINTAINERCLEANFILES) \
+                       $(BUILT_SOURCES) \
+                       $(DEPDIR) \
+                       Makefile \
+                       Makefile.in \
+                       "*.orig" \
+                       "*.rej" \
+                       "*.bak" \
+                       "*~" \
+                       ".*.sw[nop]" \
+                       ".dirstamp" \
+               ; do echo /$$x; done; \
+       } | \
+       sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
+       sed 's@/[.]/@/@g' | \
+       LC_ALL=C sort | uniq > $@.tmp && \
+       mv $@.tmp $@;
+
+all: $(srcdir)/.gitignore gitignore-recurse-maybe
+gitignore-recurse-maybe:
+       @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
+               $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
+       fi;
+gitignore-recurse:
+       @for subdir in $(DIST_SUBDIRS); do \
+         case " $(SUBDIRS) " in \
+           *" $$subdir "*) :;; \
+           *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
+         esac; \
+       done
+gitignore: $(srcdir)/.gitignore gitignore-recurse
+
+maintainer-clean: gitignore-clean
+gitignore-clean:
+       -rm -f $(srcdir)/.gitignore
+
+.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
index e0b6d3bd263ae0d701b151ad5f25ae381a7fe1f1..f86e8cba8ae571d05240077adf8598e88de1bf7d 100644 (file)
@@ -3,3 +3,4 @@ EXTRA_DIST = alone.png team.png
 icon_DATA = alone.png team.png
 icondir = $(datadir)/pixmaps/gtetrinet
 
+-include $(top_srcdir)/git.mk
index e114978d4311c6e639304f07be7c656f09c22b89..af66789d2ca943b16837ddb357bc59534670c626 100644 (file)
@@ -19,3 +19,5 @@ gamesdir = $(prefix)/games
 games_PROGRAMS = gtetrinet
 
 gtetrinet_SOURCES = client.c client.h commands.c commands.h config.c config.h dialogs.c dialogs.h fields.c fields.h gtetrinet.c gtetrinet.h misc.c misc.h partyline.c partyline.h sound.c sound.h tetrinet.c tetrinet.h tetris.c tetris.h winlist.c winlist.h
+
+-include $(top_srcdir)/git.mk
index 68760a52122b9ef254bb31772df19040f3f46c02..7cb6c0dfa886db3e8abe97ea0e63eb4d6a892665 100644 (file)
@@ -1 +1,3 @@
 EXTRA_DIST = fields.xpm partyline.xpm winlist.xpm connect.xpm disconnect.xpm pause.xpm play.xpm stop.xpm team24.xpm
+
+-include $(top_srcdir)/git.mk
index e0d6014c76e8465485615e8c4c2933847b45d7c4..2454b1cb4ee5919a5ca4351973e90c3ef3825864 100644 (file)
@@ -1 +1,3 @@
 SUBDIRS = default small
+
+-include $(top_srcdir)/git.mk
index 3037db0c44b0fac5ec0eaa10696a4b4089b6352d..570cab55bf74c4e277b09113b71e6cffaa216325 100644 (file)
@@ -3,3 +3,5 @@ defaultthemedir = $(pkgdatadir)/themes/default
 defaulttheme_DATA = blocks.png theme.cfg
 
 EXTRA_DIST = $(defaulttheme_DATA)
+
+-include $(top_srcdir)/git.mk
index 7483621734773fcc7ea897357a94d23122d0d649..73fff8a3bebfbbb964d04c64d0368c647bf0154d 100644 (file)
@@ -3,3 +3,5 @@ smallthemedir = $(pkgdatadir)/themes/small
 smalltheme_DATA = blocks.png theme.cfg
 
 EXTRA_DIST = $(smalltheme_DATA)
+
+-include $(top_srcdir)/git.mk