diff options
author | Loïc Minier <lool+gnome@via.ecp.fr> | 2007-02-24 22:57:49 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.net> | 2007-02-24 22:57:49 +0000 |
commit | 682312a29687e88e388e61e7aa9c6479c0ed8b3a (patch) | |
tree | e30ffb66cb56c61a96817cf5ed358f0e180fefbf | |
parent | e854c41c2f20fcf0ee85c326e801e1030864712f (diff) |
Fix build with LDFLAGS='-Wl,-z,defs' (#410997)
Original commit message from CVS:
Patch by: Loïc Minier <lool+gnome at via ecp fr>
* configure.ac:
* ext/annodex/Makefile.am:
* ext/jpeg/Makefile.am:
* ext/speex/Makefile.am:
* gst/alpha/Makefile.am:
* gst/cutter/Makefile.am:
* gst/debug/Makefile.am:
* gst/effectv/Makefile.am:
* gst/goom/Makefile.am:
* gst/level/Makefile.am:
* gst/smpte/Makefile.am:
* gst/videofilter/Makefile.am:
Fix build with LDFLAGS='-Wl,-z,defs' (#410997)
-rw-r--r-- | ChangeLog | 18 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | ext/annodex/Makefile.am | 2 | ||||
-rw-r--r-- | ext/jpeg/Makefile.am | 2 | ||||
-rw-r--r-- | ext/speex/Makefile.am | 2 | ||||
-rw-r--r-- | gst/alpha/Makefile.am | 2 | ||||
-rw-r--r-- | gst/cutter/Makefile.am | 2 | ||||
-rw-r--r-- | gst/debug/Makefile.am | 2 | ||||
-rw-r--r-- | gst/effectv/Makefile.am | 3 | ||||
-rw-r--r-- | gst/goom/Makefile.am | 2 | ||||
-rw-r--r-- | gst/level/Makefile.am | 2 | ||||
-rw-r--r-- | gst/smpte/Makefile.am | 2 | ||||
-rw-r--r-- | gst/videofilter/Makefile.am | 9 |
13 files changed, 40 insertions, 12 deletions
@@ -1,3 +1,21 @@ +2007-02-24 Tim-Philipp Müller <tim at centricular dot net> + + Patch by: Loïc Minier <lool+gnome at via ecp fr> + + * configure.ac: + * ext/annodex/Makefile.am: + * ext/jpeg/Makefile.am: + * ext/speex/Makefile.am: + * gst/alpha/Makefile.am: + * gst/cutter/Makefile.am: + * gst/debug/Makefile.am: + * gst/effectv/Makefile.am: + * gst/goom/Makefile.am: + * gst/level/Makefile.am: + * gst/smpte/Makefile.am: + * gst/videofilter/Makefile.am: + Fix build with LDFLAGS='-Wl,-z,defs' (#410997) + 2007-02-23 Jan Schmidt <thaytan@mad.scientist.com> * gst/rtsp/Makefile.am: diff --git a/configure.ac b/configure.ac index c1e28335..56550f45 100644 --- a/configure.ac +++ b/configure.ac @@ -205,6 +205,10 @@ GST_PLUGIN_DOCS([1.3],[2.1]) dnl *** checks for libraries *** +dnl check for libm, for sin() +AC_CHECK_LIBM +AC_SUBST(LIBM) + dnl *** checks for header files *** dnl check if we have ANSI C header files diff --git a/ext/annodex/Makefile.am b/ext/annodex/Makefile.am index 816e809b..fde76905 100644 --- a/ext/annodex/Makefile.am +++ b/ext/annodex/Makefile.am @@ -11,7 +11,7 @@ libgstannodex_la_SOURCES = \ libgstannodex_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) $(XML_CFLAGS) libgstannodex_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \ - $(GST_LIBS) $(XML_LIBS) + $(GST_LIBS) $(XML_LIBS) $(LIBM) libgstannodex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstannodex.h gstcmmlutils.h gstcmmltag.h gstcmmlparser.h \ diff --git a/ext/jpeg/Makefile.am b/ext/jpeg/Makefile.am index a2142cec..044c30ca 100644 --- a/ext/jpeg/Makefile.am +++ b/ext/jpeg/Makefile.am @@ -9,7 +9,7 @@ libgstjpeg_la_SOURCES = \ gstsmokedec.c libgstjpeg_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libgstjpeg_la_LIBADD = $(GST_LIBS) $(JPEG_LIBS) +libgstjpeg_la_LIBADD = $(GST_LIBS) $(JPEG_LIBS) $(LIBM) libgstjpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = \ diff --git a/ext/speex/Makefile.am b/ext/speex/Makefile.am index f90ed016..1a426ba9 100644 --- a/ext/speex/Makefile.am +++ b/ext/speex/Makefile.am @@ -10,6 +10,6 @@ libgstspeex_la_LIBADD = \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(SPEEX_LIBS) -libgstspeex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstspeex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBM) noinst_HEADERS = gstspeexenc.h gstspeexdec.h diff --git a/gst/alpha/Makefile.am b/gst/alpha/Makefile.am index fd54707b..daf0050b 100644 --- a/gst/alpha/Makefile.am +++ b/gst/alpha/Makefile.am @@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstalpha.la libgstalphacolor.la libgstalpha_la_SOURCES = gstalpha.c libgstalpha_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) -libgstalpha_la_LIBADD = $(GST_LIBS) +libgstalpha_la_LIBADD = $(GST_LIBS) $(LIBM) libgstalpha_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstalphacolor_la_SOURCES = gstalphacolor.c diff --git a/gst/cutter/Makefile.am b/gst/cutter/Makefile.am index 0d93b29d..db60f0a3 100644 --- a/gst/cutter/Makefile.am +++ b/gst/cutter/Makefile.am @@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstcutter.la libgstcutter_la_SOURCES = gstcutter.c libgstcutter_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) -libgstcutter_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) +libgstcutter_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(LIBM) libgstcutter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstcutter.h filter.func diff --git a/gst/debug/Makefile.am b/gst/debug/Makefile.am index 13f0df5b..3dff1524 100644 --- a/gst/debug/Makefile.am +++ b/gst/debug/Makefile.am @@ -23,7 +23,7 @@ libgstnavigationtest_la_SOURCES = gstnavigationtest.c libgstnavigationtest_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) libgstnavigationtest_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \ - $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(LIBM) libgstnavigationtest_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstdebug_la_SOURCES = \ diff --git a/gst/effectv/Makefile.am b/gst/effectv/Makefile.am index 40408492..ecd211a1 100644 --- a/gst/effectv/Makefile.am +++ b/gst/effectv/Makefile.am @@ -11,7 +11,8 @@ libgsteffectv_la_CFLAGS = \ libgsteffectv_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \ $(GST_BASE_LIBS) \ - $(GST_LIBS) + $(GST_LIBS) \ + $(LIBM) libgsteffectv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gsteffectv.h diff --git a/gst/goom/Makefile.am b/gst/goom/Makefile.am index ce0891fe..4f4abb76 100644 --- a/gst/goom/Makefile.am +++ b/gst/goom/Makefile.am @@ -8,7 +8,7 @@ noinst_HEADERS = gstgoom.h filters.h goom_core.h goom_tools.h graphic.h lines.h libgstgoom_la_SOURCES = gstgoom.c goom_core.c $(GOOM_FILTER_FILES) graphic.c lines.c libgstgoom_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GOOM_FILTER_CFLAGS) -libgstgoom_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) +libgstgoom_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) libgstgoom_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) EXTRA_DIST = filters.c diff --git a/gst/level/Makefile.am b/gst/level/Makefile.am index 01e94cff..1399512a 100644 --- a/gst/level/Makefile.am +++ b/gst/level/Makefile.am @@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstlevel.la libgstlevel_la_SOURCES = gstlevel.c libgstlevel_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) -libgstlevel_la_LIBADD = $(GST_BASE_LIBS) +libgstlevel_la_LIBADD = $(GST_BASE_LIBS) $(LIBM) libgstlevel_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstlevel.h diff --git a/gst/smpte/Makefile.am b/gst/smpte/Makefile.am index 4a5d58af..3ecc9152 100644 --- a/gst/smpte/Makefile.am +++ b/gst/smpte/Makefile.am @@ -5,5 +5,5 @@ libgstsmpte_la_SOURCES = gstsmpte.c gstmask.c barboxwipes.c paint.c noinst_HEADERS = gstsmpte.h gstmask.h paint.h libgstsmpte_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libgstsmpte_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) +libgstsmpte_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(LIBM) libgstsmpte_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/videofilter/Makefile.am b/gst/videofilter/Makefile.am index 297ae82d..f6f4e9b8 100644 --- a/gst/videofilter/Makefile.am +++ b/gst/videofilter/Makefile.am @@ -20,8 +20,13 @@ libgstvideoflip_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvideobalance_la_SOURCES = gstvideobalance.c libgstvideobalance_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) -libgstvideobalance_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \ - -lgstinterfaces-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS) +libgstvideobalance_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) \ + -lgstvideo-@GST_MAJORMINOR@ \ + -lgstinterfaces-@GST_MAJORMINOR@ \ + $(GST_BASE_LIBS) \ + $(GST_LIBS) \ + $(LIBM) libgstvideobalance_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) # libgstgamma_la_SOURCES = gstgamma.c |