summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-03-04 12:00:06 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-03-04 12:00:06 +0000
commite84077e4b24ff7fa19b114f58d0343cb40144e82 (patch)
treeaa2f4ec35954c549720317bc2d9ea59c4d828663
parent57755079fb0d0bba7dd202cb8b2222877a039634 (diff)
fix make distcheck mv examples/gstreamer examples/gst
Original commit message from CVS: fix make distcheck mv examples/gstreamer examples/gst
-rw-r--r--ChangeLog11
-rw-r--r--configure.ac2
-rw-r--r--examples/Makefile.am2
-rw-r--r--gst/Makefile.am4
-rw-r--r--testsuite/Makefile.am2
5 files changed, 17 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 018cebc373..28596a39b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2004-03-04 Thomas Vander Stichele <thomas at apestaart dot org>
+ * configure.ac:
+ * examples/Makefile.am:
+ * gst/Makefile.am:
+ * gstinterfaces/Makefile.am:
+ * gstplay/Makefile.am:
+ * testsuite/Makefile.am:
+ fix make distcheck
+ move examples/gstreamer to examples/gst
+
+2004-03-04 Thomas Vander Stichele <thomas at apestaart dot org>
+
* Makefile.am:
* autogen.sh:
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 36f88db034..b37ba5fbed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,7 +151,7 @@ AC_OUTPUT([
pkgconfig/gst-python.pc
pkgconfig/gst-python-uninstalled.pc
examples/Makefile
- examples/gstreamer/Makefile
+ examples/gst/Makefile
docs/Makefile
docs/gst-python.ent
testsuite/Makefile
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 875ebcea6a..062cb55aab 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1 +1 @@
-SUBDIRS = gstreamer
+SUBDIRS = gst
diff --git a/gst/Makefile.am b/gst/Makefile.am
index fb30349f92..4efe8d7b6b 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -24,14 +24,14 @@ _gstmodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gst
nodist__gstmodule_la_SOURCES = gst.c
CLEANFILES = gst.c
-EXTRA_DIST = gst.defs $(GST_OVERRIDES) arg-types.py
+EXTRA_DIST = gst.defs gst-types.defs $(GST_OVERRIDES) arg-types.py
gst.c: $(srcdir)/gst.defs $(srcdir)/arg-types.py $(GST_OVERRIDES)
$(PYGTK_CODEGEN) \
--load-types $(srcdir)/arg-types.py \
--register $(srcdir)/gst-types.defs \
--override $(srcdir)/gst.override \
- --prefix pygst gst.defs > gen-gst.c \
+ --prefix pygst $(srcdir)/gst.defs > gen-gst.c \
&& rm -fr gtreamer.c \
&& echo '/* GENERATED FILE - DO NOT EDIT */' >> gst.c \
&& cat gen-gst.c >> gst.c \
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 4682a8bc54..c70a1be1ff 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -3,3 +3,5 @@ testprogs = element.py
TESTS = $(testprogs)
check_SCRIPTS = $(testprogs)
+
+EXTRA_DIST = $(testprogs)