mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-02 04:35:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

Split out GST_PLUGINS_BAD_CFLAGS from GST_CFLAGS

Browse source 
Move include directives for gst-libs into GST_PLUGINS_BAD_CFLAGS,
and fix all the Makefiles that use it.  This is so that all the
include directories are added in the proper order: first the
directories in srcdir/builddir, then gst-plugins-base dirs, then
gstreamer dirs.  If the order is wrong, installed headers may be
used instead of local headers and/or uninstalled headers from -base.
This commit is contained in:
David Schleef 2010-05-19 17:12:55 -07:00
parent e3925075f9
commit c3d4977761
20 changed files with 43 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -1587,11 +1587,15 @@ dnl FIXME: do we want to rename to GST_ALL_* ?
dnl prefer internal headers to already installed ones
dnl also add builddir include for enumtypes and marshal
dnl add GST_OPTION_CFLAGS, but overridable
GST_CXXFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS \$(GST_OPTION_CXXFLAGS)"
GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS \$(GST_OPTION_CFLAGS)"
GST_CXXFLAGS="$GST_CFLAGS \$(GST_OPTION_CXXFLAGS)"
GST_CFLAGS="$GST_CFLAGS \$(GST_OPTION_CFLAGS)"
AC_SUBST(GST_CFLAGS)
AC_SUBST(GST_CXXFLAGS)
AC_SUBST(GST_LIBS)
GST_PLUGINS_BAD_CXXFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs"
GST_PLUGINS_BAD_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs"
AC_SUBST(GST_PLUGINS_BAD_CFLAGS)
AC_SUBST(GST_PLUGINS_BAD_CXXFLAGS)
dnl LDFLAGS really should only contain flags, not libs - they get added before
dnl whatevertarget_LIBS and -L flags here affect the rest of the linking

2
ext/audiofile/Makefile.am
View file

@ -2,7 +2,7 @@
plugin_LTLIBRARIES = libgstaudiofile.la
libgstaudiofile_la_SOURCES = gstaf.c gstafsink.c gstafsrc.c gstafparse.c
libgstaudiofile_la_CFLAGS = $(GST_CFLAGS) $(AUDIOFILE_CFLAGS)
libgstaudiofile_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS) $(AUDIOFILE_CFLAGS)
libgstaudiofile_la_LIBADD = $(AUDIOFILE_LIBS)
libgstaudiofile_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstaudiofile_la_LIBTOOLFLAGS = --tag=disable-static

4
ext/dirac/Makefile.am
View file

@ -5,8 +5,10 @@ libgstdirac_la_SOURCES = \
gstdiracenc.cc
libgstdirac_la_CXXFLAGS = \
$(GST_PLUGINS_BAD_CXXFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CXXFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) $(DIRAC_CFLAGS) \
$(DIRAC_CFLAGS) \
-DGST_USE_UNSTABLE_API
libgstdirac_la_LIBADD = \
$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_MAJORMINOR@.la \

3
ext/resindvd/Makefile.am
View file

@ -15,7 +15,8 @@ libresindvd_la_SOURCES = \
rsnparsetter.c \
rsnwrappedbuffer.c
libresindvd_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
libresindvd_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_CFLAGS) $(DVDNAV_CFLAGS)
libresindvd_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-lgstinterfaces-$(GST_MAJORMINOR) -lgstvideo-$(GST_MAJORMINOR) \

3
ext/schroedinger/Makefile.am
View file

@ -11,9 +11,10 @@ libgstschro_la_SOURCES = \
gstschroparse.c \
gstschroutils.c
libgstschro_la_CFLAGS = \
$(GST_CFLAGS) \
$(GST_PLUGINS_BAD_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(GST_CFLAGS) \
-DGST_USE_UNSTABLE_API \
$(SCHRO_CFLAGS)
libgstschro_la_LIBADD = \

2
ext/sndfile/Makefile.am
View file

@ -2,7 +2,7 @@
plugin_LTLIBRARIES = libgstsndfile.la
libgstsndfile_la_SOURCES = gstsf.c gstsfsrc.c gstsfsink.c
libgstsndfile_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(SNDFILE_CFLAGS)
libgstsndfile_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(SNDFILE_CFLAGS)
libgstsndfile_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(SNDFILE_LIBS)
libgstsndfile_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstsndfile_la_LIBTOOLFLAGS = --tag=disable-static

7
gst-libs/gst/app/Makefile.am
View file

@ -14,8 +14,11 @@ nodist_libgstapp_@GST_MAJORMINOR@_la_SOURCES = \
$(built_sources)
libgstapp_@GST_MAJORMINOR@_la_SOURCES = gstappsrc.c gstappbuffer.c gstappsink.c
libgstapp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS)
libgstapp_@GST_MAJORMINOR@_la_CFLAGS = \
$(GST_PLUGINS_BAD_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(GST_CFLAGS)
libgstapp_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS)
libgstapp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_ALL_LDFLAGS)
libgstapp_@GST_MAJORMINOR@_la_LIBTOOLFLAGS = --tag=disable-static

5
gst-libs/gst/interfaces/Makefile.am
View file

@ -29,7 +29,10 @@ libgstphotography_@GST_MAJORMINOR@_la_SOURCES = \
nodist_libgstphotography_@GST_MAJORMINOR@_la_SOURCES = \
$(built_sources)
libgstphotography_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -DGST_USE_UNSTABLE_API
libgstphotography_@GST_MAJORMINOR@_la_CFLAGS = \
-DGST_USE_UNSTABLE_API \
$(GST_PLUGINS_BAD_CFLAGS) \
$(GST_CFLAGS)
libgstphotography_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
libgstphotography_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)

1
gst-libs/gst/signalprocessor/Makefile.am
View file

@ -5,6 +5,7 @@ libgstsignalprocessor_@GST_MAJORMINOR@include_HEADERS = gstsignalprocessor.h
libgstsignalprocessor_@GST_MAJORMINOR@_la_SOURCES = gstsignalprocessor.c
libgstsignalprocessor_@GST_MAJORMINOR@_la_CFLAGS = \
$(GST_PLUGINS_BAD_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS)
libgstsignalprocessor_@GST_MAJORMINOR@_la_LIBADD = \

5
gst-libs/gst/video/Makefile.am
View file

@ -18,7 +18,10 @@ libgstbasevideo_@GST_MAJORMINOR@include_HEADERS = \
gstbasevideoencoder.h \
gstbasevideoparse.h
libgstbasevideo_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -DGST_USE_UNSTABLE_API
libgstbasevideo_@GST_MAJORMINOR@_la_CFLAGS = \
$(GST_PLUGINS_BAD_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) -DGST_USE_UNSTABLE_API \
$(GST_CFLAGS)
libgstbasevideo_@GST_MAJORMINOR@_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_MAJORMINOR@
libgstbasevideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)

1
gst/aiff/Makefile.am
View file

@ -2,6 +2,7 @@ plugin_LTLIBRARIES = libgstaiff.la
libgstaiff_la_SOURCES = aiff.c aiffmux.c aiffparse.c
libgstaiff_la_CFLAGS = \
$(GST_PLUGINS_BAD_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(GST_CFLAGS)

2
gst/asfmux/Makefile.am
View file

@ -11,7 +11,7 @@ libgstasfmux_la_SOURCES = gstasfmux.c \
# flags used to compile this plugin
# add other _CFLAGS and _LIBS as needed
libgstasfmux_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
libgstasfmux_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
libgstasfmux_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-lgstrtp-@GST_MAJORMINOR@
libgstasfmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

2
gst/audiobuffer/Makefile.am
View file

@ -1,7 +1,7 @@
plugin_LTLIBRARIES = libgstaudiobuffer.la
libgstaudiobuffer_la_SOURCES = gstaudioringbuffer.c
libgstaudiobuffer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
libgstaudiobuffer_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_CFLAGS)
libgstaudiobuffer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
-lgstaudio-$(GST_MAJORMINOR)

2
gst/camerabin/Makefile.am
View file

@ -25,7 +25,7 @@ libgstcamerabin_la_SOURCES = gstcamerabin.c \
nodist_libgstcamerabin_la_SOURCES = $(built_sources)
libgstcamerabin_la_CFLAGS = \
-I$(top_builddir)/gst-libs \
$(GST_PLUGINS_BAD_CFLAGS) \
$(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
-DGST_USE_UNSTABLE_API
libgstcamerabin_la_LIBADD = \

2
gst/dvdspu/Makefile.am
View file

@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstdvdspu.la
libgstdvdspu_la_SOURCES = gstdvdspu.c gstdvdspu-render.c gstspu-vobsub.c gstspu-vobsub-render.c gstspu-pgs.c
libgstdvdspu_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
libgstdvdspu_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
libgstdvdspu_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
$(GST_LIBS)
libgstdvdspu_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

4
gst/nuvdemux/Makefile.am
View file

@ -1,9 +1,9 @@
plugin_LTLIBRARIES = libgstnuvdemux.la
libgstnuvdemux_la_CFLAGS = ${GST_CFLAGS}
libgstnuvdemux_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS)
libgstnuvdemux_la_LIBADD = $(GST_BASE_LIBS)
libgstnuvdemux_la_LDFLAGS = ${GST_PLUGIN_LDFLAGS}
libgstnuvdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstnuvdemux_la_SOURCES = gstnuvdemux.c
libgstnuvdemux_la_LIBTOOLFLAGS = --tag=disable-static

6
gst/videomeasure/Makefile.am
View file

@ -8,8 +8,10 @@ libgstvideomeasure_la_SOURCES = \
gstvideomeasure_ssim.c \
gstvideomeasure_collector.c
libgstvideomeasure_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS)
libgstvideomeasure_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(GST_CFLAGS)
libgstvideomeasure_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-lgstvideo-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
libgstvideomeasure_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

2
sys/dvb/Makefile.am
View file

@ -17,7 +17,7 @@ libgstdvb_la_SOURCES = \
camconditionalaccess.c \
parsechannels.c
libgstdvb_la_CFLAGS = $(GST_CFLAGS)
libgstdvb_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS)
libgstdvb_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS)
libgstdvb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstdvb_la_LIBTOOLFLAGS = --tag=disable-static

2
sys/dxr3/Makefile.am
View file

@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstdxr3.la
libgstdxr3_la_SOURCES = dxr3videosink.c dxr3audiosink.c dxr3spusink.c \
dxr3init.c ac3_padder.c
nodist_libgstdxr3_la_SOURCES = dxr3marshal.c
libgstdxr3_la_CFLAGS = $(GST_CFLAGS)
libgstdxr3_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS)
libgstdxr3_la_LIBADD =
libgstdxr3_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstdxr3_la_LIBTOOLFLAGS = --tag=disable-static

2
tests/examples/camerabin/Makefile.am
View file

@ -6,7 +6,7 @@ GST_CAMERABIN_GTK_EXAMPLES = gst-camera
gst_camera_SOURCES = gst-camera.h gst-camera.c
gst_camera_CFLAGS = \
-I$(top_builddir)/gst-libs \
$(GST_PLUGINS_BAD_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
$(GTK_CFLAGS) \
$(GMODULE_EXPORT_CFLAGS) \