Fix makefiles for GstPropertyProbe. Combine all interfaces into a single libgst-interface.

Original commit message from CVS:
Fix makefiles for GstPropertyProbe.  Combine all interfaces into
a single libgst-interface.

6 files changed, 32 insertions, 23 deletions

diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am
index 06f12a07..699e5896 100644
--- a/gst-libs/gst/Makefile.am
+++ b/gst-libs/gst/Makefile.am
@@ -12,12 +12,29 @@ endif
 
 SUBDIRS = audio colorbalance floatcast \
 		$(GCONF_DIR) idct media-info \
-		mixer navigation play \
-		resample riff tuner video \
+		mixer navigation play propertyprobe \
+		resample tuner video \
 		xoverlay $(X_DIR)
 
 DIST_SUBDIRS = audio colorbalance floatcast \
 		gconf idct media-info \
-		mixer navigation play \
-		resample riff tuner video \
+		mixer navigation play propertyprobe \
+		resample tuner video \
 		xoverlay xwindowlistener
+
+
+lib_LTLIBRARIES = libgst-interfaces-@GST_MAJORMINOR@.la
+
+libgst_interfaces_@GST_MAJORMINOR@_la_SOURCES = 
+
+libgst_interfaces_@GST_MAJORMINOR@_la_LIBADD = \
+	colorbalance/libgstcolorbalance.la \
+	mixer/libgstmixer.la \
+	navigation/libgstnavigation.la \
+	propertyprobe/libgstpropertyprobe.la \
+	tuner/libgsttuner.la \
+	xoverlay/libgstxoverlay.la \
+	$(GST_LIBS)
+
+libgst_interfaces_@GST_MAJORMINOR@_la_LDFLAGS = @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@
+
diff --git a/gst-libs/gst/colorbalance/Makefile.am b/gst-libs/gst/colorbalance/Makefile.am
index cbd94c91..dc8bd0ea 100644
--- a/gst-libs/gst/colorbalance/Makefile.am
+++ b/gst-libs/gst/colorbalance/Makefile.am
@@ -1,15 +1,13 @@
-libgstinterfacesincludedir = \
+libgstcolorbalanceincludedir = \
 	$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/colorbalance
 
-libgstinterfacesinclude_HEADERS = \
+libgstcolorbalanceinclude_HEADERS = \
 	colorbalance.h \
 	colorbalancechannel.h
 
-lib_LTLIBRARIES = libgstcolorbalance.la
+noinst_LTLIBRARIES = libgstcolorbalance.la
 
 libgstcolorbalance_la_SOURCES = \
 	colorbalance.c \
 	colorbalancechannel.c
-libgstcolorbalance_la_LIBADD = 
 libgstcolorbalance_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS)
-libgstcolorbalance_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst-libs/gst/mixer/Makefile.am b/gst-libs/gst/mixer/Makefile.am
index 32be46fd..193b5a10 100644
--- a/gst-libs/gst/mixer/Makefile.am
+++ b/gst-libs/gst/mixer/Makefile.am
@@ -5,11 +5,9 @@ libgstinterfacesinclude_HEADERS = \
 	mixer.h \
 	mixertrack.h
 
-lib_LTLIBRARIES = libgstmixer.la
+noinst_LTLIBRARIES = libgstmixer.la
 
 libgstmixer_la_SOURCES = \
 	mixer.c \
 	mixertrack.c
-libgstmixer_la_LIBADD = 
-libgstmixer_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS)
-libgstmixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstmixer_la_CFLAGS = $(GST_CFLAGS)
diff --git a/gst-libs/gst/navigation/Makefile.am b/gst-libs/gst/navigation/Makefile.am
index d29c4193..a600ab19 100644
--- a/gst-libs/gst/navigation/Makefile.am
+++ b/gst-libs/gst/navigation/Makefile.am
@@ -1,10 +1,8 @@
-lib_LTLIBRARIES = libgstnavigation.la
+noinst_LTLIBRARIES = libgstnavigation.la
 
 libgstnavigation_la_SOURCES = navigation.c
 
 libgstnavigationincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/navigation
 libgstnavigationinclude_HEADERS = navigation.h
 
-libgstnavigation_la_LIBADD =
 libgstnavigation_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS)
-libgstnavigation_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst-libs/gst/tuner/Makefile.am b/gst-libs/gst/tuner/Makefile.am
index e349eb32..6d14130d 100644
--- a/gst-libs/gst/tuner/Makefile.am
+++ b/gst-libs/gst/tuner/Makefile.am
@@ -6,12 +6,11 @@ libgstinterfacesinclude_HEADERS = \
 		tunernorm.h \
 		tunerchannel.h
 
-lib_LTLIBRARIES = libgsttuner.la
+noinst_LTLIBRARIES = libgsttuner.la
 
 libgsttuner_la_SOURCES = \
 	tuner.c \
 	tunernorm.c \
 	tunerchannel.c
-libgsttuner_la_LIBADD = 
-libgsttuner_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS)
-libgsttuner_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgsttuner_la_CFLAGS = $(GST_CFLAGS)
+
diff --git a/gst-libs/gst/xoverlay/Makefile.am b/gst-libs/gst/xoverlay/Makefile.am
index 184d505f..321af7ec 100644
--- a/gst-libs/gst/xoverlay/Makefile.am
+++ b/gst-libs/gst/xoverlay/Makefile.am
@@ -3,9 +3,8 @@ libgstinterfacesincludedir = \
 
 libgstinterfacesinclude_HEADERS = xoverlay.h
 
-lib_LTLIBRARIES = libgstxoverlay.la
+noinst_LTLIBRARIES = libgstxoverlay.la
 
 libgstxoverlay_la_SOURCES = xoverlay.c
-libgstxoverlay_la_LIBADD = 
 libgstxoverlay_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS)
-libgstxoverlay_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+