From: Thomas Vander Stichele Date: Thu, 4 Jan 2007 12:49:48 +0000 (+0000) Subject: configure.ac: split out GST_CFLAGS into GST_PLUGINS_BASE_CFLAGS and GST_CFLAGS so... X-Git-Tag: 1.19.3~511^2~11436 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95ada43982e9c7f9150c931ded83410fcaba0aff;p=platform%2Fupstream%2Fgstreamer.git configure.ac: split out GST_CFLAGS into GST_PLUGINS_BASE_CFLAGS and GST_CFLAGS so that GST_BASE_CFLAGS can go inbetwe... Original commit message from CVS: * configure.ac: split out GST_CFLAGS into GST_PLUGINS_BASE_CFLAGS and GST_CFLAGS so that GST_BASE_CFLAGS can go inbetween them, making sure we use uninstalled gst-libs headers * docs/libs/Makefile.am: * ext/alsa/Makefile.am: * ext/cdparanoia/Makefile.am: * ext/gnomevfs/Makefile.am: * ext/libvisual/Makefile.am: * ext/ogg/Makefile.am: * ext/theora/Makefile.am: * ext/vorbis/Makefile.am: * gst-libs/gst/audio/Makefile.am: * gst-libs/gst/cdda/Makefile.am: * gst-libs/gst/interfaces/Makefile.am: * gst-libs/gst/riff/Makefile.am: * gst-libs/gst/rtp/Makefile.am: * gst-libs/gst/tag/Makefile.am: * gst/adder/Makefile.am: * gst/audioconvert/Makefile.am: * gst/audiorate/Makefile.am: * gst/audioresample/Makefile.am: * gst/playback/Makefile.am: * gst/tcp/Makefile.am: * gst/videoscale/Makefile.am: * gst/volume/Makefile.am: * sys/ximage/Makefile.am: * sys/xvimage/Makefile.am: * tests/icles/Makefile.am: adapt --- diff --git a/ChangeLog b/ChangeLog index 656c01a..ac63cc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,36 @@ +2007-01-04 Thomas Vander Stichele + + * configure.ac: + split out GST_CFLAGS into GST_PLUGINS_BASE_CFLAGS and GST_CFLAGS + so that GST_BASE_CFLAGS can go inbetween them, making sure + we use uninstalled gst-libs headers + * docs/libs/Makefile.am: + * ext/alsa/Makefile.am: + * ext/cdparanoia/Makefile.am: + * ext/gnomevfs/Makefile.am: + * ext/libvisual/Makefile.am: + * ext/ogg/Makefile.am: + * ext/theora/Makefile.am: + * ext/vorbis/Makefile.am: + * gst-libs/gst/audio/Makefile.am: + * gst-libs/gst/cdda/Makefile.am: + * gst-libs/gst/interfaces/Makefile.am: + * gst-libs/gst/riff/Makefile.am: + * gst-libs/gst/rtp/Makefile.am: + * gst-libs/gst/tag/Makefile.am: + * gst/adder/Makefile.am: + * gst/audioconvert/Makefile.am: + * gst/audiorate/Makefile.am: + * gst/audioresample/Makefile.am: + * gst/playback/Makefile.am: + * gst/tcp/Makefile.am: + * gst/videoscale/Makefile.am: + * gst/volume/Makefile.am: + * sys/ximage/Makefile.am: + * sys/xvimage/Makefile.am: + * tests/icles/Makefile.am: + adapt + 2007-01-04 Julien MOUTTE * gst-libs/gst/interfaces/xoverlay.c: diff --git a/configure.ac b/configure.ac index 64b3ceb..affb33d 100644 --- a/configure.ac +++ b/configure.ac @@ -519,6 +519,8 @@ dnl *** finalize CFLAGS, LDFLAGS, LIBS dnl Overview: dnl GST_OPTION_CFLAGS: common flags for profiling, debugging, errors, ... dnl GST_*: flags shared by built objects to link against GStreamer +dnl GST_PLUGINS_BASE_CFLAGS: to link internally against the plugins base libs +dnl (compare to other modules) or for i18n dnl GST_ALL_LDFLAGS: linker flags shared by all dnl GST_LIB_LDFLAGS: additional linker flags for all libaries dnl GST_LT_LDFLAGS: library versioning of our libraries @@ -540,11 +542,15 @@ AC_SUBST(GST_OPTION_CFLAGS) dnl our libraries need to be versioned correctly AC_SUBST(GST_LT_LDFLAGS) -dnl FIXME: do we want to rename to GST_ALL_* ? +dnl GST_PLUGINS_BASE_CFLAGS dnl prefer internal headers to already installed ones dnl also add builddir include for enumtypes and marshal +GST_PLUGINS_BASE_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs" +AC_SUBST(GST_PLUGINS_BASE_CFLAGS) + +dnl FIXME: do we want to rename to GST_ALL_* ? dnl add GST_OPTION_CFLAGS, but overridable -GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS \$(GST_OPTION_CFLAGS)" +GST_CFLAGS="$GST_CFLAGS \$(GST_OPTION_CFLAGS)" AC_SUBST(GST_CFLAGS) dnl add GCOV libs because libtool strips -fprofile-arcs -ftest-coverage GST_LIBS="$GST_LIBS \$(GCOV_LIBS)" diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index f9318c7..48513f9 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -87,7 +87,7 @@ extra_files = # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib # contains GtkObjects/GObjects and you want to document signals and properties. -GTKDOC_CFLAGS = $(GST_BASE_CFLAGS) -I$(top_builddir) -I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs +GTKDOC_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) GTKDOC_LIBS = $(SCANOBJ_DEPS) $(GST_BASE_LIBS) GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC) diff --git a/ext/alsa/Makefile.am b/ext/alsa/Makefile.am index 5f1d73d..6a7eb25 100644 --- a/ext/alsa/Makefile.am +++ b/ext/alsa/Makefile.am @@ -11,7 +11,7 @@ libgstalsa_la_SOURCES = \ gstalsasrc.c \ gstalsa.c -libgstalsa_la_CFLAGS = $(GST_CFLAGS) $(ALSA_CFLAGS) +libgstalsa_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(ALSA_CFLAGS) libgstalsa_la_LIBADD = \ $(ALSA_LIBS) \ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \ diff --git a/ext/cdparanoia/Makefile.am b/ext/cdparanoia/Makefile.am index d23c395..48b6728 100644 --- a/ext/cdparanoia/Makefile.am +++ b/ext/cdparanoia/Makefile.am @@ -1,7 +1,7 @@ plugin_LTLIBRARIES = libgstcdparanoia.la libgstcdparanoia_la_SOURCES = gstcdparanoiasrc.c -libgstcdparanoia_la_CFLAGS = $(GST_CFLAGS) +libgstcdparanoia_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstcdparanoia_la_LIBADD = \ $(top_builddir)/gst-libs/gst/cdda/libgstcdda-$(GST_MAJORMINOR).la \ $(GST_BASE_LIBS) \ diff --git a/ext/gnomevfs/Makefile.am b/ext/gnomevfs/Makefile.am index 6ca9ac2..cfad81d 100644 --- a/ext/gnomevfs/Makefile.am +++ b/ext/gnomevfs/Makefile.am @@ -6,7 +6,7 @@ libgstgnomevfs_la_SOURCES = \ gstgnomevfssrc.c \ gstgnomevfsuri.c -libgstgnomevfs_la_CFLAGS = $(GST_CFLAGS) $(GNOME_VFS_CFLAGS) +libgstgnomevfs_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GNOME_VFS_CFLAGS) libgstgnomevfs_la_LIBADD = $(GST_BASE_LIBS) $(GNOME_VFS_LIBS) libgstgnomevfs_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/ext/libvisual/Makefile.am b/ext/libvisual/Makefile.am index 5a4a87a..d2b5ca8 100644 --- a/ext/libvisual/Makefile.am +++ b/ext/libvisual/Makefile.am @@ -1,6 +1,6 @@ plugin_LTLIBRARIES = libgstlibvisual.la libgstlibvisual_la_SOURCES = visual.c -libgstlibvisual_la_CFLAGS = $(GST_CFLAGS) $(LIBVISUAL_CFLAGS) +libgstlibvisual_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(LIBVISUAL_CFLAGS) libgstlibvisual_la_LIBADD = $(GST_BASE_LIBS) $(LIBVISUAL_LIBS) libgstlibvisual_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/ext/ogg/Makefile.am b/ext/ogg/Makefile.am index fcf1048..abccd34 100644 --- a/ext/ogg/Makefile.am +++ b/ext/ogg/Makefile.am @@ -8,7 +8,7 @@ libgstogg_la_SOURCES = \ gstoggaviparse.c \ gstoggparse.c -libgstogg_la_CFLAGS = $(GST_CFLAGS) $(OGG_CFLAGS) +libgstogg_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(OGG_CFLAGS) libgstogg_la_LIBADD = \ $(top_builddir)/gst-libs/gst/riff/libgstriff-$(GST_MAJORMINOR).la \ $(top_builddir)/gst-libs/gst/tag/libgsttag-$(GST_MAJORMINOR).la \ diff --git a/ext/theora/Makefile.am b/ext/theora/Makefile.am index 92ae7eb..23b0efd 100644 --- a/ext/theora/Makefile.am +++ b/ext/theora/Makefile.am @@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgsttheora.la noinst_HEADERS = gsttheoraenc.h gsttheoradec.h gsttheoraparse.h libgsttheora_la_SOURCES = theora.c theoraenc.c theoradec.c theoraparse.c -libgsttheora_la_CFLAGS = $(GST_CFLAGS) $(THEORA_CFLAGS) +libgsttheora_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(THEORA_CFLAGS) libgsttheora_la_LIBADD = \ $(top_builddir)/gst-libs/gst/tag/libgsttag-$(GST_MAJORMINOR).la \ $(GST_LIBS) \ diff --git a/ext/vorbis/Makefile.am b/ext/vorbis/Makefile.am index 0665512..64b16a7 100644 --- a/ext/vorbis/Makefile.am +++ b/ext/vorbis/Makefile.am @@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstvorbis.la libgstvorbis_la_SOURCES = vorbis.c \ vorbisdec.c vorbisenc.c vorbisparse.c vorbistag.c -libgstvorbis_la_CFLAGS = $(GST_CFLAGS) $(VORBIS_CFLAGS) +libgstvorbis_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(VORBIS_CFLAGS) ## AM_PATH_VORBIS also sets VORBISENC_LIBS libgstvorbis_la_LIBADD = \ $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \ diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index 6a03803..c05440a 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -44,13 +44,13 @@ libgstaudio_@GST_MAJORMINOR@include_HEADERS = \ nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS = \ multichannel-enumtypes.h -libgstaudio_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) +libgstaudio_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstaudio_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) \ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) libgstaudiofilterexample_la_SOURCES = gstaudiofilterexample.c -libgstaudiofilterexample_la_CFLAGS = $(GST_CFLAGS) +libgstaudiofilterexample_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstaudiofilterexample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) gstaudiofilterexample.c: $(srcdir)/make_filter $(srcdir)/gstaudiofiltertemplate.c @@ -58,7 +58,7 @@ gstaudiofilterexample.c: $(srcdir)/make_filter $(srcdir)/gstaudiofiltertemplate. noinst_PROGRAMS = testchannels testchannels_SOURCES = testchannels.c -testchannels_CFLAGS = $(GST_CFLAGS) +testchannels_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) testchannels_LDADD = $(GST_LIBS) include $(top_srcdir)/common/glib-gen.mak diff --git a/gst-libs/gst/cdda/Makefile.am b/gst-libs/gst/cdda/Makefile.am index 9f03e79..0730bfd 100644 --- a/gst-libs/gst/cdda/Makefile.am +++ b/gst-libs/gst/cdda/Makefile.am @@ -13,5 +13,5 @@ libgstcdda_@GST_MAJORMINOR@include_HEADERS = \ libgstcdda_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \ $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la -libgstcdda_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) +libgstcdda_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstcdda_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am index b78881b..4d82097 100644 --- a/gst-libs/gst/interfaces/Makefile.am +++ b/gst-libs/gst/interfaces/Makefile.am @@ -55,7 +55,7 @@ nodist_libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = \ $(built_sources) \ interfaces-marshal.h -libgstinterfaces_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) +libgstinterfaces_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstinterfaces_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) libgstinterfaces_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am index b1a1172..39ceeaa 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am @@ -13,5 +13,5 @@ libgstriff_@GST_MAJORMINOR@include_HEADERS = \ libgstriff_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) \ $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la -libgstriff_@GST_MAJORMINOR@_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) +libgstriff_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstriff_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am index 944b574..eda474c 100644 --- a/gst-libs/gst/rtp/Makefile.am +++ b/gst-libs/gst/rtp/Makefile.am @@ -12,6 +12,6 @@ libgstrtp_@GST_MAJORMINOR@_la_SOURCES = gstrtpbuffer.c \ gstbasertppayload.c \ gstbasertpdepayload.c -libgstrtp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) +libgstrtp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstrtp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) libgstrtp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am index e1039fb..d23e5de 100644 --- a/gst-libs/gst/tag/Makefile.am +++ b/gst-libs/gst/tag/Makefile.am @@ -7,7 +7,7 @@ libgsttaginclude_HEADERS = \ lib_LTLIBRARIES = libgsttag-@GST_MAJORMINOR@.la libgsttag_@GST_MAJORMINOR@_la_SOURCES = gstvorbistag.c gstid3tag.c tags.c -libgsttag_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) +libgsttag_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgsttag_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) libgsttag_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) diff --git a/gst/adder/Makefile.am b/gst/adder/Makefile.am index 54b043d..12393c7 100644 --- a/gst/adder/Makefile.am +++ b/gst/adder/Makefile.am @@ -1,7 +1,7 @@ plugin_LTLIBRARIES = libgstadder.la libgstadder_la_SOURCES = gstadder.c -libgstadder_la_CFLAGS = $(GST_CFLAGS) +libgstadder_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstadder_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstadder_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) diff --git a/gst/audioconvert/Makefile.am b/gst/audioconvert/Makefile.am index 57ea819..d608b30 100644 --- a/gst/audioconvert/Makefile.am +++ b/gst/audioconvert/Makefile.am @@ -6,7 +6,7 @@ libgstaudioconvert_la_SOURCES = \ gstchannelmix.c \ plugin.c -libgstaudioconvert_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) +libgstaudioconvert_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstaudioconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstaudioconvert_la_LIBADD = \ $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ diff --git a/gst/audiorate/Makefile.am b/gst/audiorate/Makefile.am index f9acbf4..df92648 100644 --- a/gst/audiorate/Makefile.am +++ b/gst/audiorate/Makefile.am @@ -1,6 +1,6 @@ plugin_LTLIBRARIES = libgstaudiorate.la libgstaudiorate_la_SOURCES = gstaudiorate.c -libgstaudiorate_la_CFLAGS = $(GST_CFLAGS) +libgstaudiorate_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstaudiorate_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstaudiorate_la_LIBADD = $(GST_LIBS) diff --git a/gst/audioresample/Makefile.am b/gst/audioresample/Makefile.am index 10b5377..f9c4c52 100644 --- a/gst/audioresample/Makefile.am +++ b/gst/audioresample/Makefile.am @@ -16,6 +16,6 @@ noinst_HEADERS = \ buffer.h libgstaudioresample_la_SOURCES = gstaudioresample.c $(resample_SOURCES) -libgstaudioresample_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBOIL_CFLAGS) +libgstaudioresample_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBOIL_CFLAGS) libgstaudioresample_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBOIL_LIBS) libgstaudioresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am index 161e1f1..e154b94 100644 --- a/gst/playback/Makefile.am +++ b/gst/playback/Makefile.am @@ -16,7 +16,7 @@ libgstplaybin_la_SOURCES = \ gststreamselector.c nodist_libgstplaybin_la_SOURCES = $(built_sources) -libgstplaybin_la_CFLAGS = $(GST_CFLAGS) +libgstplaybin_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstplaybin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstplaybin_la_LIBADD = $(GST_LIBS) diff --git a/gst/tcp/Makefile.am b/gst/tcp/Makefile.am index 6a3f83d..02100c0 100644 --- a/gst/tcp/Makefile.am +++ b/gst/tcp/Makefile.am @@ -24,7 +24,7 @@ nodist_libgsttcp_la_SOURCES = \ $(built_sources) # remove ENABLE_NEW when dataprotocol is stable -libgsttcp_la_CFLAGS = $(GST_CFLAGS) -DGST_ENABLE_NEW +libgsttcp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -DGST_ENABLE_NEW libgsttcp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgsttcp_la_LIBADD = $(GST_BASE_LIBS) $(GST_GDP_LIBS) $(GST_LIBS) diff --git a/gst/videoscale/Makefile.am b/gst/videoscale/Makefile.am index f4d4553..10a62bb 100644 --- a/gst/videoscale/Makefile.am +++ b/gst/videoscale/Makefile.am @@ -6,7 +6,7 @@ libgstvideoscale_la_SOURCES = \ vs_scanline.c \ vs_4tap.c -libgstvideoscale_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(LIBOIL_CFLAGS) +libgstvideoscale_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBOIL_CFLAGS) libgstvideoscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvideoscale_la_LIBADD = \ $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \ diff --git a/gst/volume/Makefile.am b/gst/volume/Makefile.am index 50a9603..cfd221d 100644 --- a/gst/volume/Makefile.am +++ b/gst/volume/Makefile.am @@ -1,13 +1,13 @@ plugin_LTLIBRARIES = libgstvolume.la libgstvolume_la_SOURCES = gstvolume.c -libgstvolume_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(LIBOIL_CFLAGS) +libgstvolume_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(LIBOIL_CFLAGS) libgstvolume_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvolume_la_LIBADD = \ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \ $(GST_BASE_LIBS) \ - $(GST_LIBS) \ $(GST_CONTROLLER_LIBS) \ + $(GST_LIBS) \ $(LIBOIL_LIBS) noinst_HEADERS = gstvolume.h diff --git a/sys/ximage/Makefile.am b/sys/ximage/Makefile.am index 6881de4..01280fc 100644 --- a/sys/ximage/Makefile.am +++ b/sys/ximage/Makefile.am @@ -1,7 +1,7 @@ plugin_LTLIBRARIES = libgstximagesink.la libgstximagesink_la_SOURCES = ximagesink.c ximage.c -libgstximagesink_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) +libgstximagesink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) libgstximagesink_la_LIBADD = \ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \ $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \ diff --git a/sys/xvimage/Makefile.am b/sys/xvimage/Makefile.am index 3edddb6..69e1907 100644 --- a/sys/xvimage/Makefile.am +++ b/sys/xvimage/Makefile.am @@ -1,7 +1,7 @@ plugin_LTLIBRARIES = libgstxvimagesink.la libgstxvimagesink_la_SOURCES = xvimagesink.c -libgstxvimagesink_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) +libgstxvimagesink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) libgstxvimagesink_la_LIBADD = \ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \ $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \ diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am index a126624..255a77d 100644 --- a/tests/icles/Makefile.am +++ b/tests/icles/Makefile.am @@ -2,7 +2,7 @@ if USE_X X_TESTS = stress-xoverlay stress_xoverlay_SOURCES = stress-xoverlay.c -stress_xoverlay_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) +stress_xoverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) stress_xoverlay_LDFLAGS = $(GST_LIBS) $(X_LIBS) stress_xoverlay_LDADD = \ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la