summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore46
-rw-r--r--Makefile.am2
-rw-r--r--codegen/.gitignore2
-rw-r--r--codegen/Makefile.am2
-rw-r--r--docs/.gitignore7
-rw-r--r--docs/Makefile.am2
-rw-r--r--examples/Makefile.am2
-rw-r--r--gi/.gitignore40
-rw-r--r--gi/Makefile.am2
-rw-r--r--gi/overrides/Makefile.am2
-rw-r--r--gi/repository/Makefile.am2
-rw-r--r--gi/tests/Makefile.am2
-rw-r--r--git.mk200
-rw-r--r--glib/Makefile.am2
-rw-r--r--gobject/.gitignore3
-rw-r--r--gobject/Makefile.am2
-rw-r--r--tests/.gitignore2
-rw-r--r--tests/Makefile.am2
18 files changed, 222 insertions, 100 deletions
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index d93308b0..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,46 +0,0 @@
-# Autotools-generated files.
-aclocal.m4
-autom4te.cache
-compile
-config.guess
-config.h.in
-config.lt
-config.sub
-configure
-depcomp
-install-sh
-ltmain.sh
-m4
-Makefile.in
-missing
-py-compile
-
-# Configuration-generated files.
-config.h
-config.log
-config.status
-libtool
-Makefile
-PKG-INFO
-stamp-h1
-
-# Build-generated files.
-*.la
-*.lo
-*.o
-*.pc
-*.pyc
-*.so
-.deps
-.libs
-build
-dist
-
-# Other generated files.
-*~
-*.orig
-
-# Eclipse files.
-.settings
-.project
-.pydevproject
diff --git a/Makefile.am b/Makefile.am
index 40ac5eb2..c42dfccf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -131,3 +131,5 @@ check.gdb:
check.valgrind:
cd tests && $(MAKE) check.valgrind
+
+-include $(top_srcdir)/git.mk
diff --git a/codegen/.gitignore b/codegen/.gitignore
deleted file mode 100644
index f734b7ef..00000000
--- a/codegen/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Configuration-generated files.
-pygobject-codegen-2.0
diff --git a/codegen/Makefile.am b/codegen/Makefile.am
index cdb1e997..f9886eb5 100644
--- a/codegen/Makefile.am
+++ b/codegen/Makefile.am
@@ -29,3 +29,5 @@ codegen_PYTHON = \
reversewrapper.py
EXTRA_DIST = $(codegen_SCRIPTS) README.defs pygobject-codegen-$(PLATFORM_VERSION).in
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/.gitignore b/docs/.gitignore
deleted file mode 100644
index 6f502547..00000000
--- a/docs/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration-generated files.
-fixxref.py
-reference/entities.docbook
-
-# Documentation build output.
-html
-reference/builddate.xml
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 391eec8c..418df8ad 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -193,3 +193,5 @@ $(HTML_FILES): $(XML_FILES) $(XSL_FILES)
# pdfxmltex pygobject-ref.fo >output </dev/null
endif
+
+-include $(top_srcdir)/git.mk
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 7314b61a..b680b903 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,2 +1,4 @@
EXTRA_DIST = properties.py signal.py option.py cairo-demo.py
+
+-include $(top_srcdir)/git.mk
diff --git a/gi/.gitignore b/gi/.gitignore
deleted file mode 100644
index 24694626..00000000
--- a/gi/.gitignore
+++ /dev/null
@@ -1,40 +0,0 @@
-.libs/
-.deps/
-/COPYING
-Makefile
-Makefile.in
-/aclocal.m4
-/autom4te.cache/
-/config.guess
-/config.h
-/config.h.in
-/config.log
-/config.status
-/config.sub
-/configure
-/depcomp
-/install-sh
-/libtool
-/ltmain.sh
-/m4/
-/missing
-/py-compile
-/pygi-*.tar.gz
-/stamp-h1
-
-*.o
-*.lo
-*.la
-*.so
-*.pyc
-*.gir
-*.typelib
-
-.*.swp
-
-*~
-*.orig
-*.rej
-
-tests/tmp-introspect*
-
diff --git a/gi/Makefile.am b/gi/Makefile.am
index abd895e8..a98993b5 100644
--- a/gi/Makefile.am
+++ b/gi/Makefile.am
@@ -90,3 +90,5 @@ check-local: $(LTLIBRARIES:.la=.so)
clean-local:
rm -f $(LTLIBRARIES:.la=.so)
+
+-include $(top_srcdir)/git.mk
diff --git a/gi/overrides/Makefile.am b/gi/overrides/Makefile.am
index 2f860c17..7a15b467 100644
--- a/gi/overrides/Makefile.am
+++ b/gi/overrides/Makefile.am
@@ -13,3 +13,5 @@ pygioverrides_PYTHON = \
keysyms.py \
__init__.py
+
+-include $(top_srcdir)/git.mk
diff --git a/gi/repository/Makefile.am b/gi/repository/Makefile.am
index efc9c11c..ece9c4ff 100644
--- a/gi/repository/Makefile.am
+++ b/gi/repository/Makefile.am
@@ -6,3 +6,5 @@ pygirepositorydir = $(pkgpyexecdir)/repository
pygirepository_PYTHON = \
__init__.py
+
+-include $(top_srcdir)/git.mk
diff --git a/gi/tests/Makefile.am b/gi/tests/Makefile.am
index f8a65dc5..883bc083 100644
--- a/gi/tests/Makefile.am
+++ b/gi/tests/Makefile.am
@@ -20,3 +20,5 @@ check.valgrind:
%.valgrind:
EXEC_NAME="valgrind" TEST_NAMES=$* $(MAKE) check
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 00000000..abd6c0a2
--- /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/glib/Makefile.am b/glib/Makefile.am
index c0bf47ee..32d0ec9a 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -57,3 +57,5 @@ clean-local:
rm -f $(pyglib_LTLIBRARIES:.la=.so)
.la.so:
$(LN_S) .libs/$@ $@ || true
+
+-include $(top_srcdir)/git.mk
diff --git a/gobject/.gitignore b/gobject/.gitignore
deleted file mode 100644
index 5efe4c79..00000000
--- a/gobject/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Autogenerated with 'generate-constants.c'.
-generate-constants
-constants.py
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index f4038bb4..7208329d 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -71,3 +71,5 @@ clean-local:
rm -f $(pygobject_LTLIBRARIES:.la=.so)
.la.so:
$(LN_S) .libs/$@ $@ || true
+
+-include $(top_srcdir)/git.mk
diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644
index d2f2b41f..00000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-file.txt~
-stream.txt
diff --git a/tests/Makefile.am b/tests/Makefile.am
index dfcb1317..3d6fcfbc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -112,3 +112,5 @@ check.gdb:
check.valgrind:
EXEC_NAME="valgrind --suppressions=python.supp" G_SLICE=always-malloc G_DEBUG=gc-friendly $(MAKE) check
+
+-include $(top_srcdir)/git.mk
View Lorry Controller Status