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: 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
---
 ext/annodex/Makefile.am   | 4 ++--
 ext/cairo/Makefile.am     | 2 +-
 ext/cdio/gstcdiocddasrc.c | 1 +
 ext/libpng/gstpngdec.c    | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'ext')

diff --git a/ext/annodex/Makefile.am b/ext/annodex/Makefile.am
index fde76905..074d143d 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 679784e2..91f63dcd 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 ca3258ee..6cf2fc6c 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 236538b2..6d939756 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>
-- 
cgit