diff options
author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-05-28 10:32:28 +0100 |
---|---|---|
committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-05-28 10:34:56 +0100 |
commit | 673fe4f48dc9f489a9b7e66de5dfde5a59f593b9 (patch) | |
tree | 4ef05976daadefeb4e13d3f1287022e99fe7aec6 | |
parent | 1f88d742a6e68f7631e03fe3bf23e186eff18609 (diff) |
build: put build files into m4/ instead of common/m4/
We don't want the common submodule directory contaminated with
random build cruft.
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | Makefile.am | 15 | ||||
-rwxr-xr-x | autogen.sh | 2 | ||||
-rw-r--r-- | configure.ac | 2 |
4 files changed, 18 insertions, 3 deletions
@@ -46,3 +46,5 @@ gst-python*.tar.* pygst.py gst-libs log + +m4/* diff --git a/Makefile.am b/Makefile.am index 092d840..89721d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ common_ldflags = -module -avoid-version # include before EXTRA_DIST for win32 assignment include $(top_srcdir)/common/win32.mak -ACLOCAL_AMFLAGS = -I common/m4 +ACLOCAL_AMFLAGS = -I m4 -I common/m4 pyexec_LTLIBRARIES = @@ -63,3 +63,16 @@ check-torture: @true include $(top_srcdir)/common/coverage/lcov.mak + +CRUFT_FILES = \ + $(top_builddir)/common/shave \ + $(top_builddir)/common/shave-libtool \ + $(top_builddir)/common/m4/libtool.m4 \ + $(top_builddir)/common/m4/ltoptions.m4 \ + $(top_builddir)/common/m4/ltsugar.m4 \ + $(top_builddir)/common/m4/ltversion.m4 \ + $(top_builddir)/common/m4/lt~obsolete.m4 + +include $(top_srcdir)/common/cruft.mak + +all-local: check-cruft @@ -68,7 +68,7 @@ fi toplevel_check $srcfile tool_run "$libtoolize" "--copy --force" -tool_run "$aclocal" "-I common/m4 $ACLOCAL_FLAGS" +tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS" tool_run "$autoheader" # touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode -- wingo diff --git a/configure.ac b/configure.ac index 474192f..6065eae 100644 --- a/configure.ac +++ b/configure.ac @@ -42,7 +42,7 @@ AC_SUBST(PACKAGE_VERSION_MICRO) AC_SUBST(PACKAGE_VERSION_NANO) dnl Add parameters for aclocal -AC_SUBST(ACLOCAL_AMFLAGS, "-I common/m4") +AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I common/m4") dnl required versions of other packages AC_SUBST(PYGTK_REQ, 2.6.3) |