CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 07/12/04 14:24:07
Modified files:
. : ChangeLog
libmedia : Makefile.am
Log message:
* libmedia/Makefile.am: Add missing gstreamer files.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5079&r2=1.5080
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/Makefile.am?cvsroot=gnash&r1=1.6&r2=1.7
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5079
retrieving revision 1.5080
diff -u -b -r1.5079 -r1.5080
--- ChangeLog 4 Dec 2007 11:45:21 -0000 1.5079
+++ ChangeLog 4 Dec 2007 14:24:06 -0000 1.5080
@@ -1,3 +1,7 @@
+2007-12-04 Benjamin Wolsey <[EMAIL PROTECTED]>
+
+ * libmedia/Makefile.am: Add missing gstreamer files.
+
2007-12-04 Sandro Santilli <[EMAIL PROTECTED]>
* (tons of files): drop tu_types.h, use boost/cstdint.hpp instead.
Index: libmedia/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libmedia/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libmedia/Makefile.am 30 Nov 2007 00:13:01 -0000 1.6
+++ libmedia/Makefile.am 4 Dec 2007 14:24:07 -0000 1.7
@@ -95,29 +95,76 @@
if USE_SOUND_GST
-#libgnashmedia_la_SOURCES += gst/gstgnashsrc.c gst/VideoDecoderGst.cpp
gst/AudioDecoderGst.cpp gst/gstappbuffer.c gst/gstappsink.c gst/gstappsrc.c
gst/sound_handler_gst.cpp
-libgnashmedia_la_SOURCES += gst/VideoDecoderGst.cpp gst/sound_handler_gst.cpp
gst/gstgnashsrc.c
-#noinst_HEADERS += gst/gstgnashsrc.h gst/gstappbuffer.h gst/AudioDecoderGst.h
gst/VideoDecoderGst.h gst/gstappsink.h gst/gstappsrc.h gst/sound_handler_gst.h
-noinst_HEADERS += gst/VideoDecoderGst.h gst/sound_handler_gst.h
gst/gstgnashsrc.h
-libgnashmedia_la_CPPFLAGS += $(GSTREAMER_CFLAGS)
-libgnashmedia_la_LIBADD += $(GSTREAMER_LIBS) -lgstbase-0.10
+ libgnashmedia_la_SOURCES += \
+ gst/gstgnashsrc.c \
+ gst/VideoDecoderGst.cpp \
+ gst/AudioDecoderGst.cpp \
+ gst/gstappbuffer.c \
+ gst/gstappsink.c \
+ gst/gstappsrc.c \
+ gst/sound_handler_gst.cpp \
+ gst/MediaDecoderGst.cpp
+
+ noinst_HEADERS += \
+ gst/gstgnashsrc.h \
+ gst/gstappbuffer.h \
+ gst/AudioDecoderGst.h \
+ gst/VideoDecoderGst.h \
+ gst/gstappsink.h \
+ gst/gstappsrc.h \
+ gst/sound_handler_gst.h \
+ gst/MediaDecoderGst.h
+
+ libgnashmedia_la_CPPFLAGS += \
+ $(GSTREAMER_CFLAGS)
+
+ libgnashmedia_la_LIBADD += \
+ $(GSTREAMER_LIBS) -lgstbase-0.10
+
endif
if USE_FFMPEG_ENGINE
-libgnashmedia_la_SOURCES += sdl/MediaDecoderSdl.cpp sdl/AudioDecoderFfmpeg.cpp
sdl/VideoDecoderFfmpeg.cpp sdl/MediaParserFfmpeg.cpp sdl/sound_handler_sdl.cpp
-#noinst_HEADERS += sdl/MediaDecoderSdl.h sdl/AudioDecoderFfmpeg.h
sdl/VideoDecoderFfmpeg.h sdl/MediaParserFfmpeg.h sdl/sound_handler_sdl.h
-noinst_HEADERS += sdl/AudioDecoderFfmpeg.h sdl/VideoDecoderFfmpeg.h
sdl/sound_handler_sdl.h sdl/MediaDecoderSdl.h sdl/MediaParserFfmpeg.h
-libgnashmedia_la_LIBADD += $(FFMPEG_LIBS)
-libgnashmedia_la_CPPFLAGS += $(FFMPEG_CFLAGS)
+ libgnashmedia_la_SOURCES += \
+ sdl/MediaDecoderSdl.cpp \
+ sdl/AudioDecoderFfmpeg.cpp \
+ sdl/VideoDecoderFfmpeg.cpp \
+ sdl/MediaParserFfmpeg.cpp \
+ sdl/sound_handler_sdl.cpp
+
+ noinst_HEADERS += \
+ sdl/AudioDecoderFfmpeg.h \
+ sdl/VideoDecoderFfmpeg.h \
+ sdl/sound_handler_sdl.h \
+ sdl/MediaDecoderSdl.h \
+ sdl/MediaParserFfmpeg.h
+
+ libgnashmedia_la_LIBADD += \
+ $(FFMPEG_LIBS)
+
+ libgnashmedia_la_CPPFLAGS += \
+ $(FFMPEG_CFLAGS)
endif
if USE_MAD_ENGINE
-#libgnashmedia_la_SOURCES += sdl/MediaDecoderSdl.cpp sdl/AudioDecoderMad.cpp
sdl/sound_handler_sdl.cpp
-libgnashmedia_la_SOURCES += sdl/AudioDecoderMad.cpp sdl/sound_handler_sdl.cpp
-#noinst_HEADERS += sdl/MediaDecoderSdl.h sdl/AudioDecoderMad.h
sdl/sound_handler_sdl.h
-noinst_HEADERS += sdl/AudioDecoderMad.h sdl/sound_handler_sdl.h
-libgnashmedia_la_LIBADD += $(MAD_LIBS)
-libgnashmedia_la_CPPFLAGS += $(MAD_CFLAGS)
+ libgnashmedia_la_SOURCES += \
+ sdl/MediaDecoderSdl.cpp \
+ sdl/AudioDecoderMad.cpp \
+ sdl/sound_handler_sdl.cpp \
+ sdl/AudioDecoderMad.cpp \
+ sdl/sound_handler_sdl.cpp
+
+ noinst_HEADERS += \
+ sdl/MediaDecoderSdl.h \
+ sdl/AudioDecoderMad.h \
+ sdl/sound_handler_sdl.h \
+ sdl/AudioDecoderMad.h \
+ sdl/sound_handler_sdl.h
+
+ libgnashmedia_la_LIBADD += \
+ $(MAD_LIBS)
+
+ libgnashmedia_la_CPPFLAGS += \
+ $(MAD_CFLAGS)
endif
libgnashmedia_la_LDFLAGS = -release $(VERSION)
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
