Menu
▾
▴
[gst-cvs] thomasvs gst-plugins-base: gst-plugins-base/ gst-plugins-base/gst-libs/ gst-plugins-base/gst-libs/gst/audio/ gst-plugins-base/gst-libs/gst/interfaces/ gst-plugins-base/gst-libs/gst/net/ gst-plugins-base/gst-libs/gst/riff/ gst-plugins-base/gst-libs/gst/rtp/
|
From: <tho...@fr...> - 2005-11-27 16:19:04
|
CVS Root: /cvs/gstreamer
Module: gst-plugins-base
Changes by: thomasvs
Date: Sun Nov 27 2005 08:19:02 PST
Log message:
* 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
Modified files:
. : ChangeLog configure.ac
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
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.2154&r2=1.2155
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/configure.ac.diff?r1=1.593&r2=1.594
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/Makefile.am.diff?r1=1.5&r2=1.6
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/audio/Makefile.am.diff?r1=1.26&r2=1.27
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/interfaces/Makefile.am.diff?r1=1.3&r2=1.4
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/net/Makefile.am.diff?r1=1.5&r2=1.6
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/riff/Makefile.am.diff?r1=1.19&r2=1.20
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/rtp/Makefile.am.diff?r1=1.3&r2=1.4
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/tag/Makefile.am.diff?r1=1.7&r2=1.8
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/video/Makefile.am.diff?r1=1.14&r2=1.15
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v
retrieving revision 1.2154
retrieving revision 1.2155
diff -u -d -r1.2154 -r1.2155
--- ChangeLog 27 Nov 2005 11:41:54 -0000 1.2154
+++ ChangeLog 27 Nov 2005 16:18:48 -0000 1.2155
@@ -1,3 +1,17 @@
+2005-11-27 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * 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 <ju...@mo...>
* docs/libs/tmpl/gstcolorbalance.sgml:
Index: configure.ac
RCS file: /cvs/gstreamer/gst-plugins-base/configure.ac,v
retrieving revision 1.593
retrieving revision 1.594
diff -u -d -r1.593 -r1.594
--- configure.ac 23 Nov 2005 20:04:59 -0000 1.593
+++ configure.ac 27 Nov 2005 16:18:48 -0000 1.594
@@ -521,7 +521,9 @@
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 @@
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/rtp/Makefile
gst-libs/gst/tag/Makefile
gst-libs/gst/video/Makefile
-gst-libs/ext/Makefile
examples/seeking/Makefile
examples/Makefile
tools/Makefile
Index: Makefile.am
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am 7 Mar 2004 20:51:10 -0000 1.5
+++ Makefile.am 27 Nov 2005 16:18:48 -0000 1.6
@@ -1,3 +1 @@
-SUBDIRS = gst ext
-
-DIST_SUBDIRS = gst ext
+SUBDIRS = gst
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/interfaces/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am 16 Oct 2005 17:50:44 -0000 1.3
+++ Makefile.am 27 Nov 2005 16:18:49 -0000 1.4
@@ -55,7 +55,7 @@
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) \
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/audio/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Makefile.am 16 Oct 2005 13:54:42 -0000 1.26
+++ Makefile.am 27 Nov 2005 16:18:48 -0000 1.27
@@ -42,12 +42,12 @@
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 @@
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
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/net/Makefile.am,v
--- Makefile.am 16 Oct 2005 13:54:42 -0000 1.5
+++ Makefile.am 27 Nov 2005 16:18:49 -0000 1.6
@@ -8,4 +8,4 @@
# 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)
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/riff/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile.am 16 Oct 2005 13:54:42 -0000 1.19
+++ Makefile.am 27 Nov 2005 16:18:49 -0000 1.20
@@ -13,4 +13,4 @@
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)
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/rtp/Makefile.am,v
--- Makefile.am 16 Oct 2005 13:54:42 -0000 1.3
# 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)
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/tag/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am 22 Nov 2005 11:33:07 -0000 1.7
+++ Makefile.am 27 Nov 2005 16:18:49 -0000 1.8
@@ -9,6 +9,6 @@
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
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/video/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.am 16 Oct 2005 13:54:43 -0000 1.14
+++ Makefile.am 27 Nov 2005 16:18:50 -0000 1.15
@@ -7,4 +7,4 @@
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)
|