mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

First rule of gst-rtsp-server club: don't talk about gst-phonon

Browse source
This commit is contained in:
Tim-Philipp Müller 2012-02-13 11:42:51 +00:00
parent 3173fee92b
commit 449bc0dffb
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -203,7 +203,7 @@ dnl vars common to for all internal objects (core libs, elements, applications)
dnl CFLAGS: dnl CFLAGS:
dnl - src and build dirs need to be added because every piece that gets built dnl - src and build dirs need to be added because every piece that gets built
dnl will need the GStreamer source and generated headers dnl will need the GStreamer source and generated headers
GST_ALL_CFLAGS="-I\$(top_srcdir) -I\$(top_builddir) $GST_CFLAGS \$(GST_OPTION_CFLAGS)" GST_ALL_CFLAGS="-I\$(top_srcdir) -I\$(top_builddir) $GST_PLUGINS_BASE_CFLAGS $GST_CFLAGS \$(GST_OPTION_CFLAGS)"
AC_SUBST([GST_ALL_CFLAGS]) AC_SUBST([GST_ALL_CFLAGS])
dnl FIXME: check if LTLIBINTL is needed everywhere dnl FIXME: check if LTLIBINTL is needed everywhere
@ -217,11 +217,11 @@ GST_ALL_LDFLAGS="-no-undefined"
AC_SUBST(GST_ALL_LDFLAGS) AC_SUBST(GST_ALL_LDFLAGS)
dnl GST_OBJ_* dnl GST_OBJ_*
dnl default vars for all internal objects built on libgstphonon dnl default vars for all internal objects built on libgstrtspserver
dnl includes GST_ALL_* dnl includes GST_ALL_*
GST_OBJ_CFLAGS="\$(GST_ALL_CFLAGS)" GST_OBJ_CFLAGS="\$(GST_ALL_CFLAGS)"
AC_SUBST([GST_OBJ_CFLAGS]) AC_SUBST([GST_OBJ_CFLAGS])
GST_OBJ_LIBS="\$(top_builddir)/gst-phonon/libgstphonon.la \$(GST_ALL_LIBS)" GST_OBJ_LIBS="\$(top_builddir)/gst/rtsp-server/libgstrtspserver-@GST_MAJORMINOR@.la \$(GST_ALL_LIBS)"
AC_SUBST([GST_OBJ_LIBS]) AC_SUBST([GST_OBJ_LIBS])
dnl this really should only contain flags, not libs - they get added before dnl this really should only contain flags, not libs - they get added before
@ -259,5 +259,5 @@ Configuration
Compiler : ${CC} Compiler : ${CC}
Vala bindings : ${enable_vala} Vala bindings : ${enable_vala}
Gst-rtsp-server configured. Type 'make' to build. gst-rtsp-server configured. Type 'make' to build.
" "

9
examples/Makefile.am
View file

@ -1,9 +1,6 @@
noinst_PROGRAMS = test-video test-ogg test-mp4 test-readme test-launch test-sdp test-uri test-auth noinst_PROGRAMS = test-video test-ogg test-mp4 test-readme test-launch test-sdp test-uri test-auth
INCLUDES = -I$(top_srcdir) -I$(srcdir) #INCLUDES = -I$(top_srcdir) -I$(srcdir)
AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
AM_LDFLAGS = \
$(GST_LIBS) \
$(top_builddir)/gst/rtsp-server/libgstrtspserver-@GST_MAJORMINOR@.la
AM_CFLAGS = $(GST_OBJ_CFLAGS)
AM_LDFLAGS = $(GST_OBJ_LIBS)