diff options
33 files changed, 455 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index c41094c1..28c04d32 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,3 +45,4 @@ dist: ChangeLog .PHONY: ChangeLog +-include $(top_srcdir)/git.mk diff --git a/baobab/Makefile.am b/baobab/Makefile.am index ccfa5b8a..4071ac23 100644 --- a/baobab/Makefile.am +++ b/baobab/Makefile.am @@ -1,3 +1,5 @@ SUBDIRS = src data pixmaps help EXTRA_DIST = AUTHORS README.md TODO + +-include $(top_srcdir)/git.mk diff --git a/baobab/data/Makefile.am b/baobab/data/Makefile.am index ea1b3914..d09ddcf4 100644 --- a/baobab/data/Makefile.am +++ b/baobab/data/Makefile.am @@ -32,3 +32,5 @@ CLEANFILES = \ $(baobabapp_DATA) \ $(gsettings_SCHEMAS) \ $(appdata_DATA) + +-include $(top_srcdir)/git.mk diff --git a/baobab/help/Makefile.am b/baobab/help/Makefile.am index 857d359a..e3776b82 100644 --- a/baobab/help/Makefile.am +++ b/baobab/help/Makefile.am @@ -17,3 +17,5 @@ IGNORE_HELP_LINGUAS = HELP_LINGUAS = $(if $(IGNORE_HELP_LINGUAS), \ $(filter-out $(IGNORE_HELP_LINGUAS),$(subst /,,$(dir $(wildcard */*.po)))), \ $(subst /,,$(dir $(wildcard */*.po))) ) + +-include $(top_srcdir)/git.mk diff --git a/baobab/pixmaps/Makefile.am b/baobab/pixmaps/Makefile.am index aa0380b1..22fd4331 100644 --- a/baobab/pixmaps/Makefile.am +++ b/baobab/pixmaps/Makefile.am @@ -64,3 +64,5 @@ build-png-icons: | $(png_icons) clean-png-icons: rm -f $(png_icons) + +-include $(top_srcdir)/git.mk diff --git a/baobab/src/Makefile.am b/baobab/src/Makefile.am index 8af4b1d3..e0d56b23 100644 --- a/baobab/src/Makefile.am +++ b/baobab/src/Makefile.am @@ -60,3 +60,5 @@ mate_disk_usage_analyzer_LDADD = \ $(NULL) CLEANFILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk @@ -0,0 +1,400 @@ +# git.mk, a small Makefile to autogenerate .gitignore files +# for autotools-based projects. +# +# 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: +GIT_MK_URL = https://raw.githubusercontent.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, +# appstream, hotdoc. +# +# 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.rpath \ + config.sub \ + depcomp \ + install-sh \ + ltmain.sh \ + missing \ + mkinstalldirs \ + test-driver \ + ylwrap \ + ; 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` +# +# Modules that use gettext and use AC_CONFIG_MACRO_DIR() may also include this, +# though it's harmless to include regardless. +GITIGNORE_MAINTAINERCLEANFILES_M4_GETTEXT = \ + `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 \ + codeset.m4 \ + extern-inline.m4 \ + fcntl-o.m4 \ + gettext.m4 \ + glibc2.m4 \ + glibc21.m4 \ + iconv.m4 \ + intdiv0.m4 \ + intl.m4 \ + intldir.m4 \ + intlmacosx.m4 \ + intmax.m4 \ + inttypes-pri.m4 \ + inttypes_h.m4 \ + lcmessage.m4 \ + lib-ld.m4 \ + lib-link.m4 \ + lib-prefix.m4 \ + lock.m4 \ + longlong.m4 \ + nls.m4 \ + po.m4 \ + printf-posix.m4 \ + progtest.m4 \ + size_max.m4 \ + stdint_h.m4 \ + threadlib.m4 \ + uintmax_t.m4 \ + visibility.m4 \ + wchar_t.m4 \ + wint_t.m4 \ + xsize.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" + +git-mk-update: + wget $(GIT_MK_URL) -O $(top_srcdir)/git.mk + +.PHONY: git-all git-mk-install git-mk-update + + + +############################################################################### +# Actual .gitignore generation: +############################################################################### + +$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk $(top_srcdir)/configure.ac + @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" \ + $(REPORT_FILES) \ + $(DOC_MODULE).pdf \ + 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; \ + if echo "$(SCAN_OPTIONS)" | grep -q "\-\-rebuild-types"; then \ + echo "/$(DOC_MODULE).types"; \ + fi; \ + if echo "$(SCAN_OPTIONS)" | grep -q "\-\-rebuild-sections"; then \ + echo "/$(DOC_MODULE)-sections.txt"; \ + fi; \ + if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + for x in \ + $(SETUP_FILES) \ + $(DOC_MODULE).types \ + ; do echo "/$$x"; done; \ + fi; \ + 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$(HOTDOC)" = x; then :; else \ + $(foreach project, $(HOTDOC_PROJECTS),echo "/$(call HOTDOC_TARGET,$(project))"; \ + echo "/$(shell $(call HOTDOC_PROJECT_COMMAND,$(project)) --get-conf-path output)" ; \ + echo "/$(shell $(call HOTDOC_PROJECT_COMMAND,$(project)) --get-private-folder)" ; \ + ) \ + for x in \ + .hotdoc.d \ + ; 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 "x$(appstream_XML)" = x; then :; else \ + for x in \ + $(appstream_XML:.xml=.valid) \ + ; do echo "/$$x"; done; \ + fi; \ + if test -f $(srcdir)/po/Makefile.in.in; then \ + for x in \ + ABOUT-NLS \ + 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/stamp-po \ + 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$(findstring libtool,$(LTCOMPILE))" = x -a "x$(findstring libtool,$(LTCXXCOMPILE))" = 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) \ + $(TESTS:=.test) \ + "*.gcda" \ + "*.gcno" \ + $(DISTCLEANFILES) \ + $(am__CONFIG_DISTCLEAN_FILES) \ + $(CONFIG_CLEAN_FILES) \ + TAGS ID GTAGS GRTAGS GSYMS GPATH tags \ + "*.tab.c" \ + $(MAINTAINERCLEANFILES) \ + $(BUILT_SOURCES) \ + $(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; \ + for x in \ + "*.$(OBJEXT)" \ + $(DEPDIR) \ + ; do echo "$$x"; done; \ + } | \ + sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \ + sed 's@/[.]/@/@g' | \ + LC_ALL=C sort | uniq > [email protected] && \ + mv [email protected] $@; + +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/gsearchtool/Makefile.am b/gsearchtool/Makefile.am index 145b98b5..3eae7e66 100644 --- a/gsearchtool/Makefile.am +++ b/gsearchtool/Makefile.am @@ -1,2 +1,3 @@ SUBDIRS = data help libeggsmclient libmateui-deprecated src +-include $(top_srcdir)/git.mk diff --git a/gsearchtool/data/Makefile.am b/gsearchtool/data/Makefile.am index feffd01c..74e6748e 100644 --- a/gsearchtool/data/Makefile.am +++ b/gsearchtool/data/Makefile.am @@ -35,3 +35,5 @@ CLEANFILES = \ disthook: cd $(distdir) ; rm -f $(CLEANFILES) + +-include $(top_srcdir)/git.mk diff --git a/gsearchtool/help/Makefile.am b/gsearchtool/help/Makefile.am index ad59d979..a64e0fa9 100644 --- a/gsearchtool/help/Makefile.am +++ b/gsearchtool/help/Makefile.am @@ -10,3 +10,5 @@ IGNORE_HELP_LINGUAS = HELP_LINGUAS = $(if $(IGNORE_HELP_LINGUAS), \ $(filter-out $(IGNORE_HELP_LINGUAS),$(subst /,,$(dir $(wildcard */*.po)))), \ $(subst /,,$(dir $(wildcard */*.po))) ) + +-include $(top_srcdir)/git.mk diff --git a/gsearchtool/libeggsmclient/Makefile.am b/gsearchtool/libeggsmclient/Makefile.am index 205c4329..311c6a0e 100644 --- a/gsearchtool/libeggsmclient/Makefile.am +++ b/gsearchtool/libeggsmclient/Makefile.am @@ -12,3 +12,5 @@ libeggsmclient_la_SOURCES = eggdesktopfile.h \ eggsmclient.c \ eggsmclient-private.h \ eggsmclient-xsmp.c + +-include $(top_srcdir)/git.mk diff --git a/gsearchtool/libmateui-deprecated/Makefile.am b/gsearchtool/libmateui-deprecated/Makefile.am index 8bf41d4b..60b58c17 100644 --- a/gsearchtool/libmateui-deprecated/Makefile.am +++ b/gsearchtool/libmateui-deprecated/Makefile.am @@ -12,3 +12,5 @@ libmateui_deprecated_la_LIBADD = \ libmateui_deprecated_la_SOURCES = \ gsearchtool-entry.h \ gsearchtool-entry.c + +-include $(top_srcdir)/git.mk diff --git a/gsearchtool/src/Makefile.am b/gsearchtool/src/Makefile.am index 14582a23..8cc8740c 100644 --- a/gsearchtool/src/Makefile.am +++ b/gsearchtool/src/Makefile.am @@ -37,3 +37,4 @@ mate_search_tool_LDADD = \ $(libeggsmclient_LIB) \ $(libmateui_deprecated_LIB) +-include $(top_srcdir)/git.mk diff --git a/logview/Makefile.am b/logview/Makefile.am index d77eddc5..9d7a3e7e 100644 --- a/logview/Makefile.am +++ b/logview/Makefile.am @@ -1,2 +1,3 @@ SUBDIRS = data help src +-include $(top_srcdir)/git.mk diff --git a/logview/data/Makefile.am b/logview/data/Makefile.am index 23c27a2e..1d346fec 100644 --- a/logview/data/Makefile.am +++ b/logview/data/Makefile.am @@ -24,3 +24,5 @@ DISTCLEANFILES = \ $(desktop_DATA) \ $(desktop_in_files) \ $(gsettings_SCHEMAS) + +-include $(top_srcdir)/git.mk diff --git a/logview/data/icons/Makefile.am b/logview/data/icons/Makefile.am index 9662983e..f2640e04 100644 --- a/logview/data/icons/Makefile.am +++ b/logview/data/icons/Makefile.am @@ -108,3 +108,5 @@ build-png-icons: | $(png_icons) clean-png-icons: rm -f $(png_icons) + +-include $(top_srcdir)/git.mk diff --git a/logview/help/Makefile.am b/logview/help/Makefile.am index 249a78a8..a68f3978 100644 --- a/logview/help/Makefile.am +++ b/logview/help/Makefile.am @@ -10,3 +10,5 @@ IGNORE_HELP_LINGUAS = HELP_LINGUAS = $(if $(IGNORE_HELP_LINGUAS), \ $(filter-out $(IGNORE_HELP_LINGUAS),$(subst /,,$(dir $(wildcard */*.po)))), \ $(subst /,,$(dir $(wildcard */*.po))) ) + +-include $(top_srcdir)/git.mk diff --git a/logview/src/Makefile.am b/logview/src/Makefile.am index 1fbff996..ec90546f 100644 --- a/logview/src/Makefile.am +++ b/logview/src/Makefile.am @@ -76,3 +76,4 @@ CLEANFILES = \ dist-hook: cd $(distdir) ; rm -f $(CLEANFILES) +-include $(top_srcdir)/git.mk diff --git a/logview/src/tests/Makefile.am b/logview/src/tests/Makefile.am index b7b668c3..3536728c 100644 --- a/logview/src/tests/Makefile.am +++ b/logview/src/tests/Makefile.am @@ -7,3 +7,5 @@ noinst_PROGRAMS = test-reader test_reader_SOURCES = test-reader.c ../logview-log.c ../logview-utils.c test_reader_LDADD = $(GLIB_LIBS) $(GIO_LIBS) $(Z_LIBS) -lm + +-include $(top_srcdir)/git.mk diff --git a/mate-dictionary/Makefile.am b/mate-dictionary/Makefile.am index 8c9cce1c..ef0d832e 100644 --- a/mate-dictionary/Makefile.am +++ b/mate-dictionary/Makefile.am @@ -1,3 +1,5 @@ SUBDIRS = libgdict src data docs help EXTRA_DIST = TODO README.md AUTHORS + +-include $(top_srcdir)/git.mk diff --git a/mate-dictionary/data/Makefile.am b/mate-dictionary/data/Makefile.am index f7dee120..66d18a04 100644 --- a/mate-dictionary/data/Makefile.am +++ b/mate-dictionary/data/Makefile.am @@ -88,3 +88,5 @@ CLEANFILES = \ $(gsettings_SCHEMAS) \ mate-dictionary.appdata.xml \ $(NULL) + +-include $(top_srcdir)/git.mk diff --git a/mate-dictionary/docs/Makefile.am b/mate-dictionary/docs/Makefile.am index fcc10bfd..b7c84c7d 100644 --- a/mate-dictionary/docs/Makefile.am +++ b/mate-dictionary/docs/Makefile.am @@ -1,3 +1,5 @@ SUBDIRS = reference EXTRA_DIST = source-configuration.txt + +-include $(top_srcdir)/git.mk diff --git a/mate-dictionary/docs/reference/Makefile.am b/mate-dictionary/docs/reference/Makefile.am index 20467a8e..70178440 100644 --- a/mate-dictionary/docs/reference/Makefile.am +++ b/mate-dictionary/docs/reference/Makefile.am @@ -1 +1,3 @@ SUBDIRS = gdict + +-include $(top_srcdir)/git.mk diff --git a/mate-dictionary/docs/reference/gdict/Makefile.am b/mate-dictionary/docs/reference/gdict/Makefile.am index 56b5053c..41d556dc 100644 --- a/mate-dictionary/docs/reference/gdict/Makefile.am +++ b/mate-dictionary/docs/reference/gdict/Makefile.am @@ -73,3 +73,5 @@ EXTRA_DIST += version.xml.in # for f in $(srcdir)/TEXT/* ; do \ # test -f $$f && cp -p $$f $(distdir)/TEXT; \ # done + +-include $(top_srcdir)/git.mk diff --git a/mate-dictionary/help/Makefile.am b/mate-dictionary/help/Makefile.am index aa440193..edb996f3 100644 --- a/mate-dictionary/help/Makefile.am +++ b/mate-dictionary/help/Makefile.am @@ -18,3 +18,5 @@ IGNORE_HELP_LINGUAS = HELP_LINGUAS = $(if $(IGNORE_HELP_LINGUAS), \ $(filter-out $(IGNORE_HELP_LINGUAS),$(subst /,,$(dir $(wildcard */*.po)))), \ $(subst /,,$(dir $(wildcard */*.po))) ) + +-include $(top_srcdir)/git.mk diff --git a/mate-dictionary/libgdict/Makefile.am b/mate-dictionary/libgdict/Makefile.am index 4882749c..b422f072 100644 --- a/mate-dictionary/libgdict/Makefile.am +++ b/mate-dictionary/libgdict/Makefile.am @@ -127,3 +127,4 @@ distclean-local: rm -f $(MAINTAINERCLEANFILES); \ fi +-include $(top_srcdir)/git.mk diff --git a/mate-dictionary/src/Makefile.am b/mate-dictionary/src/Makefile.am index 6eeac251..af5e4edc 100644 --- a/mate-dictionary/src/Makefile.am +++ b/mate-dictionary/src/Makefile.am @@ -93,3 +93,5 @@ mate_dictionary_applet_LDADD = \ $(NULL) endif # BUILD_GDICT_APPLET + +-include $(top_srcdir)/git.mk diff --git a/mate-disk-image-mounter/Makefile.am b/mate-disk-image-mounter/Makefile.am index 9768a98a..21cdfbe6 100644 --- a/mate-disk-image-mounter/Makefile.am +++ b/mate-disk-image-mounter/Makefile.am @@ -1 +1,3 @@ SUBDIRS = src data + +-include $(top_srcdir)/git.mk diff --git a/mate-disk-image-mounter/data/Makefile.am b/mate-disk-image-mounter/data/Makefile.am index 25c1d75d..8f00bb5d 100644 --- a/mate-disk-image-mounter/data/Makefile.am +++ b/mate-disk-image-mounter/data/Makefile.am @@ -13,3 +13,5 @@ EXTRA_DIST = \ CLEANFILES = \ $(diskimagemounter_DATA) \ $(NULL) + +-include $(top_srcdir)/git.mk diff --git a/mate-disk-image-mounter/src/Makefile.am b/mate-disk-image-mounter/src/Makefile.am index 25c7101f..7e65fbcf 100644 --- a/mate-disk-image-mounter/src/Makefile.am +++ b/mate-disk-image-mounter/src/Makefile.am @@ -25,3 +25,5 @@ mate_disk_image_mounter_LDADD = \ $(UDISKS2_LIBS) \ $(GTK_LIBS) \ $(NULL) + +-include $(top_srcdir)/git.mk diff --git a/mate-screenshot/Makefile.am b/mate-screenshot/Makefile.am index 29d83f25..5d55ad08 100644 --- a/mate-screenshot/Makefile.am +++ b/mate-screenshot/Makefile.am @@ -1,2 +1,3 @@ SUBDIRS = data src +-include $(top_srcdir)/git.mk diff --git a/mate-screenshot/data/Makefile.am b/mate-screenshot/data/Makefile.am index 9a9664b4..b713dc6f 100644 --- a/mate-screenshot/data/Makefile.am +++ b/mate-screenshot/data/Makefile.am @@ -34,3 +34,4 @@ install-exec-local: rm -f $(DESTDIR)$(mandir)/man1/mate-panel-screenshot.1 ln -s mate-screenshot.1 $(DESTDIR)$(mandir)/man1/mate-panel-screenshot.1 +-include $(top_srcdir)/git.mk diff --git a/mate-screenshot/src/Makefile.am b/mate-screenshot/src/Makefile.am index cabc4b0a..c57f5537 100644 --- a/mate-screenshot/src/Makefile.am +++ b/mate-screenshot/src/Makefile.am @@ -61,3 +61,4 @@ install-exec-local: rm -f $(DESTDIR)$(bindir)/mate-panel-screenshot ln -s mate-screenshot $(DESTDIR)$(bindir)/mate-panel-screenshot +-include $(top_srcdir)/git.mk |