mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-23 14:36:24 +00:00
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.
This commit is contained in:
parent
e8da19e8af
commit
bd1fdba49f
7 changed files with 35 additions and 23 deletions
|
@ -1159,6 +1159,8 @@ pkgconfig/gstreamer-libs.pc
|
||||||
pkgconfig/gstreamer-libs-uninstalled.pc
|
pkgconfig/gstreamer-libs-uninstalled.pc
|
||||||
pkgconfig/gstreamer-play.pc
|
pkgconfig/gstreamer-play.pc
|
||||||
pkgconfig/gstreamer-play-uninstalled.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.pc
|
||||||
gst-libs/gst/gconf/gstreamer-gconf-uninstalled.pc
|
gst-libs/gst/gconf/gstreamer-gconf-uninstalled.pc
|
||||||
gst-plugins.spec
|
gst-plugins.spec
|
||||||
|
@ -1296,6 +1298,7 @@ gst-libs/gst/media-info/Makefile
|
||||||
gst-libs/gst/mixer/Makefile
|
gst-libs/gst/mixer/Makefile
|
||||||
gst-libs/gst/navigation/Makefile
|
gst-libs/gst/navigation/Makefile
|
||||||
gst-libs/gst/play/Makefile
|
gst-libs/gst/play/Makefile
|
||||||
|
gst-libs/gst/propertyprobe/Makefile
|
||||||
gst-libs/gst/resample/Makefile
|
gst-libs/gst/resample/Makefile
|
||||||
gst-libs/gst/riff/Makefile
|
gst-libs/gst/riff/Makefile
|
||||||
gst-libs/gst/tuner/Makefile
|
gst-libs/gst/tuner/Makefile
|
||||||
|
|
|
@ -12,12 +12,29 @@ endif
|
||||||
|
|
||||||
SUBDIRS = audio colorbalance floatcast \
|
SUBDIRS = audio colorbalance floatcast \
|
||||||
$(GCONF_DIR) idct media-info \
|
$(GCONF_DIR) idct media-info \
|
||||||
mixer navigation play \
|
mixer navigation play propertyprobe \
|
||||||
resample riff tuner video \
|
resample tuner video \
|
||||||
xoverlay $(X_DIR)
|
xoverlay $(X_DIR)
|
||||||
|
|
||||||
DIST_SUBDIRS = audio colorbalance floatcast \
|
DIST_SUBDIRS = audio colorbalance floatcast \
|
||||||
gconf idct media-info \
|
gconf idct media-info \
|
||||||
mixer navigation play \
|
mixer navigation play propertyprobe \
|
||||||
resample riff tuner video \
|
resample tuner video \
|
||||||
xoverlay xwindowlistener
|
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@
|
||||||
|
|
||||||
|
|
|
@ -1,15 +1,13 @@
|
||||||
libgstinterfacesincludedir = \
|
libgstcolorbalanceincludedir = \
|
||||||
$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/colorbalance
|
$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/colorbalance
|
||||||
|
|
||||||
libgstinterfacesinclude_HEADERS = \
|
libgstcolorbalanceinclude_HEADERS = \
|
||||||
colorbalance.h \
|
colorbalance.h \
|
||||||
colorbalancechannel.h
|
colorbalancechannel.h
|
||||||
|
|
||||||
lib_LTLIBRARIES = libgstcolorbalance.la
|
noinst_LTLIBRARIES = libgstcolorbalance.la
|
||||||
|
|
||||||
libgstcolorbalance_la_SOURCES = \
|
libgstcolorbalance_la_SOURCES = \
|
||||||
colorbalance.c \
|
colorbalance.c \
|
||||||
colorbalancechannel.c
|
colorbalancechannel.c
|
||||||
libgstcolorbalance_la_LIBADD =
|
|
||||||
libgstcolorbalance_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS)
|
libgstcolorbalance_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS)
|
||||||
libgstcolorbalance_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
|
||||||
|
|
|
@ -5,11 +5,9 @@ libgstinterfacesinclude_HEADERS = \
|
||||||
mixer.h \
|
mixer.h \
|
||||||
mixertrack.h
|
mixertrack.h
|
||||||
|
|
||||||
lib_LTLIBRARIES = libgstmixer.la
|
noinst_LTLIBRARIES = libgstmixer.la
|
||||||
|
|
||||||
libgstmixer_la_SOURCES = \
|
libgstmixer_la_SOURCES = \
|
||||||
mixer.c \
|
mixer.c \
|
||||||
mixertrack.c
|
mixertrack.c
|
||||||
libgstmixer_la_LIBADD =
|
libgstmixer_la_CFLAGS = $(GST_CFLAGS)
|
||||||
libgstmixer_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS)
|
|
||||||
libgstmixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
lib_LTLIBRARIES = libgstnavigation.la
|
noinst_LTLIBRARIES = libgstnavigation.la
|
||||||
|
|
||||||
libgstnavigation_la_SOURCES = navigation.c
|
libgstnavigation_la_SOURCES = navigation.c
|
||||||
|
|
||||||
libgstnavigationincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/navigation
|
libgstnavigationincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/navigation
|
||||||
libgstnavigationinclude_HEADERS = navigation.h
|
libgstnavigationinclude_HEADERS = navigation.h
|
||||||
|
|
||||||
libgstnavigation_la_LIBADD =
|
|
||||||
libgstnavigation_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS)
|
libgstnavigation_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS)
|
||||||
libgstnavigation_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
|
||||||
|
|
|
@ -6,12 +6,11 @@ libgstinterfacesinclude_HEADERS = \
|
||||||
tunernorm.h \
|
tunernorm.h \
|
||||||
tunerchannel.h
|
tunerchannel.h
|
||||||
|
|
||||||
lib_LTLIBRARIES = libgsttuner.la
|
noinst_LTLIBRARIES = libgsttuner.la
|
||||||
|
|
||||||
libgsttuner_la_SOURCES = \
|
libgsttuner_la_SOURCES = \
|
||||||
tuner.c \
|
tuner.c \
|
||||||
tunernorm.c \
|
tunernorm.c \
|
||||||
tunerchannel.c
|
tunerchannel.c
|
||||||
libgsttuner_la_LIBADD =
|
libgsttuner_la_CFLAGS = $(GST_CFLAGS)
|
||||||
libgsttuner_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS)
|
|
||||||
libgsttuner_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
|
||||||
|
|
|
@ -3,9 +3,8 @@ libgstinterfacesincludedir = \
|
||||||
|
|
||||||
libgstinterfacesinclude_HEADERS = xoverlay.h
|
libgstinterfacesinclude_HEADERS = xoverlay.h
|
||||||
|
|
||||||
lib_LTLIBRARIES = libgstxoverlay.la
|
noinst_LTLIBRARIES = libgstxoverlay.la
|
||||||
|
|
||||||
libgstxoverlay_la_SOURCES = xoverlay.c
|
libgstxoverlay_la_SOURCES = xoverlay.c
|
||||||
libgstxoverlay_la_LIBADD =
|
|
||||||
libgstxoverlay_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS)
|
libgstxoverlay_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS)
|
||||||
libgstxoverlay_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
|
||||||
|
|
Loading…
Reference in a new issue