summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2006-03-12 23:56:47 +0000
committerTim-Philipp Müller <tim@centricular.net>2006-03-12 23:56:47 +0000
commit1533f43e0425237f8134dd60b485275f0d787ef1 (patch)
tree989a3c4f18b25b077e9d5755e80c1c47f837091d
parent5fd004431365f3d850b4075e9133bbd9c42d3c0a (diff)
downloadgst-plugins-bad-1533f43e0425237f8134dd60b485275f0d787ef1.tar.gz
gst-plugins-bad-1533f43e0425237f8134dd60b485275f0d787ef1.tar.bz2
gst-plugins-bad-1533f43e0425237f8134dd60b485275f0d787ef1.zip
Fix distcheck.
Original commit message from CVS: * Makefile.am: * configure.ac: Fix distcheck.
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac13
3 files changed, 14 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index d211c214..1ffc1633 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-12 Tim-Philipp Müller <tim at centricular dot net>
+
+ * Makefile.am:
+ * configure.ac:
+ Fix distcheck.
+
2006-03-12 Edward Hervey <edward@fluendo.com>
* sys/v4l2/v4l2src_calls.c: (gst_v4l2src_capture_init),
diff --git a/Makefile.am b/Makefile.am
index 94d77d4e..d98da6e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,12 +7,12 @@ SUBDIRS_EXAMPLES =
endif
SUBDIRS = \
- gst sys ext \
+ gst gst-libs sys ext \
m4 common docs \
$(SUBDIRS_EXAMPLES)
DIST_SUBDIRS = \
- gst sys ext m4 common docs examples
+ gst gst-libs sys ext m4 common docs examples
EXTRA_DIST = \
gst-plugins-bad.spec depcomp \
diff --git a/configure.ac b/configure.ac
index 6d6f1a38..287c8551 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,14 +40,11 @@ AM_PROG_AS
AS="${CC}"
AS_PROG_OBJC
-dnl the gettext stuff needed
-AM_GNU_GETTEXT_VERSION(0.11.5)
+dnl set up gettext
+dnl the version check needs to stay here because autopoint greps for it
+AM_GNU_GETTEXT_VERSION([0.11.5])
AM_GNU_GETTEXT([external])
-
-GETTEXT_PACKAGE=gst-plugins-bad-$GST_MAJORMINOR
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE",
- [gettext package name])
+GST_GETTEXT([gst-plugins-bad-$GST_MAJORMINOR])
GST_ARG_EXAMPLES
@@ -804,6 +801,8 @@ gst/speed/Makefile
gst/qtdemux/Makefile
gst/tta/Makefile
gst/xingheader/Makefile
+gst-libs/Makefile
+gst-libs/gst/Makefile
sys/Makefile
sys/glsink/Makefile
sys/ximagesrc/Makefile