diff options
-rw-r--r-- | Makefile.am | 3 | ||||
-rw-r--r-- | docs/Makefile.am | 2 | ||||
-rw-r--r-- | examples/Makefile.am | 3 | ||||
-rw-r--r-- | gi/Makefile.am | 3 | ||||
-rw-r--r-- | gi/_glib/Makefile.am | 3 | ||||
-rw-r--r-- | gi/_gobject/Makefile.am | 2 | ||||
-rw-r--r-- | gi/overrides/Makefile.am | 2 | ||||
-rw-r--r-- | gi/repository/Makefile.am | 2 | ||||
-rw-r--r-- | git.mk | 200 | ||||
-rw-r--r-- | tests/Makefile.am | 2 |
10 files changed, 0 insertions, 222 deletions
diff --git a/Makefile.am b/Makefile.am index ea537b7d..20dbf35a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -132,6 +132,3 @@ check.nemiver: check.valgrind: cd tests && $(MAKE) check.valgrind - - --include $(top_srcdir)/git.mk diff --git a/docs/Makefile.am b/docs/Makefile.am index b9086a9f..5920d5fa 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -114,5 +114,3 @@ $(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 b680b903..af9f3d74 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,4 +1 @@ EXTRA_DIST = properties.py signal.py option.py cairo-demo.py - - --include $(top_srcdir)/git.mk diff --git a/gi/Makefile.am b/gi/Makefile.am index c51d551f..f99e45bf 100644 --- a/gi/Makefile.am +++ b/gi/Makefile.am @@ -132,6 +132,3 @@ all-local: $(LTLIBRARIES:.la=.so) build_pylinks check-local: $(LTLIBRARIES:.la=.so) build_pylinks clean-local: rm -f $(LTLIBRARIES:.la=.so) - - --include $(top_srcdir)/git.mk diff --git a/gi/_glib/Makefile.am b/gi/_glib/Makefile.am index c1520396..468e7f47 100644 --- a/gi/_glib/Makefile.am +++ b/gi/_glib/Makefile.am @@ -97,6 +97,3 @@ clean-local: rm -f $(pyglib_LTLIBRARIES:.la=.so) .la.so: $(LN_S) .libs/$@ $@ || true - - --include $(top_srcdir)/git.mk diff --git a/gi/_gobject/Makefile.am b/gi/_gobject/Makefile.am index 36fd6628..2537f99a 100644 --- a/gi/_gobject/Makefile.am +++ b/gi/_gobject/Makefile.am @@ -84,5 +84,3 @@ clean-local: rm -f $(pygobject_LTLIBRARIES:.la=.so) .la.so: $(LN_S) .libs/$@ $@ || true - --include $(top_srcdir)/git.mk diff --git a/gi/overrides/Makefile.am b/gi/overrides/Makefile.am index 5d9ddd6f..8d95eee1 100644 --- a/gi/overrides/Makefile.am +++ b/gi/overrides/Makefile.am @@ -20,5 +20,3 @@ build_pylinks: all-local: build_pylinks check-local: build_pylinks - --include $(top_srcdir)/git.mk diff --git a/gi/repository/Makefile.am b/gi/repository/Makefile.am index 27d5e81e..1177ad54 100644 --- a/gi/repository/Makefile.am +++ b/gi/repository/Makefile.am @@ -14,5 +14,3 @@ build_pylinks: all-local: build_pylinks check-local: build_pylinks - --include $(top_srcdir)/git.mk diff --git a/git.mk b/git.mk deleted file mode 100644 index abd6c0a2..00000000 --- a/git.mk +++ /dev/null @@ -1,200 +0,0 @@ -# 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/tests/Makefile.am b/tests/Makefile.am index 38bfce06..950385e9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -120,5 +120,3 @@ check.nemiver: check.valgrind: EXEC_NAME="valgrind --leak-check=full --show-possibly-lost=no --suppressions=python.supp" G_SLICE=always-malloc G_DEBUG=gc-friendly $(MAKE) check - --include $(top_srcdir)/git.mk |