diff --git a/ChangeLog b/ChangeLog index 44f748550d..d4c77f38e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-11-27 Thomas Vander Stichele + + * configure.ac: + * gst/Makefile.am: + * gst/base/Makefile.am: + * gst/check/Makefile.am: + * gst/elements/Makefile.am: + * gst/net/Makefile.am: + update LDFLAGS use some more + 2005-11-27 Thomas Vander Stichele * common/m4/gst-doc.m4: diff --git a/configure.ac b/configure.ac index 383629c483..0b8f5d3f7a 100644 --- a/configure.ac +++ b/configure.ac @@ -400,9 +400,10 @@ GST_SET_LEVEL_DEFAULT($GST_CVS) dnl *** finalize CFLAGS, LDFLAGS, LIBS dnl Overview: -dnl GST_OPTION_CFLAGS: common flags for profiling, debugging, errors, ... -dnl GST_ALL_*: flags shared by all built objects -dnl GST_OBJ_*: additional flags to link to the core library +dnl GST_OPTION_CFLAGS: common cflags for profiling, debugging, errors, ... +dnl GST_ALL_*: vars shared by all built objects +dnl GST_LIB_LDFLAGS: additional linker flags for all libaries +dnl GST_OBJ_*: additional vars to link to the core library dnl include GST_ALL_* dnl GST_LT_LDFLAGS: library versioning of our libraries dnl GST_PLUGIN_LDFLAGS: flags to be used for all plugins @@ -427,32 +428,36 @@ dnl - XML needs to be added because xmlPtr is used in core 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 LIBS: XML doesn't need to be added because we don't explicitly use symbols -dnl from LibXML +dnl from LibXML except for in the core library GST_ALL_CFLAGS="-I\$(top_srcdir)/libs -I\$(top_srcdir) -I\$(top_builddir) $GLIB_CFLAGS $XML_CFLAGS \$(GST_OPTION_CFLAGS)" dnl FIXME: check if LTLIBINTL is needed everywhere dnl I presume it is given that it contains the symbols that _() stuff maps to GST_ALL_LIBS="$GLIB_LIBS $LTLIBINTL" -dnl LDFLAGS modifier defining exported symbols from built shared objects -EXPORT_LDFLAGS="-export-symbols-regex [_]*\(gst_\|Gst\|GST_\).*" 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="$EXPORT_LDFLAGS -no-undefined" +GST_ALL_LDFLAGS="-no-undefined" + AC_SUBST(GST_ALL_CFLAGS) AC_SUBST(GST_ALL_LIBS) 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 GST_OBJ_* dnl default vars for all internal objects built on libgstreamer +dnl includes GST_ALL_* GST_OBJ_CFLAGS="\$(GST_ALL_CFLAGS)" GST_OBJ_LIBS="\$(top_builddir)/gst/libgstreamer-$GST_MAJORMINOR.la \$(GST_ALL_LIBS)" -GST_OBJ_LDFLAGS="$GST_LT_LDFLAGS $GST_ALL_LDFLAGS" AC_SUBST(GST_OBJ_CFLAGS) AC_SUBST(GST_OBJ_LIBS) -AC_SUBST(GST_OBJ_LDFLAGS) dnl GST_PLUGIN_LDFLAGS -dnl LDFLAGS for plugins; include GST_ALL_LDFLAGS -GST_PLUGIN_LDFLAGS="-module -avoid-version $GST_ALL_LDFLAGS" +dnl LDFLAGS for plugins; includes GST_ALL_LDFLAGS +GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $GST_ALL_LDFLAGS" AC_SUBST(GST_PLUGIN_LDFLAGS, "$GST_PLUGIN_LDFLAGS") dnl ################################################## diff --git a/gst/Makefile.am b/gst/Makefile.am index c97a464ed5..b019791d4d 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -157,7 +157,7 @@ libgstreamer_@GST_MAJORMINOR@_la_LIBADD = \ libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS = \ $(GST_LT_LDFLAGS) \ - $(GST_ALL_LDFLAGS) + $(GST_LIB_LDFLAGS) libgstreamer_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst diff --git a/gst/base/Makefile.am b/gst/base/Makefile.am index 79c2564969..d0df11dc46 100644 --- a/gst/base/Makefile.am +++ b/gst/base/Makefile.am @@ -13,7 +13,7 @@ libgstbase_@GST_MAJORMINOR@_la_SOURCES = \ libgstbase_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) -libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_OBJ_LDFLAGS) +libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) libgstbase_@GST_MAJORMINOR@includedir = \ $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/base diff --git a/gst/check/Makefile.am b/gst/check/Makefile.am index 72dd12449f..a392c9ffe8 100644 --- a/gst/check/Makefile.am +++ b/gst/check/Makefile.am @@ -9,7 +9,7 @@ libgstcheck_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) $(CHECK_CFLAGS) libgstcheck_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) $(CHECK_LIBS) \ ../libgstreamer-@GST_MAJORMINOR@.la libgstcheck_@GST_MAJORMINOR@_la_LDFLAGS = \ - -no-undefined +libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) libgstcheck_@GST_MAJORMINOR@includedir = \ $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/check diff --git a/gst/elements/Makefile.am b/gst/elements/Makefile.am index d6e639b537..13f2331feb 100644 --- a/gst/elements/Makefile.am +++ b/gst/elements/Makefile.am @@ -1,5 +1,5 @@ # FIXME: -# need to get gstbufferstore.[ch] into its own lib, preferrably +# need to get gstbufferstore.[ch] into its own lib, preferably # libs/gst/bufferstore # This requires building libs/gst before this dir, which we currently don't # do. diff --git a/gst/net/Makefile.am b/gst/net/Makefile.am index 62f1ebffe8..55137e83a7 100644 --- a/gst/net/Makefile.am +++ b/gst/net/Makefile.am @@ -16,4 +16,5 @@ libgstnet_tempname_@GST_MAJORMINOR@_la_SOURCES = \ libgstnet_tempname_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) libgstnet_tempname_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) -libgstnet_tempname_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_OBJ_LDFLAGS) +libgstnet_tempname_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) + diff --git a/libs/gst/base/Makefile.am b/libs/gst/base/Makefile.am index 79c2564969..d0df11dc46 100644 --- a/libs/gst/base/Makefile.am +++ b/libs/gst/base/Makefile.am @@ -13,7 +13,7 @@ libgstbase_@GST_MAJORMINOR@_la_SOURCES = \ libgstbase_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) -libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_OBJ_LDFLAGS) +libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) libgstbase_@GST_MAJORMINOR@includedir = \ $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/base diff --git a/libs/gst/check/Makefile.am b/libs/gst/check/Makefile.am index 72dd12449f..a392c9ffe8 100644 --- a/libs/gst/check/Makefile.am +++ b/libs/gst/check/Makefile.am @@ -9,7 +9,7 @@ libgstcheck_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) $(CHECK_CFLAGS) libgstcheck_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) $(CHECK_LIBS) \ ../libgstreamer-@GST_MAJORMINOR@.la libgstcheck_@GST_MAJORMINOR@_la_LDFLAGS = \ - -no-undefined +libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) libgstcheck_@GST_MAJORMINOR@includedir = \ $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/check diff --git a/libs/gst/net/Makefile.am b/libs/gst/net/Makefile.am index 62f1ebffe8..55137e83a7 100644 --- a/libs/gst/net/Makefile.am +++ b/libs/gst/net/Makefile.am @@ -16,4 +16,5 @@ libgstnet_tempname_@GST_MAJORMINOR@_la_SOURCES = \ libgstnet_tempname_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) libgstnet_tempname_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) -libgstnet_tempname_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_OBJ_LDFLAGS) +libgstnet_tempname_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) + diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am index d6e639b537..13f2331feb 100644 --- a/plugins/elements/Makefile.am +++ b/plugins/elements/Makefile.am @@ -1,5 +1,5 @@ # FIXME: -# need to get gstbufferstore.[ch] into its own lib, preferrably +# need to get gstbufferstore.[ch] into its own lib, preferably # libs/gst/bufferstore # This requires building libs/gst before this dir, which we currently don't # do.