diff options
author | Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com> | 2015-05-13 10:38:24 +0200 |
---|---|---|
committer | Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com> | 2015-05-18 16:14:46 +0200 |
commit | 89e41fc8e35209b37665a8c45721285d0fd45751 (patch) | |
tree | 168642a63780fc73d8d8bd87681605aef1ea581a | |
parent | 70eff01d36a2870cbf06ffb91c2a941e8cb6b804 (diff) | |
download | gst-vaapi-89e41fc8e35209b37665a8c45721285d0fd45751.tar.gz |
build: use git.mk
This patch handles dinamically the gitignore files with git.mk[1].
Removed the automake variable MAINTAINERCLANFILES in most of the
Makefile.am files since now it is handled by the top one.
1. https://github.com/behdad/git.mk/blob/master/git.mk
https://bugzilla.gnome.org/show_bug.cgi?id=749321
-rw-r--r-- | .gitignore | 73 | ||||
-rw-r--r-- | Makefile.am | 10 | ||||
-rw-r--r-- | debian.upstream/Makefile.am | 3 | ||||
-rw-r--r-- | docs/Makefile.am | 3 | ||||
-rw-r--r-- | docs/reference/Makefile.am | 3 | ||||
-rw-r--r-- | docs/reference/libs/Makefile.am | 3 | ||||
-rw-r--r-- | docs/reference/plugins/Makefile.am | 3 | ||||
-rw-r--r-- | ext/Makefile.am | 3 | ||||
-rw-r--r-- | ext/libvpx/Makefile.am | 3 | ||||
-rw-r--r-- | git.mk | 333 | ||||
-rw-r--r-- | gst-libs/Makefile.am | 3 | ||||
-rw-r--r-- | gst-libs/gst/Makefile.am | 3 | ||||
-rw-r--r-- | gst-libs/gst/base/Makefile.am | 3 | ||||
-rw-r--r-- | gst-libs/gst/codecparsers/Makefile.am | 3 | ||||
-rw-r--r-- | gst-libs/gst/vaapi/Makefile.am | 3 | ||||
-rw-r--r-- | gst/Makefile.am | 3 | ||||
-rw-r--r-- | gst/vaapi/Makefile.am | 3 | ||||
-rw-r--r-- | patches/Makefile.am | 3 | ||||
-rw-r--r-- | patches/videoparsers/Makefile.am | 3 | ||||
-rw-r--r-- | pkgconfig/Makefile.am | 3 | ||||
-rw-r--r-- | tests/Makefile.am | 3 |
21 files changed, 358 insertions, 112 deletions
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 0ff526c3..00000000 --- a/.gitignore +++ /dev/null @@ -1,73 +0,0 @@ -ABOUT-NLS -_stdint.h -aclocal.m4 -autom4te.cache -autoregen.sh -compile -config.guess -config.h* -config.log -config.rpath -config.status -config.sub -configure -depcomp -gst-element-check-*.m4 -gstreamer-vaapi-*.tar.gz -install-sh -libtool -ltmain.sh -missing -mkinstalldirs -stamp-h -stamp-h.in -stamp-h1 - -/m4 - -.deps -.libs -*.lo -*.la -*.o -Makefile.in -Makefile -*~ -*.swp - -debian.build/ -debian.upstream/changelog -debian.upstream/control -debian.upstream/gstreamer0.10-vaapi-doc.install -debian.upstream/gstreamer0.10-vaapi.install -debian.upstream/libgstvaapi-dev.install -debian.upstream/libgstvaapi-drm-0.install -debian.upstream/libgstvaapi-glx-0.install -debian.upstream/libgstvaapi-wayland-0.install -debian.upstream/libgstvaapi-x11-0.install -debian.upstream/libgstvaapi0.install -docs/reference/libs/*.stamp -docs/reference/libs/html* -docs/reference/libs/libs-docs.xml -docs/reference/libs/tmpl* -docs/reference/libs/xml* -docs/reference/plugins/*.stamp -docs/reference/plugins/html* -docs/reference/plugins/plugins-docs.xml -docs/reference/plugins/tmpl* -docs/reference/plugins/xml* -gst-libs/gst/codecparsers/*.[ch] -gst-libs/gst/codecparsers/.timestamp.* -gst-libs/gst/gstutils_version.h -gtk-doc.make -pkgconfig/gstreamer-vaapi-0.10.pc -pkgconfig/gstreamer-vaapi-drm-0.10.pc -pkgconfig/gstreamer-vaapi-glx-0.10.pc -pkgconfig/gstreamer-vaapi-wayland-0.10.pc -pkgconfig/gstreamer-vaapi-x11-0.10.pc -tests/test-decode -tests/test-display -tests/test-subpicture -tests/test-surfaces -tests/test-textures -tests/test-windows diff --git a/Makefile.am b/Makefile.am index b3332012..9331c49c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,9 +6,11 @@ SUBDIRS = debian.upstream ext gst-libs gst pkgconfig tests docs patches # Extra clean files so that maintainer-clean removes *everything* MAINTAINERCLEANFILES = \ - aclocal.m4 compile config.guess config.sub \ - configure depcomp install-sh ltmain.sh \ - Makefile.in missing config.h.in gtk-doc.make + $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \ + $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \ + $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \ + $(srcdir)/gtk-doc.make $(srcdir)/m4/gtk-doc.m4 \ + $(NULL) DEB_BUILDDIR = debian.build @@ -23,3 +25,5 @@ deb.upstream: dist-bzip2 cd $(PACKAGE)-$(VERSION) && \ $(LN_S) debian.upstream debian && \ $(MAKE) deb -f Makefile.am + +-include $(top_srcdir)/git.mk diff --git a/debian.upstream/Makefile.am b/debian.upstream/Makefile.am index e05a66d0..fd5dad5b 100644 --- a/debian.upstream/Makefile.am +++ b/debian.upstream/Makefile.am @@ -39,5 +39,4 @@ EXTRA_DIST = $(DEBIANFILES) dist_noinst_DATA = $(DEBIANGENFILES) DISTCLEANFILES = $(DEBIANGENFILES) -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in $(DEBIANGENFILES) +-include $(top_srcdir)/git.mk diff --git a/docs/Makefile.am b/docs/Makefile.am index 58bb2872..1feb33d7 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -6,5 +6,4 @@ endif DIST_SUBDIRS = reference -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in +-include $(top_srcdir)/git.mk diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 3eef00ec..28657ac1 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -1,4 +1,3 @@ SUBDIRS = libs plugins -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in +-include $(top_srcdir)/git.mk diff --git a/docs/reference/libs/Makefile.am b/docs/reference/libs/Makefile.am index bda6fe62..036bd7dc 100644 --- a/docs/reference/libs/Makefile.am +++ b/docs/reference/libs/Makefile.am @@ -123,5 +123,4 @@ EXTRA_DIST += \ libs-docs.xml.in \ $(NULL) -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in lib-docs.xml +-include $(top_srcdir)/git.mk diff --git a/docs/reference/plugins/Makefile.am b/docs/reference/plugins/Makefile.am index 6b89cade..d3e20404 100644 --- a/docs/reference/plugins/Makefile.am +++ b/docs/reference/plugins/Makefile.am @@ -104,5 +104,4 @@ EXTRA_DIST += \ $(DOC_MODULE)-docs.xml.in \ $(NULL) -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in $(DOC_MODULE)-docs.xml +-include $(top_srcdir)/git.mk diff --git a/ext/Makefile.am b/ext/Makefile.am index d6085815..537e18f5 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -56,5 +56,4 @@ videoparsers_source_h = \ EXTRA_DIST += $(videoparsers_source_h:%.h=$(videoparsers_srcdir)/%.h) -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in +-include $(top_srcdir)/git.mk diff --git a/ext/libvpx/Makefile.am b/ext/libvpx/Makefile.am index 793026ec..d54c298e 100644 --- a/ext/libvpx/Makefile.am +++ b/ext/libvpx/Makefile.am @@ -148,5 +148,4 @@ dist-hook: cp -fpR $(vpx_srcdir)/$$f $(distdir)/$(vpx_upstream)/$$f; \ done -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in vpx.configure.stamp +-include $(top_srcdir)/git.mk @@ -0,0 +1,333 @@ +# 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. +# +# 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 \ + 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` + + + +############################################################################### +# 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 + @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 "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 \ + 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$(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 > $@.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/gst-libs/Makefile.am b/gst-libs/Makefile.am index d5356a6f..85cb8783 100644 --- a/gst-libs/Makefile.am +++ b/gst-libs/Makefile.am @@ -1,4 +1,3 @@ SUBDIRS = gst -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in +-include $(top_srcdir)/git.mk diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am index 8acd19b0..77be8ee0 100644 --- a/gst-libs/gst/Makefile.am +++ b/gst-libs/gst/Makefile.am @@ -1,4 +1,3 @@ SUBDIRS = base codecparsers vaapi -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in +-include $(top_srcdir)/git.mk diff --git a/gst-libs/gst/base/Makefile.am b/gst-libs/gst/base/Makefile.am index b3c1dada..87358734 100644 --- a/gst-libs/gst/base/Makefile.am +++ b/gst-libs/gst/base/Makefile.am @@ -44,5 +44,4 @@ EXTRA_DIST = \ $(source_h) \ $(NULL) -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in +-include $(top_srcdir)/git.mk diff --git a/gst-libs/gst/codecparsers/Makefile.am b/gst-libs/gst/codecparsers/Makefile.am index a160450c..d164df63 100644 --- a/gst-libs/gst/codecparsers/Makefile.am +++ b/gst-libs/gst/codecparsers/Makefile.am @@ -107,5 +107,4 @@ EXTRA_DIST = gstvaapilibvpx.c DISTCLEANFILES = $(GENFILES) .timestamp.symlinks -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in +-include $(top_srcdir)/git.mk diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am index bb0123b6..348e0c18 100644 --- a/gst-libs/gst/vaapi/Makefile.am +++ b/gst-libs/gst/vaapi/Makefile.am @@ -601,5 +601,4 @@ CLEANFILES = \ $(PKG_VERSION_FILE) \ $(NULL) -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in +-include $(top_srcdir)/git.mk diff --git a/gst/Makefile.am b/gst/Makefile.am index 37d365da..80a5198a 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -1,4 +1,3 @@ SUBDIRS = vaapi -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in +-include $(top_srcdir)/git.mk diff --git a/gst/vaapi/Makefile.am b/gst/vaapi/Makefile.am index 0dd3c990..a66db37c 100644 --- a/gst/vaapi/Makefile.am +++ b/gst/vaapi/Makefile.am @@ -255,5 +255,4 @@ EXTRA_DIST = \ $(libgstvaapi_1_4p_parse_gen_source_h) \ $(NULL) -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in +-include $(top_srcdir)/git.mk diff --git a/patches/Makefile.am b/patches/Makefile.am index 0512fcae..7591cb36 100644 --- a/patches/Makefile.am +++ b/patches/Makefile.am @@ -1,4 +1,3 @@ SUBDIRS = videoparsers -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in +-include $(top_srcdir)/git.mk diff --git a/patches/videoparsers/Makefile.am b/patches/videoparsers/Makefile.am index ec3b7612..401b2ad7 100644 --- a/patches/videoparsers/Makefile.am +++ b/patches/videoparsers/Makefile.am @@ -2,5 +2,4 @@ include series.frag EXTRA_DIST = series.frag $(videoparsers_patches_base) -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in +-include $(top_srcdir)/git.mk diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am index 25c3cb22..2acc572a 100644 --- a/pkgconfig/Makefile.am +++ b/pkgconfig/Makefile.am @@ -29,5 +29,4 @@ EXTRA_DIST = $(all_pcfiles_in) DISTCLEANFILES = $(all_pcfiles) -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in +-include $(top_srcdir)/git.mk diff --git a/tests/Makefile.am b/tests/Makefile.am index a852f409..8fb3f95d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -137,5 +137,4 @@ EXTRA_DIST = \ $(test_utils_source_h) \ $(NULL) -# Extra clean files so that maintainer-clean removes *everything* -MAINTAINERCLEANFILES = Makefile.in +-include $(top_srcdir)/git.mk |