diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | git.mk | 400 | ||||
| -rw-r--r-- | mate-settings-daemon/Makefile.am | 1 | ||||
| -rw-r--r-- | plugins/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/a11y-keyboard/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/a11y-settings/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/background/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/clipboard/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/common/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/datetime/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/dummy/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/housekeeping/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/keybindings/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/keyboard/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/media-keys/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/mouse/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/mpris/Makefile.am | 1 | ||||
| -rw-r--r-- | plugins/rfkill/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/smartcard/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/sound/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/typing-break/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/xrandr/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/xrdb/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/xrdb/data/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/xsettings/Makefile.am | 2 | 
26 files changed, 447 insertions, 0 deletions
| diff --git a/Makefile.am b/Makefile.am index e6eeaad..5687142 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,3 +33,4 @@ dist: ChangeLog  .PHONY: ChangeLog +-include $(top_srcdir)/git.mk diff --git a/data/Makefile.am b/data/Makefile.am index 7c6f03f..3745513 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -81,3 +81,5 @@ DISTCLEANFILES = 			\  MAINTAINERCLEANFILES =			\  	*~				\  	Makefile.in + +-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/mate-settings-daemon/Makefile.am b/mate-settings-daemon/Makefile.am index ed0f1b1..4acc62f 100644 --- a/mate-settings-daemon/Makefile.am +++ b/mate-settings-daemon/Makefile.am @@ -96,5 +96,6 @@ CLEANFILES = 				\  	$(BUILT_SOURCES)		\  	$(NULL) +-include $(top_srcdir)/git.mk  # vim: ts=8 diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 3e14a03..fe8bf9a 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -36,3 +36,5 @@ endif  SUBDIRS = common $(enabled_plugins)  DIST_SUBDIRS = $(SUBDIRS) $(disabled_plugins) + +-include $(top_srcdir)/git.mk diff --git a/plugins/a11y-keyboard/Makefile.am b/plugins/a11y-keyboard/Makefile.am index c21f78e..0881088 100644 --- a/plugins/a11y-keyboard/Makefile.am +++ b/plugins/a11y-keyboard/Makefile.am @@ -89,3 +89,5 @@ DISTCLEANFILES =		\  $(plugin_DATA): $(plugin_in_files)  	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + +-include $(top_srcdir)/git.mk diff --git a/plugins/a11y-settings/Makefile.am b/plugins/a11y-settings/Makefile.am index bcd0d2f..3b33b3f 100644 --- a/plugins/a11y-settings/Makefile.am +++ b/plugins/a11y-settings/Makefile.am @@ -42,3 +42,5 @@ DISTCLEANFILES =		\  $(plugin_DATA): $(plugin_in_files)  	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + +-include $(top_srcdir)/git.mk diff --git a/plugins/background/Makefile.am b/plugins/background/Makefile.am index d969258..ac32ceb 100644 --- a/plugins/background/Makefile.am +++ b/plugins/background/Makefile.am @@ -80,3 +80,5 @@ DISTCLEANFILES =		\  $(plugin_DATA): $(plugin_in_files)  	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + +-include $(top_srcdir)/git.mk diff --git a/plugins/clipboard/Makefile.am b/plugins/clipboard/Makefile.am index e42d798..d8baed9 100644 --- a/plugins/clipboard/Makefile.am +++ b/plugins/clipboard/Makefile.am @@ -53,3 +53,5 @@ DISTCLEANFILES =		\  $(plugin_DATA): $(plugin_in_files)  	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + +-include $(top_srcdir)/git.mk diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am index 3a44edb..e5d86f6 100644 --- a/plugins/common/Makefile.am +++ b/plugins/common/Makefile.am @@ -26,3 +26,5 @@ libcommon_la_LDFLAGS = \  libcommon_la_LIBADD  = \  	$(SETTINGS_PLUGIN_LIBS)		\  	$(XINPUT_LIBS) + +-include $(top_srcdir)/git.mk diff --git a/plugins/datetime/Makefile.am b/plugins/datetime/Makefile.am index 3981235..a920100 100644 --- a/plugins/datetime/Makefile.am +++ b/plugins/datetime/Makefile.am @@ -58,3 +58,5 @@ CLEANFILES = 		\  	org.mate.SettingsDaemon.DateTimeMechanism.service	\  	org.mate.settingsdaemon.datetimemechanism.policy	\  	$(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am index 7de939e..f8e2add 100644 --- a/plugins/dummy/Makefile.am +++ b/plugins/dummy/Makefile.am @@ -44,3 +44,5 @@ $(plugin_DATA): $(plugin_in_files)  # do not copy into your plugin  install-pluginDATA:  install-pluginLTLIBRARIES: + +-include $(top_srcdir)/git.mk diff --git a/plugins/housekeeping/Makefile.am b/plugins/housekeeping/Makefile.am index 2e8f5b1..05da60c 100644 --- a/plugins/housekeeping/Makefile.am +++ b/plugins/housekeeping/Makefile.am @@ -40,3 +40,5 @@ DISTCLEANFILES = $(plugin_DATA)  $(plugin_DATA): $(plugin_in_files)  	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + +-include $(top_srcdir)/git.mk diff --git a/plugins/keybindings/Makefile.am b/plugins/keybindings/Makefile.am index 57e744a..a8de380 100644 --- a/plugins/keybindings/Makefile.am +++ b/plugins/keybindings/Makefile.am @@ -55,3 +55,5 @@ DISTCLEANFILES =		\  $(plugin_DATA): $(plugin_in_files)  	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + +-include $(top_srcdir)/git.mk diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am index 8905ca9..f8ee695 100644 --- a/plugins/keyboard/Makefile.am +++ b/plugins/keyboard/Makefile.am @@ -68,3 +68,5 @@ DISTCLEANFILES =		\  $(plugin_DATA): $(plugin_in_files)  	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + +-include $(top_srcdir)/git.mk diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am index fa18bc9..65c3ec2 100644 --- a/plugins/media-keys/Makefile.am +++ b/plugins/media-keys/Makefile.am @@ -151,3 +151,5 @@ DISTCLEANFILES =		\  $(plugin_DATA): $(plugin_in_files)  	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + +-include $(top_srcdir)/git.mk diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am index 5fc0cf9..7f854ae 100644 --- a/plugins/mouse/Makefile.am +++ b/plugins/mouse/Makefile.am @@ -55,3 +55,5 @@ DISTCLEANFILES = $(plugin_DATA)  $(plugin_DATA): $(plugin_in_files)  	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + +-include $(top_srcdir)/git.mk diff --git a/plugins/mpris/Makefile.am b/plugins/mpris/Makefile.am index 3b000bb..2340eb2 100644 --- a/plugins/mpris/Makefile.am +++ b/plugins/mpris/Makefile.am @@ -42,3 +42,4 @@ DISTCLEANFILES =		\  $(plugin_DATA): $(plugin_in_files)  	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ +-include $(top_srcdir)/git.mk diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am index 683f806..297cb64 100644 --- a/plugins/rfkill/Makefile.am +++ b/plugins/rfkill/Makefile.am @@ -43,3 +43,5 @@ udevrules_DATA = 61-mate-settings-daemon-rfkill.rules  EXTRA_DIST = $(plugin_in_files) $(udevrules_DATA)  CLEANFILES = $(plugin_DATA)  DISTCLEANFILES = $(plugin_DATA) + +-include $(top_srcdir)/git.mk diff --git a/plugins/smartcard/Makefile.am b/plugins/smartcard/Makefile.am index c43b630..a14eb0e 100644 --- a/plugins/smartcard/Makefile.am +++ b/plugins/smartcard/Makefile.am @@ -47,3 +47,5 @@ CLEANFILES = \  DISTCLEANFILES = \  	$(plugin_DATA) + +-include $(top_srcdir)/git.mk diff --git a/plugins/sound/Makefile.am b/plugins/sound/Makefile.am index 2272ab4..529158e 100644 --- a/plugins/sound/Makefile.am +++ b/plugins/sound/Makefile.am @@ -42,3 +42,5 @@ DISTCLEANFILES = \  $(plugin_DATA): $(plugin_in_files)  	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + +-include $(top_srcdir)/git.mk diff --git a/plugins/typing-break/Makefile.am b/plugins/typing-break/Makefile.am index ee5602a..d4d835f 100644 --- a/plugins/typing-break/Makefile.am +++ b/plugins/typing-break/Makefile.am @@ -50,3 +50,5 @@ DISTCLEANFILES =		\  $(plugin_DATA): $(plugin_in_files)  	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + +-include $(top_srcdir)/git.mk diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am index 3659b21..f0a8815 100644 --- a/plugins/xrandr/Makefile.am +++ b/plugins/xrandr/Makefile.am @@ -90,3 +90,5 @@ DISTCLEANFILES = $(plugin_DATA)  $(plugin_DATA): $(plugin_in_files)  	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + +-include $(top_srcdir)/git.mk diff --git a/plugins/xrdb/Makefile.am b/plugins/xrdb/Makefile.am index 4e5ca26..243781f 100644 --- a/plugins/xrdb/Makefile.am +++ b/plugins/xrdb/Makefile.am @@ -55,3 +55,5 @@ DISTCLEANFILES =		\  $(plugin_DATA): $(plugin_in_files)  	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + +-include $(top_srcdir)/git.mk diff --git a/plugins/xrdb/data/Makefile.am b/plugins/xrdb/data/Makefile.am index 26ff90f..576f0c4 100644 --- a/plugins/xrdb/data/Makefile.am +++ b/plugins/xrdb/data/Makefile.am @@ -13,3 +13,5 @@ xrdb_DATA =		\  EXTRA_DIST = 		\  	$(xrdb_DATA)	\  	$(NULL) + +-include $(top_srcdir)/git.mk diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am index 493c59b..6e8e50f 100644 --- a/plugins/xsettings/Makefile.am +++ b/plugins/xsettings/Makefile.am @@ -60,3 +60,5 @@ DISTCLEANFILES =		\  $(plugin_DATA): $(plugin_in_files)  	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + +-include $(top_srcdir)/git.mk | 
