Commit 3e49bcfc authored by David Schleef's avatar David Schleef

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.
parent c186da6a
......@@ -1159,6 +1159,8 @@ pkgconfig/gstreamer-libs.pc
pkgconfig/gstreamer-libs-uninstalled.pc
pkgconfig/gstreamer-play.pc
pkgconfig/gstreamer-play-uninstalled.pc
pkgconfig/gstreamer-interfaces.pc
pkgconfig/gstreamer-interfaces-uninstalled.pc
gst-libs/gst/gconf/gstreamer-gconf.pc
gst-libs/gst/gconf/gstreamer-gconf-uninstalled.pc
gst-plugins.spec
......@@ -1296,6 +1298,7 @@ gst-libs/gst/media-info/Makefile
gst-libs/gst/mixer/Makefile
gst-libs/gst/navigation/Makefile
gst-libs/gst/play/Makefile
gst-libs/gst/propertyprobe/Makefile
gst-libs/gst/resample/Makefile
gst-libs/gst/riff/Makefile
gst-libs/gst/tuner/Makefile
......
......@@ -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@
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)
......@@ -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)
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)
......@@ -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)
......@@ -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)
......@@ -9,10 +9,12 @@ endif
### all of the standard pc files we need to generate
pcfiles = \
gstreamer-libs-@GST_MAJORMINOR@.pc \
gstreamer-play-@GST_MAJORMINOR@.pc
gstreamer-play-@GST_MAJORMINOR@.pc \
gstreamer-interfaces-@GST_MAJORMINOR@.pc
pcfiles_uninstalled = \
gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc \
gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc
gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc \
gstreamer-interfaces-@GST_MAJORMINOR@-uninstalled.pc
pcfiles_gconf = $(GCONF_PC) $(GCONF_PC_UNINSTALLED)
all-local: $(pcfiles) $(pcfiles_uninstalled) $(pcfiles_gconf)
......@@ -37,7 +39,8 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = \
$(GCONF_PC) \
gstreamer-libs-@GST_MAJORMINOR@.pc \
gstreamer-play-@GST_MAJORMINOR@.pc
gstreamer-play-@GST_MAJORMINOR@.pc \
gstreamer-interfaces-@GST_MAJORMINOR@.pc
CLEANFILES = $(pcfiles) $(pcfiles_uninstalled)
EXTRA_DIST= \
......
This diff is collapsed.
# the standard variables don't make sense for an uninstalled copy
prefix=
exec_prefix=
libdir=${pcfiledir}
includedir=${pcfiledir}
Name: GStreamer Interfaces library, uninstalled
Description: Streaming-media framework, interfaces library, not installed
Requires: gstreamer >= @VERSION@
Version: @VERSION@
Libs: ${pcfiledir}/../gst-libs/gst/libgst-interfaces-@GST_MAJORMINOR@.la
Cflags: -I${pcfiledir}/../gst-libs
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
Name: GStreamer Interfaces Library
Description: Streaming-media framework, interfaces library
Requires: gstreamer-@GST_MAJORMINOR@
Version: @VERSION@
Libs: -L${libdir} -lgstplay-@GST_MAJORMINOR@
Cflags: -I${includedir}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment