diff options
author | Thomas Vander Stichele <thomas@apestaart.org> | 2005-11-27 17:02:53 +0000 |
---|---|---|
committer | Thomas Vander Stichele <thomas@apestaart.org> | 2005-11-27 17:02:53 +0000 |
commit | b9d371913c66db1e4a430fdb3ebae449532563db (patch) | |
tree | ffb9644c71e940b821a59b9185ba6e7c7207bc8b | |
parent | 9b0f1d1c694936fea8b0575c973291e2b842ce66 (diff) |
configure.ac: fix up GST_PLUGIN_LDFLAGS
Original commit message from CVS:
* configure.ac:
fix up GST_PLUGIN_LDFLAGS
* gst/rtsp/rtspconnection.c:
fix includes (see #317043)
* gst/videofilter/Makefile.am:
stop installing this library
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | configure.ac | 9 | ||||
-rw-r--r-- | gst/rtsp/rtspconnection.c | 5 | ||||
-rw-r--r-- | gst/videofilter/Makefile.am | 4 |
4 files changed, 22 insertions, 5 deletions
@@ -1,3 +1,12 @@ +2005-11-27 Thomas Vander Stichele <thomas at apestaart dot org> + + * configure.ac: + fix up GST_PLUGIN_LDFLAGS + * gst/rtsp/rtspconnection.c: + fix includes (see #317043) + * gst/videofilter/Makefile.am: + stop installing this library + 2005-11-26 Edward Hervey <edward@fluendo.com> * ext/dv/gstdvdec.c: (gst_dvdec_sink_setcaps): diff --git a/configure.ac b/configure.ac index 7090b50b..a7333681 100644 --- a/configure.ac +++ b/configure.ac @@ -478,6 +478,8 @@ 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_ALL_LDFLAGS: linker flags shared by all +dnl GST_LIB_LDFLAGS: not needed, we don't install libraries dnl GST_LT_LDFLAGS: library versioning of our libraries dnl GST_PLUGIN_LDFLAGS: flags to be used for all plugins @@ -505,9 +507,14 @@ GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_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 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 *** diff --git a/gst/rtsp/rtspconnection.c b/gst/rtsp/rtspconnection.c index 81be1a85..248a4a2b 100644 --- a/gst/rtsp/rtspconnection.c +++ b/gst/rtsp/rtspconnection.c @@ -17,13 +17,14 @@ * Boston, MA 02111-1307, USA. */ -#include <arpa/inet.h> -#include <netdb.h> #include <stdio.h> #include <errno.h> #include <unistd.h> #include <stdlib.h> #include <string.h> +#include <netdb.h> +#include <arpa/inet.h> +#include <sys/socket.h> #include "rtspconnection.h" diff --git a/gst/videofilter/Makefile.am b/gst/videofilter/Makefile.am index 17b3c3fa..3bfcbce6 100644 --- a/gst/videofilter/Makefile.am +++ b/gst/videofilter/Makefile.am @@ -1,4 +1,4 @@ -lib_LTLIBRARIES = libgstvideofilter-@GST_MAJORMINOR@.la +noinst_LTLIBRARIES = libgstvideofilter-@GST_MAJORMINOR@.la # noinst_LTLIBRARIES = libgstvideoexample.la plugin_LTLIBRARIES = libgstvideoflip.la @@ -9,7 +9,7 @@ CLEANFILES = gstvideoexample.c libgstvideofilter_@GST_MAJORMINOR@_la_SOURCES = gstvideofilter.c gstvideofilter.h libgstvideofilter_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -libgstvideofilter_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIBS) +libgstvideofilter_@GST_MAJORMINOR@_la_LIBS = $(GST_LIBS) # libgstvideoexample_la_SOURCES = gstvideoexample.c # libgstvideoexample_la_CFLAGS = $(GST_CFLAGS) |