mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-06-07 07:58:51 +00:00
various build fixes
Original commit message from CVS: various build fixes
This commit is contained in:
parent
bd1ebc25dd
commit
a3d7869aaa
7 changed files with 14 additions and 14 deletions
|
@ -32,7 +32,7 @@ pkgconfig_DATA = gstreamer.pc
|
||||||
man_MANS = gstreamer-config.1
|
man_MANS = gstreamer-config.1
|
||||||
|
|
||||||
EXTRA_DIST = gstreamer.spec.in gstreamer-config.in gstreamer.m4 \
|
EXTRA_DIST = gstreamer.spec.in gstreamer-config.in gstreamer.m4 \
|
||||||
gstreamer.pc.in gstreamer-uninstall.pc.in \
|
gstreamer.pc.in gstreamer-uninstalled.pc.in \
|
||||||
LICENSE REQUIREMENTS ABOUT-NLS $(man_MANS)
|
LICENSE REQUIREMENTS ABOUT-NLS $(man_MANS)
|
||||||
|
|
||||||
dist-hook:
|
dist-hook:
|
||||||
|
|
|
@ -40,6 +40,8 @@
|
||||||
#undef HAVE_MPEG2DEC
|
#undef HAVE_MPEG2DEC
|
||||||
#undef HAVE_LINUX_CDROM
|
#undef HAVE_LINUX_CDROM
|
||||||
#undef HAVE_LINUX_VIDEODEV
|
#undef HAVE_LINUX_VIDEODEV
|
||||||
|
#undef HAVE_LIBSDL
|
||||||
|
#undef HAVE_LIBOPENQUICKTIME
|
||||||
|
|
||||||
#undef HAVE_ATOMIC_H
|
#undef HAVE_ATOMIC_H
|
||||||
|
|
||||||
|
|
|
@ -5,8 +5,8 @@ AC_CANONICAL_SYSTEM
|
||||||
AM_CONFIG_HEADER(config.h)
|
AM_CONFIG_HEADER(config.h)
|
||||||
|
|
||||||
GST_VERSION_MAJOR=0
|
GST_VERSION_MAJOR=0
|
||||||
GST_VERSION_MINOR=1
|
GST_VERSION_MINOR=2
|
||||||
GST_VERSION_MICRO=1
|
GST_VERSION_MICRO=0
|
||||||
GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR.$GST_VERSION_MICRO
|
GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR.$GST_VERSION_MICRO
|
||||||
|
|
||||||
PACKAGE=gstreamer
|
PACKAGE=gstreamer
|
||||||
|
@ -898,6 +898,7 @@ AM_CONDITIONAL(HAVE_RAW1394, test "x$HAVE_RAW1394" = "xyes")
|
||||||
AM_CONDITIONAL(HAVE_LIBDV, test "x$HAVE_LIBDV" = "xyes")
|
AM_CONDITIONAL(HAVE_LIBDV, test "x$HAVE_LIBDV" = "xyes")
|
||||||
AM_CONDITIONAL(HAVE_LIBAA, test "x$HAVE_LIBAA" = "xyes")
|
AM_CONDITIONAL(HAVE_LIBAA, test "x$HAVE_LIBAA" = "xyes")
|
||||||
AM_CONDITIONAL(HAVE_GNOME_VFS, test "x$HAVE_GNOME_VFS" = "xyes")
|
AM_CONDITIONAL(HAVE_GNOME_VFS, test "x$HAVE_GNOME_VFS" = "xyes")
|
||||||
|
AM_CONDITIONAL(HAVE_LIBSDL, test "x$HAVE_LIBSDL" = "xyes")
|
||||||
AM_CONDITIONAL(HAVE_LIBOPENQUICKTIME, test "x$HAVE_LIBOPENQUICKTIME" = "xyes")
|
AM_CONDITIONAL(HAVE_LIBOPENQUICKTIME, test "x$HAVE_LIBOPENQUICKTIME" = "xyes")
|
||||||
|
|
||||||
|
|
||||||
|
@ -985,7 +986,6 @@ include/wine/Makefile
|
||||||
gst/Makefile
|
gst/Makefile
|
||||||
gst/gstversion.h
|
gst/gstversion.h
|
||||||
gst/types/Makefile
|
gst/types/Makefile
|
||||||
gst/meta/Makefile
|
|
||||||
gst/elements/Makefile
|
gst/elements/Makefile
|
||||||
gst/autoplug/Makefile
|
gst/autoplug/Makefile
|
||||||
libs/Makefile
|
libs/Makefile
|
||||||
|
@ -1061,7 +1061,6 @@ plugins/visualization/spectrum/Makefile
|
||||||
plugins/visualization/vumeter/Makefile
|
plugins/visualization/vumeter/Makefile
|
||||||
plugins/visualization/synaesthesia/Makefile
|
plugins/visualization/synaesthesia/Makefile
|
||||||
plugins/visualization/smoothwave/Makefile
|
plugins/visualization/smoothwave/Makefile
|
||||||
plugins/videosink/Makefile
|
|
||||||
plugins/videoscale/Makefile
|
plugins/videoscale/Makefile
|
||||||
plugins/xvideosink/Makefile
|
plugins/xvideosink/Makefile
|
||||||
plugins/wav/Makefile
|
plugins/wav/Makefile
|
||||||
|
|
|
@ -3,18 +3,17 @@ filterdir = $(libdir)/gst
|
||||||
filter_LTLIBRARIES = libgststaticautoplug.la libgststaticautoplugrender.la \
|
filter_LTLIBRARIES = libgststaticautoplug.la libgststaticautoplugrender.la \
|
||||||
libgstautoplugcache.la libgstautoplugger.la
|
libgstautoplugcache.la libgstautoplugger.la
|
||||||
|
|
||||||
libgststaticautoplug_la_SOURCES = \
|
libgststaticautoplug_la_SOURCES = gststaticautoplug.c
|
||||||
gststaticautoplug.c
|
libgststaticautoplugrender_la_SOURCES = gststaticautoplugrender.c
|
||||||
|
|
||||||
libgststaticautoplugrender_la_SOURCES = \
|
|
||||||
gststaticautoplugrender.c
|
|
||||||
|
|
||||||
libgstautoplugcache_la_SOURCES = gstautoplugcache.c
|
libgstautoplugcache_la_SOURCES = gstautoplugcache.c
|
||||||
libgstautoplugger_la_SOURCES = gstautoplugger.c
|
libgstautoplugger_la_SOURCES = gstautoplugger.c
|
||||||
|
|
||||||
libgststaticautoplug_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
libgststaticautoplug_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
||||||
libgststaticautoplugrender_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
libgststaticautoplugrender_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
||||||
libgstautoplugcache_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
libgstautoplugcache_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
||||||
|
libgstautoplugger_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
||||||
|
|
||||||
|
noinst_HEADERS = gststaticautoplug.h gststaticautoplugrender.h
|
||||||
|
|
||||||
noinst_PROGRAMS = autoplugtest
|
noinst_PROGRAMS = autoplugtest
|
||||||
autoplugtest_LDADD = $(GST_LIBS)
|
autoplugtest_LDADD = $(GST_LIBS)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
SUBDIRS = sched eos
|
SUBDIRS = sched eos nego
|
||||||
|
|
||||||
noinst_PROGRAMS = init loadall simplefake states caps queue registry \
|
noinst_PROGRAMS = init loadall simplefake states caps queue registry \
|
||||||
paranoia rip mp3encode autoplug props case4 markup load tee autoplug2 autoplug3 \
|
paranoia rip mp3encode autoplug props case4 markup load tee autoplug2 autoplug3 \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
SUBDIRS =
|
SUBDIRS = refcounting capsnego
|
||||||
|
|
||||||
testprogs = test_gst_init
|
testprogs = test_gst_init
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
SUBDIRS =
|
SUBDIRS = refcounting capsnego
|
||||||
|
|
||||||
testprogs = test_gst_init
|
testprogs = test_gst_init
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue