misc: add git.mk

19 files changed, 357 insertions, 178 deletions

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e848c649..00000000
--- a/.cvsignore
+++ /dev/null
@@ -1,35 +0,0 @@
-Makefile
-Makefile.in
-aclocal.m4
-confdefs.h
-config.cache
-config.guess
-config.h
-config.log
-config.status
-config.sub
-configure
-configure.scan
-libtool
-ltconfig
-ltmain.sh
-stamp-h
-stamp-h.in
-stamp-h1
-stamp.h
-version.h
-config.h.in
-install-sh
-missing
-mkinstalldirs
-INSTALL
-intl
-ABOUT-NLS
-COPYING
-intltool-*
-metacity.spec
-autom4te.cache
-compile
-depcomp
-omf.make
-xmldocs.make
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 416b9aa1..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,102 +0,0 @@
-INSTALL
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache/
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-doc/Makefile
-doc/Makefile.in
-doc/creating_themes/*/*.mo
-doc/creating_themes/*/*.xml
-doc/creating_themes/*/*.docbook
-doc/creating_themes/*/*.stamp
-doc/creating_themes/Makefile
-doc/creating_themes/Makefile.in
-doc/man/Makefile
-doc/man/Makefile.in
-install-sh
-intltool-extract.in
-intltool-merge.in
-intltool-update.in
-libtool
-ltmain.sh
-missing
-mkinstalldirs
-omf.make
-po/*.gmo
-po/.intltool-merge-cache
-po/Makefile
-po/Makefile.in
-po/Makefile.in.in
-po/POTFILES
-po/stamp-it
-src/.deps/
-src/.libs/
-src/50-metacity-launchers.xml
-src/50-metacity-navigation.xml
-src/50-metacity-screenshot.xml
-src/50-metacity-system.xml
-src/50-metacity-windows.xml
-src/Makefile
-src/Makefile.in
-src/*.o
-src/inlinepixbufs.h
-src/libmetacity-private.la
-src/libmetacity-private.pc
-src/libmetacity_private_la-boxes.lo
-src/libmetacity_private_la-gradient.lo
-src/libmetacity_private_la-preview-widget.lo
-src/libmetacity_private_la-theme-parser.lo
-src/libmetacity_private_la-theme.lo
-src/libmetacity_private_la-util.lo
-src/metacity
-src/metacity-theme-viewer
-src/metacity-wm.desktop
-src/metacity.desktop
-src/org.gnome.metacity.gschema.valid
-src/org.gnome.metacity.gschema.xml
-src/schema_bindings
-src/testasyncgetprop
-src/testboxes
-src/testgradient
-src/themes/Makefile
-src/themes/Makefile.in
-src/tools/.deps/
-src/tools/Makefile
-src/tools/Makefile.in
-src/tools/metacity-grayscale
-src/tools/metacity-grayscale.o
-src/tools/metacity-mag
-src/tools/metacity-mag.o
-src/tools/metacity-message
-src/tools/metacity-message.o
-src/tools/metacity-window-demo
-src/tools/metacity-window-demo.o
-src/ui.o
-src/util.o
-src/window-props.o
-src/window.o
-src/wm-tester/.deps/
-src/wm-tester/Makefile
-src/wm-tester/Makefile.in
-src/wm-tester/focus-window
-src/wm-tester/focus-window.o
-src/wm-tester/main.o
-src/wm-tester/test-gravity
-src/wm-tester/test-gravity.o
-src/wm-tester/test-resizing
-src/wm-tester/test-resizing.o
-src/wm-tester/test-size-hints
-src/wm-tester/test-size-hints.o
-src/wm-tester/wm-tester
-src/workspace.o
-src/xprops.o
-stamp-h1
-xmldocs.make
diff --git a/Makefile.am b/Makefile.am
index 725c69c9..6c816c6b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,29 @@
+SUBDIRS = \
+	src \
+	po \
+	doc
 
-SUBDIRS=src po doc
+EXTRA_DIST = \
+	HACKING \
+	MAINTAINERS \
+	rationales.txt
 
-EXTRA_DIST = HACKING MAINTAINERS rationales.txt \
-	intltool-extract.in intltool-merge.in intltool-update.in
+MAINTAINERCLEANFILES = \
+	$(srcdir)/INSTALL \
+	$(srcdir)/aclocal.m4 \
+	$(srcdir)/compile \
+	$(srcdir)/config.guess \
+	$(srcdir)/config.h.in \
+	$(srcdir)/config.h.in~ \
+	$(srcdir)/config.sub \
+	$(srcdir)/depcomp \
+	$(srcdir)/install-sh \
+	$(srcdir)/ltmain.sh \
+	$(srcdir)/missing \
+	`find "$(srcdir)" -type f -name Makefile.in -print` \
+	$(srcdir)/configure
 
-DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache
+GITIGNOREFILES = \
+	$(PACKAGE)-\*.tar.{gz,bz2,xz}
+
+-include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 985038cc..1882648b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,8 @@ AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
 AM_MAINTAINER_MODE([enable])
 
+GNOME_MAINTAINER_MODE_DEFINES
+
 # Honor aclocal flags
 AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
 
diff --git a/doc/.cvsignore b/doc/.cvsignore
deleted file mode 100644
index 282522db..00000000
--- a/doc/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6784ec22..0ef55a62 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,3 +6,5 @@ endif
 
 EXTRA_DIST=theme-format.txt metacity-theme.dtd dialogs.txt code-overview.txt \
 	how-to-get-focus-right.txt
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/creating_themes/Makefile.am b/doc/creating_themes/Makefile.am
index 65d8fad5..78c33001 100644
--- a/doc/creating_themes/Makefile.am
+++ b/doc/creating_themes/Makefile.am
@@ -12,4 +12,4 @@ HELP_FILES = index.docbook
 HELP_LINGUAS = de
 
 
-
+-include $(top_srcdir)/git.mk
diff --git a/doc/man/.cvsignore b/doc/man/.cvsignore
deleted file mode 100644
index 282522db..00000000
--- a/doc/man/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 1277f5b7..77b8ab13 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -2,3 +2,5 @@ man_MANS = metacity.1 metacity-theme-viewer.1 \
 	   metacity-window-demo.1 metacity-message.1
 
 EXTRA_DIST = $(man_MANS)
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 00000000..56384880
--- /dev/null
+++ b/git.mk
@@ -0,0 +1,318 @@
+# git.mk
+#
+# Copyright 2009, Red Hat, Inc.
+# 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 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
+# 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
+# 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 make targets.
+#
+# 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 and I'll diagnose.
+#
+# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
+# Makefile.am.sample in the git.mk git repo.
+#
+# 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, yelp.m4, mallard, intltool, gsettings, dejagnu, appdata.
+#
+# This makefile provides the following targets:
+#
+# - all: "make all" will build all gitignore files.
+# - gitignore: makes all gitignore files in the current dir and subdirs.
+# - .gitignore: make gitignore file for the current dir.
+# - gitignore-recurse: makes all gitignore files in the subdirs.
+#
+# 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.
+#
+
+
+
+###############################################################################
+# 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)/autoscan.log \
+	$(srcdir)/configure.scan \
+	`AUX_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' ./configure.ac); \
+	 test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \
+	 for x in \
+		ar-lib \
+		compile \
+		config.guess \
+		config.sub \
+		depcomp \
+		install-sh \
+		ltmain.sh \
+		missing \
+		mkinstalldirs \
+		test-driver \
+	 ; do echo "$$AUX_DIR/$$x"; done` \
+	`cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \
+	head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
+#
+# All modules should also be fine including the following variable, which
+# removes automake-generated Makefile.in files:
+GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \
+	`cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' ./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() may also include this,
+# though it's harmless to include regardless.
+GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \
+	`MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' ./configure.ac); \
+	 if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \
+		for x in \
+			libtool.m4 \
+			ltoptions.m4 \
+			ltsugar.m4 \
+			ltversion.m4 \
+			lt~obsolete.m4 \
+		; do echo "$$MACRO_DIR/$$x"; done; \
+	 fi`
+
+
+
+###############################################################################
+# Default rule is to install ourselves in all Makefile.am files:
+###############################################################################
+
+git-all: git-mk-install
+
+git-mk-install:
+	@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"; \
+		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
+
+
+
+###############################################################################
+# Actual .gitignore generation:
+###############################################################################
+
+$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
+	@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 \
+				$(DOC_MODULE)-decl.txt \
+				tmpl/$(DOC_MODULE)-unused.sgml \
+				"tmpl/*.bak" \
+				xml html \
+			; do echo "/$$x"; done; \
+			FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace 'GTK_DOC_CHECK:$$2' ./configure.ac); \
+			case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \
+		fi; \
+		if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
+			for lc in $(DOC_LINGUAS); do \
+				for x in \
+					$(if $(DOC_MODULE),$(DOC_MODULE).xml) \
+					$(DOC_PAGES) \
+					$(DOC_INCLUDES) \
+				; do echo "/$$lc/$$x"; done; \
+			done; \
+			for x in \
+				$(_DOC_OMF_ALL) \
+				$(_DOC_DSK_ALL) \
+				$(_DOC_HTML_ALL) \
+				$(_DOC_MOFILES) \
+				$(DOC_H_FILE) \
+				"*/.xml2po.mo" \
+				"*/*.omf.out" \
+			; do echo /$$x; done; \
+		fi; \
+		if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
+			for lc in $(HELP_LINGUAS); do \
+				for x in \
+					$(HELP_FILES) \
+					"$$lc.stamp" \
+					"$$lc.mo" \
+				; 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; \
+		fi; \
+		if test "x$(appdata_XML)" = x; then :; else \
+			for x in \
+				$(appdata_XML:.xml=.valid) \
+			; 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/*.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; \
+		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; \
+		if test "x$(DEJATOOL)" = x; then :; else \
+			for x in \
+				$(DEJATOOL) \
+			; 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 -a "x$(GTKDOC_RUN)" = x; then :; else \
+			for x in \
+				"*.lo" \
+				".libs" "_libs" \
+			; do echo "$$x"; done; \
+		fi; \
+		for x in \
+			.gitignore \
+			$(GITIGNOREFILES) \
+			$(CLEANFILES) \
+			$(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \
+			$(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
+			$(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
+			so_locations \
+			$(MOSTLYCLEANFILES) \
+			$(TEST_LOGS) \
+			$(TEST_LOGS:.log=.trs) \
+			$(TEST_SUITE_LOG) \
+			"*.$(OBJEXT)" \
+			"*.gcda" \
+			"*.gcno" \
+			$(DISTCLEANFILES) \
+			$(am__CONFIG_DISTCLEAN_FILES) \
+			$(CONFIG_CLEAN_FILES) \
+			TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
+			"*.tab.c" \
+			$(MAINTAINERCLEANFILES) \
+			$(BUILT_SOURCES) \
+			$(DEPDIR) \
+			$(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
+			$(filter %_vala.stamp,$(DIST_COMMON)) \
+			$(filter %.vapi,$(DIST_COMMON)) \
+			$(filter $(addprefix %,$(notdir $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))))),$(DIST_COMMON)) \
+			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: $(srcdir)/.gitignore gitignore-recurse
+
+gitignore-recurse-maybe:
+	@for subdir in $(DIST_SUBDIRS); do \
+	  case " $(SUBDIRS) " in \
+	    *" $$subdir "*) :;; \
+	    *) test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir");; \
+	  esac; \
+	done
+gitignore-recurse:
+	@for subdir in $(DIST_SUBDIRS); do \
+	    test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir"); \
+	done
+
+maintainer-clean: gitignore-clean
+gitignore-clean:
+	-rm -f $(srcdir)/.gitignore
+
+.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index f62415b3..00000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,15 +0,0 @@
-.libs
-Makefile.in
-Makefile
-.deps
-metacity
-metacity-theme-viewer
-metacity-dialog
-testboxes
-testgradient
-inlinepixbufs.h
-metacity.desktop
-metacity-wm.desktop
-metacity.schemas
-libmetacity-private.pc
-testasyncgetprop
diff --git a/src/Makefile.am b/src/Makefile.am
index 35d1e323..55e8de94 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -206,3 +206,4 @@ EXTRA_DIST=$(desktopfiles_files)	 	\
 	$(xml_in_files)				\
 	libmetacity-private.pc.in
 
+-include $(top_srcdir)/git.mk
diff --git a/src/themes/.cvsignore b/src/themes/.cvsignore
deleted file mode 100644
index 282522db..00000000
--- a/src/themes/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/themes/Makefile.am b/src/themes/Makefile.am
index 82c504e8..1d39ffa4 100644
--- a/src/themes/Makefile.am
+++ b/src/themes/Makefile.am
@@ -48,3 +48,5 @@ dist-hook:
 		    	cp $$i $(distdir)/$$THEME;					\
 	  	 done)									\
 	done
+
+-include $(top_srcdir)/git.mk
diff --git a/src/tools/.cvsignore b/src/tools/.cvsignore
deleted file mode 100644
index 8ecc6b5e..00000000
--- a/src/tools/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile
-Makefile.in
-metacity-grayscale
-metacity-message
-metacity-mag
-metacity-properties
-metacity-properties.desktop
-metacity-window-demo
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 5d76d57f..86e320a0 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -31,3 +31,4 @@ metacity_grayscale_LDADD = @METACITY_WINDOW_DEMO_LIBS@
 
 EXTRA_DIST=$(icon_DATA)
 
+-include $(top_srcdir)/git.mk
diff --git a/src/wm-tester/.cvsignore b/src/wm-tester/.cvsignore
deleted file mode 100644
index 0bca29e8..00000000
--- a/src/wm-tester/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-Makefile
-Makefile.in
-focus-window
-test-gravity
-test-resizing
-wm-tester
-test-size-hints
diff --git a/src/wm-tester/Makefile.am b/src/wm-tester/Makefile.am
index b52b01b6..0e0ead03 100644
--- a/src/wm-tester/Makefile.am
+++ b/src/wm-tester/Makefile.am
@@ -23,3 +23,5 @@ test_gravity_LDADD= @METACITY_LIBS@
 test_resizing_LDADD= @METACITY_LIBS@
 test_size_hints_LDADD= @METACITY_LIBS@
 focus_window_LDADD= @METACITY_LIBS@
+
+-include $(top_srcdir)/git.mk
diff --git a/stamp.h.in b/stamp.h.in
deleted file mode 100644
index e69de29b..00000000
--- a/stamp.h.in
+++ /dev/null