gst-libs/gst/dshow/Makefile.am: Use CXXFLAGS rather than CFLAGS; these are C++ files.

Original commit message from CVS:
* gst-libs/gst/dshow/Makefile.am:
Use CXXFLAGS rather than CFLAGS; these are C++ files.
Define required constants appropriately.
* sys/dshowdecwrapper/Makefile.am:
Add required include dir, libraries.
Define required constants appropriately.

diff --git a/ChangeLog b/ChangeLog
index 200da44..0fed727 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-25  Michael Smith <msmith@songbirdnest.com>
+
+       * gst-libs/gst/dshow/Makefile.am:
+         Use CXXFLAGS rather than CFLAGS; these are C++ files.
+         Define required constants appropriately.
+       * sys/dshowdecwrapper/Makefile.am:
+         Add required include dir, libraries.
+         Define required constants appropriately.
+
 2008-04-25  Wim Taymans  <wim.taymans@collabora.co.uk>
 
        * gst/rtpmanager/gstrtpbin.c: (create_stream), (gst_rtp_bin_init),

diff --git a/gst-libs/gst/dshow/Makefile.am b/gst-libs/gst/dshow/Makefile.am
index 582df9a..d9ab540 100644 (file)
--- a/gst-libs/gst/dshow/Makefile.am
+++ b/gst-libs/gst/dshow/Makefile.am
@@ -1,10 +1,10 @@
 lib_LTLIBRARIES = libgstdshow-@GST_MAJORMINOR@.la
 
 libgstdshow_@GST_MAJORMINOR@_la_SOURCES = gstdshow.cpp gstdshowfakesink.cpp gstdshowfakesrc.cpp gstdshowinterface.cpp
-libgstdshow_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
-       $(GST_PLUGINS_BASE_CFLAGS)
+libgstdshow_@GST_MAJORMINOR@_la_CXXFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
+       $(GST_PLUGINS_BASE_CFLAGS) -DLIBDSHOW_EXPORTS
 libgstdshow_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS)
 libgstdshow_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_ALL_LDFLAGS)
 
-libgstdshow_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/app
+libgstdshow_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/dshow
 libgstdshow_@GST_MAJORMINOR@include_HEADERS = gstdshow.h gstdshowfakesink.h gstdshowfakesrc.h gstdshowinterface.h

diff --git a/sys/dshowdecwrapper/Makefile.am b/sys/dshowdecwrapper/Makefile.am
index 3b03a40..7e9782b 100644 (file)
--- a/sys/dshowdecwrapper/Makefile.am
+++ b/sys/dshowdecwrapper/Makefile.am
@@ -2,8 +2,8 @@ plugin_LTLIBRARIES = libgstdshowdecwrapper.la
 
 libgstdshowdecwrapper_la_SOURCES = gstdshowaudiodec.c gstdshowdecwrapper.c gstdshowvideodec.c
 
-libgstdshowdecwrapper_la_CFLAGS = $(GST_CFLAGS)
-libgstdshowdecwrapper_la_LIBADD = $(GST_LIBS)
+libgstdshowdecwrapper_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst-libs/gst -DLIBGSTDSHOWDECWRAPPER_EXPORTS
+libgstdshowdecwrapper_la_LIBADD = $(GST_LIBS) $(top_builddir)/gst-libs/gst/dshow/libgstdshow-@GST_MAJORMINOR@.la
 libgstdshowdecwrapper_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gstdshowaudiodec.h gstdshowdecwrapper.h gstdshowvideodec.h