Commit 673fe4f4 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller

build: put build files into m4/ instead of common/m4/

We don't want the common submodule directory contaminated with
random build cruft.
parent 1f88d742
......@@ -46,3 +46,5 @@ gst-python*.tar.*
pygst.py
gst-libs
log
m4/*
......@@ -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
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment