summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVíctor Manuel Jáquez Leal <victorx.jaquez@intel.com>2016-02-24 12:36:33 +0100
committerVíctor Manuel Jáquez Leal <victorx.jaquez@intel.com>2016-02-24 12:42:08 +0100
commitb52cfea76fbf6e269cddcc4f846d8a5946105565 (patch)
treeec9bc1761073ba4daabac9489785b80b1e29b051
parentffd5028a38da45ed7e67c377590078534aca3078 (diff)
build: add m4 directory
Instead of rely on the automatic creation of m4 directory by aclocal, we already control it. Later we could create our own m4 scripts in order to unclutter configure.ac https://bugzilla.gnome.org/show_bug.cgi?id=762528
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac1
-rw-r--r--m4/Makefile.am1
3 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 5db5e1f7..87f8a361 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-ACLOCAL_AMFLAGS = -I m4 -I common/m4 ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I m4 -I common/m4
-SUBDIRS = gst-libs gst tests common docs
+SUBDIRS = gst-libs gst tests m4 common docs
DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
diff --git a/configure.ac b/configure.ac
index 65dd2fa8..d7c20220 100644
--- a/configure.ac
+++ b/configure.ac
@@ -973,6 +973,7 @@ AC_CONFIG_FILES([
Makefile
common/Makefile
common/m4/Makefile
+ m4/Makefile
docs/Makefile
docs/version.entities
docs/plugins/Makefile
diff --git a/m4/Makefile.am b/m4/Makefile.am
new file mode 100644
index 00000000..af864e3b
--- /dev/null
+++ b/m4/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = $(wildcard *.m4)