summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2015-04-08 15:57:59 +0100
committerTim-Philipp Müller <tim@centricular.com>2015-04-08 16:03:34 +0100
commited7a301a42dd57d2865109913fdbc5e19d9ab5ed (patch)
tree8daca5b50d855e275bea771268a19faba0eacba2
parent2dd79f5723b69a1bf4864984e3fc78c222a8c67d (diff)
Add m4 directory so aclocal doesn't complain in autogen.sh
Might come in handy, and these warnings seem to be fatal in some environments. You may need to git clean -x -d -f your tree before git pulling/merging.
-rw-r--r--.gitignore6
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac1
-rw-r--r--m4/Makefile.am1
4 files changed, 8 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 530a8f2..0fdd1d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,10 @@ gst-omx-*.tar*
*.orig
*.rej
tools/listcomponents
-/m4
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
Makefile.in
Makefile
diff --git a/Makefile.am b/Makefile.am
index dadaf70..82affc6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = common omx tools config
+SUBDIRS = common omx tools config m4
if BUILD_EXAMPLES
SUBDIRS += examples
diff --git a/configure.ac b/configure.ac
index e87d240..88181f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -389,6 +389,7 @@ config/bellagio/Makefile
config/rpi/Makefile
examples/Makefile
examples/egl/Makefile
+m4/Makefile
)
AC_OUTPUT
diff --git a/m4/Makefile.am b/m4/Makefile.am
new file mode 100644
index 0000000..741f850
--- /dev/null
+++ b/m4/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS =