From 546bc7dbc12b3c369a31b74171c51d9b0f2254eb Mon Sep 17 00:00:00 2001
From: Stefan Kost <ensonic@users.sourceforge.net>
Date: Fri, 20 Jul 2007 07:41:58 +0000
Subject: [PATCH] ext/annodex/Makefile.am: Fix CFLAGS/LIBS.

Original commit message from CVS:
* ext/annodex/Makefile.am:
Fix CFLAGS/LIBS.
* ext/cdio/gstcdiocddasrc.c:
* ext/libpng/gstpngdec.c: (gst_pngdec_task):
Include stdlib
* ext/cairo/Makefile.am:
* gst/videofilter/Makefile.am:
* tests/examples/level/Makefile.am:
Use $(LIBM) instead of -lm
---
 ChangeLog                        | 14 ++++++++++++++
 ext/annodex/Makefile.am          |  4 ++--
 ext/cairo/Makefile.am            |  2 +-
 ext/cdio/gstcdiocddasrc.c        |  1 +
 ext/libpng/gstpngdec.c           |  1 +
 gst/videofilter/Makefile.am      |  2 +-
 tests/examples/level/Makefile.am |  2 +-
 7 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a1d03ecb7a..0d6e8e80d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-07-20  Stefan Kost  <ensonic@users.sf.net>
+
+	* ext/annodex/Makefile.am:
+	  Fix CFLAGS/LIBS.
+
+	* ext/cdio/gstcdiocddasrc.c:
+	* ext/libpng/gstpngdec.c: (gst_pngdec_task):
+	  Include stdlib
+
+	* ext/cairo/Makefile.am:
+	* gst/videofilter/Makefile.am:
+	* tests/examples/level/Makefile.am:
+	  Use $(LIBM) instead of -lm
+
 2007-07-18  Stefan Kost  <ensonic@users.sf.net>
 
 	* sys/v4l2/gstv4l2src.c:
diff --git a/ext/annodex/Makefile.am b/ext/annodex/Makefile.am
index fde7690520..074d143dcc 100644
--- a/ext/annodex/Makefile.am
+++ b/ext/annodex/Makefile.am
@@ -9,9 +9,9 @@ libgstannodex_la_SOURCES = \
 	gstcmmlparser.c
 
 libgstannodex_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
-			  $(GST_CFLAGS) $(XML_CFLAGS)
+			  $(GST_CFLAGS) $(ANNODEX_CFLAGS)
 libgstannodex_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
-			  $(GST_LIBS) $(XML_LIBS) $(LIBM)
+			  $(GST_LIBS) $(ANNODEX_LIBS) $(LIBM)
 libgstannodex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gstannodex.h gstcmmlutils.h gstcmmltag.h gstcmmlparser.h \
diff --git a/ext/cairo/Makefile.am b/ext/cairo/Makefile.am
index 679784e2a9..91f63dcdbb 100644
--- a/ext/cairo/Makefile.am
+++ b/ext/cairo/Makefile.am
@@ -13,5 +13,5 @@ libgstcairo_la_CFLAGS = \
 	$(GST_CFLAGS) $(CAIRO_CFLAGS)
 libgstcairo_la_LIBADD = \
   $(GST_BASE_LIBS) \
-  $(GST_LIBS) $(CAIRO_LIBS) -lm
+  $(GST_LIBS) $(CAIRO_LIBS) $(LIBM)
 libgstcairo_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c
index ca3258eeca..6cf2fc6c37 100644
--- a/ext/cdio/gstcdiocddasrc.c
+++ b/ext/cdio/gstcdiocddasrc.c
@@ -82,6 +82,7 @@
 #include "gst/gst-i18n-plugin.h"
 
 #include <sys/types.h>
+#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
diff --git a/ext/libpng/gstpngdec.c b/ext/libpng/gstpngdec.c
index 236538b286..6d939756bd 100644
--- a/ext/libpng/gstpngdec.c
+++ b/ext/libpng/gstpngdec.c
@@ -26,6 +26,7 @@
 
 #include "gstpngdec.h"
 
+#include <stdlib.h>
 #include <string.h>
 #include <gst/video/video.h>
 #include <gst/gst-i18n-plugin.h>
diff --git a/gst/videofilter/Makefile.am b/gst/videofilter/Makefile.am
index dea626d08b..2ddc6fd6df 100644
--- a/gst/videofilter/Makefile.am
+++ b/gst/videofilter/Makefile.am
@@ -34,7 +34,7 @@ libgstgamma_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
 			$(GST_PLUGINS_BASE_CFLAGS)
 libgstgamma_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
 			$(GST_BASE_LIBS) $(GST_LIBS)
-libgstgamma_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lm
+libgstgamma_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBM)
 
 gstvideoexample.c: $(srcdir)/make_filter $(srcdir)/gstvideotemplate.c
 	$(srcdir)/make_filter Videoexample $(srcdir)/gstvideotemplate.c
diff --git a/tests/examples/level/Makefile.am b/tests/examples/level/Makefile.am
index acee59ac59..67ca7199e1 100644
--- a/tests/examples/level/Makefile.am
+++ b/tests/examples/level/Makefile.am
@@ -1,4 +1,4 @@
 noinst_PROGRAMS = level-example
 level_example_CFLAGS = $(GST_CFLAGS)
-level_example_LDADD = $(GST_LIBS) -lm
+level_example_LDADD = $(GST_LIBS) $(LIBM)