Remove #include <gnome.h> from some tests which don't actually need it, and make...

Original commit message from CVS:
Remove #include <gnome.h> from some tests which don't actually need it,
and make the other tests and the autoplug example only compile if gnome
headers are present.

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 17a1405..c251eab 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,4 +1,11 @@
-SUBDIRS = autoplug \
+
+if HAVE_GNOME
+GNOME_SUBDS = autoplug
+else
+GNOME_SUBDS =
+endif
+
+SUBDIRS = $(GNOME_SUBDS) \
           helloworld helloworld2 \
           queue queue2 queue3 queue4 \
           launch thread xml plugins typefind

diff --git a/test/Makefile.am b/test/Makefile.am
index 1812686..7ee61b9 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,10 +1,17 @@
 # FIXME FIXME
 
-noinst_PROGRAMS = qtest spectrum record wave mp3 teardown buffer mp3parse \
-                 mpeg2parse mp1parse mp3play ac3parse ac3play dvdcat fake cobin videotest \
-                 aviparse vidcapture avi2mpg mp2tomp1 mp1tomp1 pipetest \
-                 vidcapture2 mp2toavi mp3tovorbis mpeg2parse2 xmmstest videotest2 \
-                 mp3mad video2mp1 dvshow dv2mp1
+if HAVE_GNOME
+GNOME_PROGS = spectrum wave mpeg2parse mp1parse videotest aviparse \
+                  mpeg2parse2 videotest2 video2mp1 dvshow dv2mp1
+else
+GNOME_PROGS =
+endif
+
+noinst_PROGRAMS = qtest $(GNOME_PROGS) record mp3 teardown buffer mp3parse \
+                 mp3play ac3parse ac3play dvdcat fake cobin \
+                 vidcapture avi2mpg mp2tomp1 mp1tomp1 pipetest \
+                 vidcapture2 mp2toavi mp3tovorbis xmmstest \
+                 mp3mad
 
 SUBDIRS = xml bindings
 

diff --git a/test/mp3.c b/test/mp3.c
index 5f4ff6f..a92064c 100644 (file)
--- a/test/mp3.c
+++ b/test/mp3.c
@@ -1,4 +1,3 @@
-#include <gnome.h>
 #include <gst/gst.h>
 
 extern gboolean _gst_plugin_spew;

diff --git a/test/xmmstest.c b/test/xmmstest.c
index 59eb23d..e88177b 100644 (file)
--- a/test/xmmstest.c
+++ b/test/xmmstest.c
@@ -1,4 +1,3 @@
-#include <gnome.h>
 #include <gst/gst.h>
 
 extern gboolean _gst_plugin_spew;

diff --git a/tests/old/examples/Makefile.am b/tests/old/examples/Makefile.am
index 17a1405..c251eab 100644 (file)
--- a/tests/old/examples/Makefile.am
+++ b/tests/old/examples/Makefile.am
@@ -1,4 +1,11 @@
-SUBDIRS = autoplug \
+
+if HAVE_GNOME
+GNOME_SUBDS = autoplug
+else
+GNOME_SUBDS =
+endif
+
+SUBDIRS = $(GNOME_SUBDS) \
           helloworld helloworld2 \
           queue queue2 queue3 queue4 \
           launch thread xml plugins typefind