[gst-cvs] gst-openmax: Move common stuff to build-aux

Felipe Contreras felipec at kemper.freedesktop.org
Wed Apr 8 16:02:06 PDT 2009


Module: gst-openmax
Branch: master
Commit: d0e27fdbf8036bf1e64528c3e383818ded58f7ed
URL:    http://cgit.freedesktop.org/gstreamer/gst-openmax/commit/?id=d0e27fdbf8036bf1e64528c3e383818ded58f7ed

Author: Felipe Contreras <felipe.contreras at gmail.com>
Date:   Thu Apr  9 01:43:20 2009 +0300

Move common stuff to build-aux

It's a more proper location.

Signed-off-by: Felipe Contreras <felipe.contreras at gmail.com>

---

 Makefile.am                          |    8 +++++---
 autogen.sh                           |    9 +--------
 {common => build-aux}/gst-autogen.sh |    0 
 {common => build-aux}/release.mak    |    2 +-
 common/Makefile.am                   |    2 --
 configure.ac                         |    1 -
 6 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index baa3ab9..112b9a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,10 @@
-SUBDIRS = util omx tests common
+SUBDIRS = util omx tests
 
-include $(top_srcdir)/common/release.mak
+include $(top_srcdir)/build-aux/release.mak
 
 EXTRA_DIST = autogen.sh \
-             build-aux/git-version-gen
+             build-aux/git-version-gen \
+             build-aux/gst-autogen.sh \
+             build-aux/release.mak
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/autogen.sh b/autogen.sh
index 8d2514d..6b6ddd3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,14 +3,7 @@
 
 package=gst-openmax
 
-# source helper functions
-if test ! -f common/gst-autogen.sh;
-then
-  echo There is something wrong with your source tree.
-  echo You are missing common/gst-autogen.sh
-  exit 1
-fi
-. common/gst-autogen.sh
+. build-aux/gst-autogen.sh
 
 mkdir -p config
 
diff --git a/common/gst-autogen.sh b/build-aux/gst-autogen.sh
similarity index 100%
rename from common/gst-autogen.sh
rename to build-aux/gst-autogen.sh
diff --git a/common/release.mak b/build-aux/release.mak
similarity index 95%
rename from common/release.mak
rename to build-aux/release.mak
index 8d06ec3..63307ce 100644
--- a/common/release.mak
+++ b/build-aux/release.mak
@@ -1,5 +1,5 @@
 # include this snippet to add a common release: target by using
-# include $(top_srcdir)/common/release.mak
+# include $(top_srcdir)/build-aux/release.mak
 
 # make bz2 as well
 AUTOMAKE_OPTIONS = dist-bzip2
diff --git a/common/Makefile.am b/common/Makefile.am
deleted file mode 100644
index 8aa786e..0000000
--- a/common/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = gst-autogen.sh \
-	     release.mak
diff --git a/configure.ac b/configure.ac
index abb7b2c..8ece81f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,6 @@ AC_CONFIG_FILES([Makefile \
 		 omx/Makefile \
 		 util/Makefile \
 		 tests/Makefile \
-		 common/Makefile \
 		 m4/Makefile \
 		 shave \
 		 shave-libtool])





More information about the Gstreamer-commits mailing list