[gnome-color-manager] Use git.mk to autogenerate the .gitignore files
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] Use git.mk to autogenerate the .gitignore files
- Date: Tue, 8 Oct 2013 11:21:59 +0000 (UTC)
commit e6e61b5e6de57a9ff62ca3377c9c3ab7c26b8aae
Author: Richard Hughes <richard hughsie com>
Date: Tue Oct 8 12:21:17 2013 +0100
Use git.mk to autogenerate the .gitignore files
.gitignore | 32 ------
Makefile.am | 21 +++--
data/.gitignore | 4 -
data/Makefile.am | 1 +
data/appdata/Makefile.am | 2 +
data/figures/Makefile.am | 1 +
data/icons/16x16/Makefile.am | 2 +
data/icons/22x22/Makefile.am | 2 +
data/icons/24x24/Makefile.am | 2 +
data/icons/256x256/Makefile.am | 2 +
data/icons/32x32/Makefile.am | 2 +
data/icons/48x48/Makefile.am | 2 +
data/icons/64x64/Makefile.am | 2 +
data/icons/Makefile.am | 1 +
data/icons/scalable/Makefile.am | 1 +
data/targets/Makefile.am | 1 +
data/tests/Makefile.am | 1 +
data/ti1/Makefile.am | 2 +
git.mk | 200 +++++++++++++++++++++++++++++++++++++++
help/Makefile.am | 4 +
man/.gitignore | 5 -
man/Makefile.am | 5 +
src/.gitignore | 14 ---
src/Makefile.am | 3 +-
24 files changed, 248 insertions(+), 64 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8977b8d..36e2820 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,19 +13,23 @@ DISTCLEANFILES = \
MAINTAINERCLEANFILES = \
*~ \
+ INSTALL \
+ Makefile.in \
+ aclocal.m4 \
compile \
+ config.guess \
+ config.h.* \
+ config.sub \
configure \
- INSTALL \
+ depcomp \
install-sh \
+ ltmain.sh \
missing \
mkinstalldirs \
- config.guess \
- ltmain.sh \
- config.sub \
- depcomp \
- Makefile.in \
- config.h.* \
- aclocal.m4
+ test-driver
+
+CLEANFILES = \
+ ChangeLog
EXTRA_DIST = \
COPYING \
@@ -61,3 +65,4 @@ ChangeLog:
.PHONY: ChangeLog
+-include $(top_srcdir)/git.mk
diff --git a/data/Makefile.am b/data/Makefile.am
index 3d62903..682684d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -35,3 +35,4 @@ DISTCLEANFILES = \
gcm-viewer.desktop \
gcm-import.desktop
+-include $(top_srcdir)/git.mk
diff --git a/data/appdata/Makefile.am b/data/appdata/Makefile.am
index a1d2d5c..80276cd 100644
--- a/data/appdata/Makefile.am
+++ b/data/appdata/Makefile.am
@@ -4,3 +4,5 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
appdata_in_files = gcm-viewer.appdata.xml.in
EXTRA_DIST = $(appdata_in_files)
CLEANFILES = $(appdata_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/figures/Makefile.am b/data/figures/Makefile.am
index 7e843e2..d9da259 100644
--- a/data/figures/Makefile.am
+++ b/data/figures/Makefile.am
@@ -19,3 +19,4 @@ EXTRA_DIST = \
$(icons_DATA) \
$(figures_DATA)
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index dc05974..70513ce 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -13,3 +13,5 @@ install-data-hook:
EXTRA_DIST = \
$(icons_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index 644bdd9..6c455f5 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -13,3 +13,5 @@ install-data-hook:
EXTRA_DIST = \
$(icons_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index 82f8843..d14c265 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@@ -13,3 +13,5 @@ install-data-hook:
EXTRA_DIST = \
$(icons_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/256x256/Makefile.am b/data/icons/256x256/Makefile.am
index 1121e66..6c15ca1 100644
--- a/data/icons/256x256/Makefile.am
+++ b/data/icons/256x256/Makefile.am
@@ -13,3 +13,5 @@ install-data-hook:
EXTRA_DIST = \
$(icons_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index 48ef37a..59a86c4 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
@@ -13,3 +13,5 @@ install-data-hook:
EXTRA_DIST = \
$(icons_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index 96db077..9d2a8f0 100644
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -13,3 +13,5 @@ install-data-hook:
EXTRA_DIST = \
$(icons_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/64x64/Makefile.am b/data/icons/64x64/Makefile.am
index 36624b2..db0affc 100644
--- a/data/icons/64x64/Makefile.am
+++ b/data/icons/64x64/Makefile.am
@@ -13,3 +13,5 @@ install-data-hook:
EXTRA_DIST = \
$(icons_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 0bd0d63..1a884a3 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -13,3 +13,4 @@ update-icon-cache:
echo "*** $(gtk_update_icon_cache)"; \
fi
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index bdde79d..55f3d45 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -20,3 +20,4 @@ EXTRA_DIST = \
$(icons_DATA) \
$(appicons_DATA)
+-include $(top_srcdir)/git.mk
diff --git a/data/targets/Makefile.am b/data/targets/Makefile.am
index 3b3e8e8..56870e0 100644
--- a/data/targets/Makefile.am
+++ b/data/targets/Makefile.am
@@ -15,3 +15,4 @@ targets_DATA = \
EXTRA_DIST = \
$(targets_DATA)
+-include $(top_srcdir)/git.mk
diff --git a/data/tests/Makefile.am b/data/tests/Makefile.am
index 5cbcc54..332ecee 100644
--- a/data/tests/Makefile.am
+++ b/data/tests/Makefile.am
@@ -24,3 +24,4 @@ MAINTAINERCLEANFILES = \
*~ \
Makefile.in
+-include $(top_srcdir)/git.mk
diff --git a/data/ti1/Makefile.am b/data/ti1/Makefile.am
index df88875..d0ee3e2 100644
--- a/data/ti1/Makefile.am
+++ b/data/ti1/Makefile.am
@@ -9,3 +9,5 @@ ti1_DATA = \
EXTRA_DIST = \
$(ti1_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 0000000..abd6c0a
--- /dev/null
+++ b/git.mk
@@ -0,0 +1,200 @@
+# 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, mallard, 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.
+#
+# ChangeLog
+#
+# - 2010-12-06 Add support for Mallard docs
+# - 2010-12-06 Start this change log
+
+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)$(DOC_ID)" = 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_MOFILES) \
+ $(_DOC_POFILES) \
+ $(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
diff --git a/help/Makefile.am b/help/Makefile.am
index a03184b..1662291 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -13,3 +13,7 @@ HELP_FILES = \
color-import-linux.page \
color-import-windows.page \
color-import-osx.page
+
+CLEANFILES = */*.mo */*.stamp
+
+-include $(top_srcdir)/git.mk
diff --git a/man/Makefile.am b/man/Makefile.am
index 2381507..46fcc79 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -27,8 +27,13 @@ gcm-viewer.1: gcm-viewer.sgml
docbook2man $? > /dev/null
endif
+CLEANFILES = \
+ *.1 \
+ manpage.*
+
clean-local :
rm -f *~
rm -f *.1
rm -f manpage.*
+-include $(top_srcdir)/git.mk
diff --git a/src/Makefile.am b/src/Makefile.am
index a9cefa1..62605c9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -238,9 +238,10 @@ EXTRA_DIST = \
clean-local:
rm -f *~
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES) *.a
MAINTAINERCLEANFILES = \
*~ \
Makefile.in
+-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
