From efb938bd9ac8c648abff1222980a14d5ffe7d269 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sun, 27 Nov 2005 16:18:50 +0000 Subject: [PATCH] configure.ac: added GST_LIB_LDFLAGS and GST_ALL_LDFLAGS Original commit message from CVS: * configure.ac: added GST_LIB_LDFLAGS and GST_ALL_LDFLAGS * gst-libs/Makefile.am: * gst-libs/gst/audio/Makefile.am: * gst-libs/gst/interfaces/Makefile.am: * gst-libs/gst/net/Makefile.am: * gst-libs/gst/riff/Makefile.am: * gst-libs/gst/rtp/Makefile.am: * gst-libs/gst/tag/Makefile.am: * gst-libs/gst/video/Makefile.am: and use them --- ChangeLog | 14 ++++++++++++++ configure.ac | 20 ++++++++++++++++---- gst-libs/Makefile.am | 4 +--- gst-libs/gst/audio/Makefile.am | 6 +++--- gst-libs/gst/interfaces/Makefile.am | 2 +- gst-libs/gst/net/Makefile.am | 2 +- gst-libs/gst/netbuffer/Makefile.am | 2 +- gst-libs/gst/riff/Makefile.am | 2 +- gst-libs/gst/rtp/Makefile.am | 2 +- gst-libs/gst/tag/Makefile.am | 2 +- gst-libs/gst/video/Makefile.am | 2 +- 11 files changed, 41 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index d60df47..cab0e2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2005-11-27 Thomas Vander Stichele + + * configure.ac: + added GST_LIB_LDFLAGS and GST_ALL_LDFLAGS + * gst-libs/Makefile.am: + * gst-libs/gst/audio/Makefile.am: + * gst-libs/gst/interfaces/Makefile.am: + * gst-libs/gst/net/Makefile.am: + * gst-libs/gst/riff/Makefile.am: + * gst-libs/gst/rtp/Makefile.am: + * gst-libs/gst/tag/Makefile.am: + * gst-libs/gst/video/Makefile.am: + and use them + 2005-11-27 Julien MOUTTE * docs/libs/tmpl/gstcolorbalance.sgml: diff --git a/configure.ac b/configure.ac index 0196096..f12b74a 100644 --- a/configure.ac +++ b/configure.ac @@ -521,7 +521,9 @@ dnl *** finalize CFLAGS, LDFLAGS, LIBS dnl Overview: dnl GST_OPTION_CFLAGS: common flags for profiling, debugging, errors, ... -dnl GST_*: flags shared by all built objects +dnl GST_*: flags shared by built objects to link against GStreamer +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 dnl GST_PLUGIN_LDFLAGS: flags to be used for all plugins @@ -544,14 +546,25 @@ AC_SUBST(GST_LT_LDFLAGS) 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 ERROR_CFLAGS, but overridable +dnl add GST_OPTION_CFLAGS, but overridable GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS \$(GST_OPTION_CFLAGS)" AC_SUBST(GST_CFLAGS) AC_SUBST(GST_LIBS) +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 +GST_ALL_LDFLAGS="-no-undefined" +AC_SUBST(GST_ALL_LDFLAGS) + +dnl GST_LIB_LDFLAGS +dnl linker flags shared by all libraries +dnl LDFLAGS modifier defining exported symbols from built libraries +GST_LIB_LDFLAGS="-export-symbols-regex [_]*\(gst_\|Gst\|GST_\).*" +AC_SUBST(GST_LIB_LDFLAGS) + dnl this really should only contain flags, not libs - they get added before dnl whatevertarget_LIBS and -L flags here affect the rest of the linking -GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' -no-undefined" +GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $GST_ALL_LDFLAGS" AC_SUBST(GST_PLUGIN_LDFLAGS) dnl *** output files *** @@ -596,7 +609,6 @@ gst-libs/gst/riff/Makefile gst-libs/gst/rtp/Makefile gst-libs/gst/tag/Makefile gst-libs/gst/video/Makefile -gst-libs/ext/Makefile examples/seeking/Makefile examples/Makefile tools/Makefile diff --git a/gst-libs/Makefile.am b/gst-libs/Makefile.am index 4a2c7b6..062cb55 100644 --- a/gst-libs/Makefile.am +++ b/gst-libs/Makefile.am @@ -1,3 +1 @@ -SUBDIRS = gst ext - -DIST_SUBDIRS = gst ext +SUBDIRS = gst diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index c958b7c..7e1bdd1 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -42,12 +42,12 @@ nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS = \ libgstaudio_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) libgstaudio_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) -libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LT_LDFLAGS) +libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) libgstaudiofilter_@GST_MAJORMINOR@_la_SOURCES = gstaudiofilter.c gstaudiofilter.h libgstaudiofilter_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) libgstaudiofilter_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) -libgstaudiofilter_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LT_LDFLAGS) +libgstaudiofilter_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) libgstaudiofilterexample_la_SOURCES = gstaudiofilterexample.c libgstaudiofilterexample_la_CFLAGS = $(GST_CFLAGS) @@ -59,6 +59,6 @@ gstaudiofilterexample.c: $(srcdir)/make_filter $(srcdir)/gstaudiofiltertemplate. noinst_PROGRAMS = testchannels testchannels_SOURCES = testchannels.c testchannels_CFLAGS = $(GST_CFLAGS) -testchannels_LDFLAGS = $(GST_LIBS) +testchannels_LDADD = $(GST_LIBS) include $(top_srcdir)/common/glib-gen.mak diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am index 41016ca..7ace1e9 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 = \ libgstinterfaces_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) libgstinterfaces_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) -libgstinterfaces_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LT_LDFLAGS) +libgstinterfaces_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) BUILT_SOURCES = \ $(built_sources) \ diff --git a/gst-libs/gst/net/Makefile.am b/gst-libs/gst/net/Makefile.am index beba9b7..0822f9a 100644 --- a/gst-libs/gst/net/Makefile.am +++ b/gst-libs/gst/net/Makefile.am @@ -8,4 +8,4 @@ libgstnet_@GST_MAJORMINOR@_la_SOURCES = gstnetbuffer.c # FIXME: what is that include doing here ??? libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags libgstnet_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) -libgstnet_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LT_LDFLAGS) +libgstnet_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) diff --git a/gst-libs/gst/netbuffer/Makefile.am b/gst-libs/gst/netbuffer/Makefile.am index beba9b7..0822f9a 100644 --- a/gst-libs/gst/netbuffer/Makefile.am +++ b/gst-libs/gst/netbuffer/Makefile.am @@ -8,4 +8,4 @@ libgstnet_@GST_MAJORMINOR@_la_SOURCES = gstnetbuffer.c # FIXME: what is that include doing here ??? libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags libgstnet_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) -libgstnet_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LT_LDFLAGS) +libgstnet_@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 f5694cc..67f8253 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am @@ -13,4 +13,4 @@ libgstriff_@GST_MAJORMINOR@include_HEADERS = \ libgstriff_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) libgstriff_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -libgstriff_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LT_LDFLAGS) +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 de79cf7..77d8d68 100644 --- a/gst-libs/gst/rtp/Makefile.am +++ b/gst-libs/gst/rtp/Makefile.am @@ -13,4 +13,4 @@ libgstrtp_@GST_MAJORMINOR@_la_SOURCES = gstrtpbuffer.c \ # FIXME: what is that include doing here ? libgstrtp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags libgstrtp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) -libgstrtp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LT_LDFLAGS) +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 0d003de..8e62e5a 100644 --- a/gst-libs/gst/tag/Makefile.am +++ b/gst-libs/gst/tag/Makefile.am @@ -9,6 +9,6 @@ lib_LTLIBRARIES = libgsttag-@GST_MAJORMINOR@.la libgsttag_@GST_MAJORMINOR@_la_SOURCES = gstvorbistag.c gstid3tag.c libgsttag_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags libgsttag_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) -libgsttag_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LT_LDFLAGS) +libgsttag_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) noinst_HEADERS = gsttageditingprivate.h diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am index cf8fa21..1094060 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am @@ -7,4 +7,4 @@ libgstvideoinclude_HEADERS = video.h videosink.h libgstvideo_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) libgstvideo_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) -libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LT_LDFLAGS) +libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) -- 2.7.4