gnome-subtitles r1082 - trunk/src

[pcastro svn gnome org]

Author: pcastro
Date: Sun Nov 23 18:27:53 2008
New Revision: 1082
URL: http://svn.gnome.org/viewvc/gnome-subtitles?rev=1082&view=rev

Log:
Gstreamer playbin (from the fusemc project) has been incorporated into the Gnome Subtitles src dir. The CS sources are included in the GS assembly, while main.c is built into a library (SO) as it was before.


Modified:
   trunk/src/   (props changed)
   trunk/src/Makefile.am

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Nov 23 18:27:53 2008
@@ -6,9 +6,14 @@
 
 ASSEMBLY = $(GS_BUILDDIR)/gnome-subtitles.exe
 ASSEMBLY_CONFIG = $(ASSEMBLY).config
-GSTPB = $(GS_BUILDDIR)/GStreamerPlaybin.dll
+
+AM_CFLAGS = $(gstreamer_CFLAGS) -Wall -g -fPIC
+noinst_PROGRAMS = libgstreamer_playbin.so
+libgstreamer_playbin_so_SOURCES = $(srcdir)/External/GStreamerPlaybin/main.c
+libgstreamer_playbin_so_LDFLAGS = $(gstreamer_LIBS) -lgstinterfaces-0.10 -shared -Wl,--as-needed,-soname,libgstreamer_playbin.so
 
 GS_SOURCES = \
+	$(srcdir)/External/GStreamerPlaybin/*.cs \
 	$(srcdir)/GnomeSubtitles/Core/*.cs \
 	$(srcdir)/GnomeSubtitles/Core/Command/*.cs \
 	$(srcdir)/GnomeSubtitles/Dialog/*.cs \
@@ -16,7 +21,7 @@
 	$(srcdir)/GnomeSubtitles/Ui/*.cs \
 	$(srcdir)/GnomeSubtitles/Ui/Edit/*.cs \
 	$(srcdir)/GnomeSubtitles/Ui/VideoPreview/*.cs \
-	$(srcdir)/GnomeSubtitles/Ui/VideoPreview/Exception/*.cs \
+	$(srcdir)/GnomeSubtitles/Ui/VideoPreview/Exceptions/*.cs \
 	$(srcdir)/GnomeSubtitles/Ui/View/*.cs
 
 GS_RESOURCES = \
@@ -41,10 +46,9 @@
 	$(GS_DATADIR)/video-set-subtitle-start-16x.png
 
 GS_SYSTEM_REFERENCES = \
-	$(GSTPB) \
 	Mono.Posix.dll
 
-$(ASSEMBLY): $(GS_SOURCES) $(GS_RESOURCES) $(GSTPB)
+$(ASSEMBLY): $(GS_SOURCES) $(GS_RESOURCES)
 	$(MCS) $(MCS_FLAGS) -target:winexe -out:$(ASSEMBLY) $(GS_SYSTEM_REFERENCES:%=-r:%) $(GTKSHARP_LIBS) $(SUBLIB_LIBS) $(GS_RESOURCES:%=-resource:%) $(GS_SOURCES)
 
 $(ASSEMBLY_CONFIG):
@@ -53,5 +57,5 @@
 bin_SCRIPTS = $(srcdir)/GnomeSubtitles/Execution/gnome-subtitles
 
 CLEANFILES = $(bin_SCRIPTS) $(ASSEMBLY) $(ASSEMBLY).mdb
-EXTRA_DIST = $(gnomesubtitles_SOURCES) $(GS_SOURCES) $(GS_RESOURCES) $(ASSEMBLY_CONFIG)
+EXTRA_DIST = $(gnomesubtitles_SOURCES) $(GS_SOURCES) $(GS_RESOURCES) $(ASSEMBLY_CONFIG) main.c