Fix broken build system for examples.

Original commit message from CVS:
Fix broken build system for examples.

diff --git a/Makefile.am b/Makefile.am
index 9f327a3..e130fc3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,12 @@
-SUBDIRS = include gst libs plugins tools test tests examples docs
-
 # if libglade is present, build the player and editor
 if HAVE_LIBGLADE_GNOME
-SUBDIRS += gstplay editor
+SUBDIRS_LGG = gstplay editor
+else
+SUBDIRS_LGG =
 endif
 
+SUBDIRS = include gst libs plugins tools test tests examples docs $(SUBDIRS_LGG)
+
 # These are all the possible subdirs
 DIST_SUBDIRS = include gst libs plugins tools test tests examples docs gstplay editor
 

diff --git a/configure.in b/configure.in
index c42315b..292d29c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -538,15 +538,16 @@ test/cothreads/Makefile
 tests/Makefile
 tests/sched/Makefile
 examples/Makefile
-examples/autoplug
-examples/helloworld
-examples/helloworld2
-examples/queue
-examples/queue2
-examples/queue3
-examples/queue4
-examples/thread
-examples/xml
+examples/autoplug/Makefile
+examples/helloworld/Makefile
+examples/helloworld2/Makefile
+examples/queue/Makefile
+examples/queue2/Makefile
+examples/queue3/Makefile
+examples/queue4/Makefile
+examples/thread/Makefile
+examples/xml/Makefile
+examples/launch/Makefile
 editor/Makefile
 tools/Makefile
 docs/Makefile

diff --git a/examples/Makefile.am b/examples/Makefile.am
index f6c57e0..36fa96e 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1 +1,4 @@
-SUBDIRS = autoplug helloworld helloworld2 queue queue2 queue3 queue4 thread xml
+SUBDIRS = autoplug \
+          helloworld helloworld2 \
+          queue queue2 queue3 queue4 \
+          thread launch xml

diff --git a/examples/launch/Makefile.am b/examples/launch/Makefile.am
new file mode 100644 (file)
index 0000000..b4d015c
--- /dev/null
+++ b/examples/launch/Makefile.am
@@ -0,0 +1 @@
+bin_SCRIPTS = mp3play

diff --git a/examples/xml/Makefile.am b/examples/xml/Makefile.am
index 51ab7ff..02a9a78 100644 (file)
--- a/examples/xml/Makefile.am
+++ b/examples/xml/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = xml
+bin_PROGRAMS = runxml createxml
 
 LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
 INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)

diff --git a/tests/old/examples/Makefile.am b/tests/old/examples/Makefile.am
index f6c57e0..36fa96e 100644 (file)
--- a/tests/old/examples/Makefile.am
+++ b/tests/old/examples/Makefile.am
@@ -1 +1,4 @@
-SUBDIRS = autoplug helloworld helloworld2 queue queue2 queue3 queue4 thread xml
+SUBDIRS = autoplug \
+          helloworld helloworld2 \
+          queue queue2 queue3 queue4 \
+          thread launch xml

diff --git a/tests/old/examples/launch/Makefile.am b/tests/old/examples/launch/Makefile.am
new file mode 100644 (file)
index 0000000..b4d015c
--- /dev/null
+++ b/tests/old/examples/launch/Makefile.am
@@ -0,0 +1 @@
+bin_SCRIPTS = mp3play

diff --git a/tests/old/examples/xml/Makefile.am b/tests/old/examples/xml/Makefile.am
index 51ab7ff..02a9a78 100644 (file)
--- a/tests/old/examples/xml/Makefile.am
+++ b/tests/old/examples/xml/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = xml
+bin_PROGRAMS = runxml createxml
 
 LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
 INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)