GNOME.org
 

[almanah] Added .gitignore generation support

commit eb4bc7b7d0f434b25698ec92c80b11363cb9201c
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Apr 19 23:56:07 2009 +0100

    Added .gitignore generation support
    
    Using git.mk from pango, the .gitignore file is now auto-generated.
    Removed INSTALL from the repository, since it was only a symlink, and also
    removed the obsolete .bzrignore and .gitignore files.
---
 .bzrignore                   |   64 ---------------
 .gitignore                   |   37 ---------
 INSTALL                      |    1 -
 Makefile.am                  |   22 +++++-
 data/Makefile.am             |    2 +
 data/icons/16x16/Makefile.am |    2 +
 data/icons/22x22/Makefile.am |    2 +
 data/icons/32x32/Makefile.am |    2 +
 data/icons/48x48/Makefile.am |    2 +
 data/icons/Makefile.am       |    2 +
 git.mk                       |  178 ++++++++++++++++++++++++++++++++++++++++++
 src/Makefile.am              |    2 +
 12 files changed, 212 insertions(+), 104 deletions(-)

diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index bc02c51..0000000
--- a/.bzrignore
+++ /dev/null
@@ -1,64 +0,0 @@
-src/add-link-dialog.gcda
-src/file.gcda
-src/interface.gcda
-src/link.gcda
-src/main.gcda
-src/main-window.gcda
-src/picasa.gcda
-src/storage-manager.gcda
-src/uri.gcda
-src/add-link-dialog.gcno
-src/file.gcno
-src/interface.gcno
-src/link.gcno
-src/main.gcno
-src/main-window.gcno
-src/picasa.gcno
-src/storage-manager.gcno
-src/uri.gcno
-src/link.c.gcov
-src/main-window.c.gcov
-src/storage-manager.c.gcov
-src/diary
-Makefile
-Makefile.in
-.deps
-.libs
-po/POTFILES
-po/diary.pot
-stamp-it
-src/gthread.h.gcov
-src/link.c.gcov
-src/main-window.c.gcov
-src/stdlib.h.gcov
-src/storage-manager.c.gcov
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.log
-config.status
-config.status.lineno
-config.sub
-configure
-depcomp
-install-sh
-intltool-extract
-intltool-update
-intltool-merge
-libtool
-ltmain.sh
-missing
-mkinstalldirs
-stamp-h1
-diary.db
-*.valgrind
-diary-0.1.tar.gz
-diary2.splint
-diary.splint
-po/en_GB.gmo
-config.h.in
-diary-0.1.tar.gz
-diary-0.2.tar.gz
-output.pdf
-po/messages.mo
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 99e3588..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,37 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-stamp-it
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.log
-config.status
-config.status.lineno
-config.sub
-configure
-depcomp
-install-sh
-intltool-extract
-intltool-update
-intltool-merge
-libtool
-ltmain.sh
-missing
-mkinstalldirs
-stamp-h1
-diary.db
-almanah.db
-*.valgrind
-diary-*.tar.gz
-almanah-*.tar.gz
-*.splint
-config.h.in
-*.patch
-*.diff
-*-builtins.c
-*-builtins.h
-po/POTFILES
-*~
diff --git a/INSTALL b/INSTALL
deleted file mode 120000
index 81fa6ff..0000000
--- a/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/automake-1.9/INSTALL
\ No newline at end of file
diff --git a/Makefile.am b/Makefile.am
index a39154f..13fb769 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,15 +8,31 @@ EXTRA_DIST =			\
 	README			\
 	COPYING			\
 	AUTHORS			\
-	INSTALL			\
 	NEWS			\
-	ChangeLog.pre-git
+	MAINTAINERS		\
+	ChangeLog.pre-git	\
+	almanah.doap
 
 DISTCLEANFILES = \
 	intltool-extract	\
 	intltool-merge		\
 	intltool-update
 
+MAINTAINERCLEANFILES = \
+	INSTALL		\
+	aclocal.m4	\
+	compile		\
+	config.guess	\
+	config.h.in	\
+	config.sub	\
+	depcomp		\
+	install-sh	\
+	ltmain.sh	\
+	missing		\
+	mkinstalldirs	\
+	ChangeLog	\
+	`find "$(srcdir)" -type f -name Makefile.in -print`
+
 # Copy all the spec files. Of course, only one is actually used.
 dist-hook:
 	for specfile in *.spec; do \
@@ -40,3 +56,5 @@ ChangeLog:
 	  echo A git checkout and git-log is required to generate this file >> $@); \
 	fi
 .PHONY: ChangeLog
+
+-include $(top_srcdir)/git.mk
diff --git a/data/Makefile.am b/data/Makefile.am
index ce51129..baead9f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -66,3 +66,5 @@ EXTRA_DIST = \
 CLEANFILES = \
 	$(desktop_DATA)		\
 	$(schemas_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index 0599eee..f308605 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -2,3 +2,5 @@ icondir = $(datadir)/icons/hicolor/16x16/apps
 icon_DATA = almanah.png
 
 EXTRA_DIST = $(icon_DATA) almanah.svg
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index 280c921..5b3364e 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -2,3 +2,5 @@ icondir = $(datadir)/icons/hicolor/22x22/apps
 icon_DATA = almanah.png
 
 EXTRA_DIST = $(icon_DATA) almanah.svg
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index 4ee40f3..6c8ca2f 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
@@ -2,3 +2,5 @@ icondir = $(datadir)/icons/hicolor/32x32/apps
 icon_DATA = almanah.png
 
 EXTRA_DIST = $(icon_DATA) almanah.svg
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index 80e6ef8..43d95d4 100644
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -2,3 +2,5 @@ icondir = $(datadir)/icons/hicolor/48x48/apps
 icon_DATA = almanah.png
 
 EXTRA_DIST = $(icon_DATA) almanah.svg
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 7c2f1af..da9f9a8 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = 16x16 22x22 32x32 48x48
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 0000000..9cfce1c
--- /dev/null
+++ b/git.mk
@@ -0,0 +1,178 @@
+# 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 stat" shows untracked files still), send
+# me the output of "git stat" 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.
+#
+#
+# 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
+	@echo Generating $@; \
+	GTKDOCGITIGNOREFILES=; \
+	test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x || \
+	GTKDOCGITIGNOREFILES=" \
+		$(DOC_MODULE)-decl-list.txt \
+		$(DOC_MODULE)-decl.txt \
+		tmpl/$(DOC_MODULE)-unused.sgml \
+		tmpl/*.bak \
+		xml html \
+		"; \
+	GNOMEDOCUTILSGITIGNOREFILES=; \
+	test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x || \
+	GNOMEDOCUTILSGITIGNOREFILES=" \
+		$(_DOC_C_DOCS) \
+		$(_DOC_LC_DOCS) \
+		$(_DOC_OMF_ALL) \
+		$(_DOC_DSK_ALL) \
+		$(_DOC_HTML_ALL) \
+		$(_DOC_POFILES) \
+		*/.xml2po.mo \
+		*/*.omf.out \
+		"; \
+	INTLTOOLGITIGNOREFILES=; test -f $(srcdir)/po/Makefile.in.in && \
+	INTLTOOLGITIGNOREFILES=" \
+		po/Makefile.in.in \
+		po/Makefile.in \
+		po/Makefile \
+		po/*.gmo \
+		po/*.mo \
+		po/POTFILES \
+		po/stamp-it \
+		po/.intltool-merge-cache \
+		intltool-extract.in \
+		intltool-merge.in \
+		intltool-update.in \
+		"; \
+	AUTOCONFGITIGNOREFILES=; test -f $(srcdir)/configure && \
+	AUTOCONFGITIGNOREFILES=" \
+		autom4te.cache \
+		configure \
+		config.h \
+		stamp-h1 \
+		libtool \
+		config.lt \
+		"; \
+	for x in \
+		.gitignore \
+		$$GTKDOCGITIGNOREFILES \
+		$$GNOMEDOCUTILSGITIGNOREFILES \
+		$$INTLTOOLGITIGNOREFILES \
+		$$AUTOCONFGITIGNOREFILES \
+		$(GITIGNOREFILES) \
+		$(CLEANFILES) \
+		$(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" \
+		"*~" \
+		".*.swp" \
+	; do echo /$$x; done | \
+	sed "s ^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
+	sed 's@/[.]/@/@g' | \
+	LANG=C sort | uniq > $  tmp && \
+	mv $  tmp $@;
+
+all: $(srcdir)/.gitignore gitignore-recurse
+gitignore-recurse:
+	@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
+		list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+		  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore); \
+		done; \
+	fi;
+maintainer-clean-local: gitignore-clean
+gitignore-clean:
+	rm -f $(srcdir)/.gitignore
+.PHONY: gitignore-clean gitignore-recurse
+
diff --git a/src/Makefile.am b/src/Makefile.am
index 1dbcc8e..a0be38e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -143,3 +143,5 @@ CLEANFILES = \
 	event-factory-builtins.h		\
 	event-factory-builtins.c		\
 	stamp-event-factory-builtins.h
+
+-include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]