From 4e88b1b6a7f7d9d761c777d567276f1e262931cf Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 8 Feb 2004 13:35:42 +0000 Subject: gst-libs/gst/: remove unused GST_OPT_CFLAGS from Makefiles include X_CFLAGS and X_LIBS in xoverlay. (#131948) Original commit message from CVS: 2004-02-08 Benjamin Otte * gst-libs/gst/colorbalance/Makefile.am: * gst-libs/gst/navigation/Makefile.am: * gst-libs/gst/xoverlay/Makefile.am: remove unused GST_OPT_CFLAGS from Makefiles include X_CFLAGS and X_LIBS in xoverlay. (#131948) --- ChangeLog | 14 ++++++++++++++ gst-libs/gst/colorbalance/Makefile.am | 2 +- gst-libs/gst/navigation/Makefile.am | 2 +- gst-libs/gst/xoverlay/Makefile.am | 3 ++- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e97eb2d..86c17465 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2004-02-08 Benjamin Otte + + * gst-libs/gst/colorbalance/Makefile.am: + * gst-libs/gst/navigation/Makefile.am: + * gst-libs/gst/xoverlay/Makefile.am: + remove unused GST_OPT_CFLAGS from Makefiles + include X_CFLAGS and X_LIBS in xoverlay. (#131948) + +2004-02-08 Benjamin Otte + + * gst-libs/gst/colorbalance/Makefile.am: + * gst-libs/gst/navigation/Makefile.am: + * gst-libs/gst/xoverlay/Makefile.am: + 2004-02-07 David Schleef * ext/ogg/gstoggdemux.c: (gst_ogg_demux_handle_event): Don't diff --git a/gst-libs/gst/colorbalance/Makefile.am b/gst-libs/gst/colorbalance/Makefile.am index fbd050d0..b55e318f 100644 --- a/gst-libs/gst/colorbalance/Makefile.am +++ b/gst-libs/gst/colorbalance/Makefile.am @@ -27,7 +27,7 @@ libgstcolorbalance_la_SOURCES = \ colorbalancechannel.c \ $(built_sources) -libgstcolorbalance_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS) +libgstcolorbalance_la_CFLAGS = $(GST_CFLAGS) BUILT_SOURCES = \ $(built_sources) \ diff --git a/gst-libs/gst/navigation/Makefile.am b/gst-libs/gst/navigation/Makefile.am index a600ab19..b06e2ecb 100644 --- a/gst-libs/gst/navigation/Makefile.am +++ b/gst-libs/gst/navigation/Makefile.am @@ -5,4 +5,4 @@ libgstnavigation_la_SOURCES = navigation.c libgstnavigationincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/navigation libgstnavigationinclude_HEADERS = navigation.h -libgstnavigation_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS) +libgstnavigation_la_CFLAGS = $(GST_CFLAGS) diff --git a/gst-libs/gst/xoverlay/Makefile.am b/gst-libs/gst/xoverlay/Makefile.am index 321af7ec..c7e2db35 100644 --- a/gst-libs/gst/xoverlay/Makefile.am +++ b/gst-libs/gst/xoverlay/Makefile.am @@ -6,5 +6,6 @@ libgstinterfacesinclude_HEADERS = xoverlay.h noinst_LTLIBRARIES = libgstxoverlay.la libgstxoverlay_la_SOURCES = xoverlay.c -libgstxoverlay_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS) +libgstxoverlay_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) +libgstxoverlay_la_LIBADD = $(X_LIBS) -- cgit v1.2.1