GNOME.org
 

[longomatch/redesign: 30/82] Move code from libcesarplayer/src to libcesarplayer

commit 5ac04b35284d937beeac5c8147b874b840841185
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Mon Dec 20 02:07:30 2010 +0100

    Move code from libcesarplayer/src to libcesarplayer

 configure.ac                                       |    9 ++--
 libcesarplayer/Makefile.am                         |   54 +++++++++++++++---
 libcesarplayer/{src => }/bacon-resize.c            |    0
 libcesarplayer/{src => }/bacon-resize.h            |    0
 .../{src => }/bacon-video-widget-gst-0.10.c        |    0
 libcesarplayer/{src => }/bacon-video-widget.h      |    0
 .../{src => }/baconvideowidget-marshal.list        |    0
 libcesarplayer/{src => }/common.h                  |    0
 libcesarplayer/{src => }/gst-camera-capturer.c     |    0
 libcesarplayer/{src => }/gst-camera-capturer.h     |    0
 libcesarplayer/{src => }/gst-smart-video-scaler.c  |    0
 libcesarplayer/{src => }/gst-smart-video-scaler.h  |    0
 libcesarplayer/{src => }/gst-video-editor.c        |    0
 libcesarplayer/{src => }/gst-video-editor.h        |    0
 libcesarplayer/{src => }/gstscreenshot.c           |    0
 libcesarplayer/{src => }/gstscreenshot.h           |    0
 libcesarplayer/{src => }/gstvideowidget.c          |    0
 libcesarplayer/{src => }/gstvideowidget.h          |    0
 libcesarplayer/liblongomatch.mdp                   |   57 +++++++++++---------
 libcesarplayer/{src => }/macros.h                  |    0
 libcesarplayer/{src => }/main.c                    |    0
 libcesarplayer/src/Makefile.am                     |   50 -----------------
 libcesarplayer/src/sources.gapi                    |   10 ----
 libcesarplayer/{src => }/video-utils.c             |    0
 libcesarplayer/{src => }/video-utils.h             |    0
 25 files changed, 80 insertions(+), 100 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1217120..f585c00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,18 +115,17 @@ dnl package checks, per config
 
 AC_CONFIG_FILES([env], [chmod +x env])
 AC_CONFIG_FILES([
-LongoMatch/Makefile
-CesarPlayer/Makefile
 po/Makefile.in
 libcesarplayer/Makefile
-libcesarplayer/src/Makefile
-Makefile
 CesarPlayer/cesarplayer.pc
 CesarPlayer/CesarPlayer.dll.config
+CesarPlayer/AssemblyInfo.cs
+CesarPlayer/Makefile
 LongoMatch/longomatch
 LongoMatch/longomatch.desktop.in
 LongoMatch/AssemblyInfo.cs
-CesarPlayer/AssemblyInfo.cs
+LongoMatch/Makefile
+Makefile
 ])
 
 AC_OUTPUT
diff --git a/libcesarplayer/Makefile.am b/libcesarplayer/Makefile.am
index 675e822..0bc96b0 100644
--- a/libcesarplayer/Makefile.am
+++ b/libcesarplayer/Makefile.am
@@ -1,14 +1,50 @@
 ## Process this file with automake to produce Makefile.in
-## Created by Anjuta
 
-SUBDIRS = src
 
+AM_CPPFLAGS = \
+	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
+	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+	$(CESARPLAYER_CFLAGS)
 
-# Copy all the spec files. Of cource, only one is actually used.
-dist-hook:
-	for specfile in *.spec; do \
-		if test -f $$specfile; then \
-			cp -p $$specfile $(distdir); \
-		fi \
-	done
+AM_CFLAGS =\
+	 -Wall\
+	 -g
+
+BVWMARSHALFILES = baconvideowidget-marshal.c baconvideowidget-marshal.h
+GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+BUILT_SOURCES = $(BVWMARSHALFILES)
+
+baconvideowidget-marshal.h: baconvideowidget-marshal.list
+	( $(GLIB_GENMARSHAL) --prefix=baconvideowidget_marshal $(srcdir)/baconvideowidget-marshal.list --header > baconvideowidget-marshal.h )
+baconvideowidget-marshal.c: baconvideowidget-marshal.h
+	( $(GLIB_GENMARSHAL) --prefix=baconvideowidget_marshal $(srcdir)/baconvideowidget-marshal.list --body --header > baconvideowidget-marshal.c )
+
+
+pkglib_LTLIBRARIES = \
+	libcesarplayer.la
+
+libcesarplayer_la_SOURCES = \
+	$(BVWMARSHALFILES) \
+	common.h\
+	bacon-video-widget.h\
+	bacon-video-widget-gst-0.10.c\
+	gstscreenshot.c \
+	gstscreenshot.h \
+	gst-camera-capturer.c\
+	gst-camera-capturer.h\
+	gst-video-editor.c\
+	gst-video-editor.h\
+	bacon-resize.c\
+	bacon-resize.h\
+	video-utils.c\
+	video-utils.h\
+	macros.h 
+
+libcesarplayer_la_LDFLAGS = \
+	$(CESARPLAYER_LIBS)
+	
+CLEANFILES = $(BUILT_SOURCES)
+	
+EXTRA_DIST = \
+	baconvideowidget-marshal.list
 
diff --git a/libcesarplayer/src/bacon-resize.c b/libcesarplayer/bacon-resize.c
similarity index 100%
rename from libcesarplayer/src/bacon-resize.c
rename to libcesarplayer/bacon-resize.c
diff --git a/libcesarplayer/src/bacon-resize.h b/libcesarplayer/bacon-resize.h
similarity index 100%
rename from libcesarplayer/src/bacon-resize.h
rename to libcesarplayer/bacon-resize.h
diff --git a/libcesarplayer/src/bacon-video-widget-gst-0.10.c b/libcesarplayer/bacon-video-widget-gst-0.10.c
similarity index 100%
rename from libcesarplayer/src/bacon-video-widget-gst-0.10.c
rename to libcesarplayer/bacon-video-widget-gst-0.10.c
diff --git a/libcesarplayer/src/bacon-video-widget.h b/libcesarplayer/bacon-video-widget.h
similarity index 100%
rename from libcesarplayer/src/bacon-video-widget.h
rename to libcesarplayer/bacon-video-widget.h
diff --git a/libcesarplayer/src/baconvideowidget-marshal.list b/libcesarplayer/baconvideowidget-marshal.list
similarity index 100%
rename from libcesarplayer/src/baconvideowidget-marshal.list
rename to libcesarplayer/baconvideowidget-marshal.list
diff --git a/libcesarplayer/src/common.h b/libcesarplayer/common.h
similarity index 100%
rename from libcesarplayer/src/common.h
rename to libcesarplayer/common.h
diff --git a/libcesarplayer/src/gst-camera-capturer.c b/libcesarplayer/gst-camera-capturer.c
similarity index 100%
rename from libcesarplayer/src/gst-camera-capturer.c
rename to libcesarplayer/gst-camera-capturer.c
diff --git a/libcesarplayer/src/gst-camera-capturer.h b/libcesarplayer/gst-camera-capturer.h
similarity index 100%
rename from libcesarplayer/src/gst-camera-capturer.h
rename to libcesarplayer/gst-camera-capturer.h
diff --git a/libcesarplayer/src/gst-smart-video-scaler.c b/libcesarplayer/gst-smart-video-scaler.c
similarity index 100%
rename from libcesarplayer/src/gst-smart-video-scaler.c
rename to libcesarplayer/gst-smart-video-scaler.c
diff --git a/libcesarplayer/src/gst-smart-video-scaler.h b/libcesarplayer/gst-smart-video-scaler.h
similarity index 100%
rename from libcesarplayer/src/gst-smart-video-scaler.h
rename to libcesarplayer/gst-smart-video-scaler.h
diff --git a/libcesarplayer/src/gst-video-editor.c b/libcesarplayer/gst-video-editor.c
similarity index 100%
rename from libcesarplayer/src/gst-video-editor.c
rename to libcesarplayer/gst-video-editor.c
diff --git a/libcesarplayer/src/gst-video-editor.h b/libcesarplayer/gst-video-editor.h
similarity index 100%
rename from libcesarplayer/src/gst-video-editor.h
rename to libcesarplayer/gst-video-editor.h
diff --git a/libcesarplayer/src/gstscreenshot.c b/libcesarplayer/gstscreenshot.c
similarity index 100%
rename from libcesarplayer/src/gstscreenshot.c
rename to libcesarplayer/gstscreenshot.c
diff --git a/libcesarplayer/src/gstscreenshot.h b/libcesarplayer/gstscreenshot.h
similarity index 100%
rename from libcesarplayer/src/gstscreenshot.h
rename to libcesarplayer/gstscreenshot.h
diff --git a/libcesarplayer/src/gstvideowidget.c b/libcesarplayer/gstvideowidget.c
similarity index 100%
rename from libcesarplayer/src/gstvideowidget.c
rename to libcesarplayer/gstvideowidget.c
diff --git a/libcesarplayer/src/gstvideowidget.h b/libcesarplayer/gstvideowidget.h
similarity index 100%
rename from libcesarplayer/src/gstvideowidget.h
rename to libcesarplayer/gstvideowidget.h
diff --git a/libcesarplayer/liblongomatch.mdp b/libcesarplayer/liblongomatch.mdp
index 550de96..42f5666 100644
--- a/libcesarplayer/liblongomatch.mdp
+++ b/libcesarplayer/liblongomatch.mdp
@@ -1,4 +1,14 @@
 <Project name="libcesarplayer" fileversion="2.0" language="C" Target="Bin" Description="Gstreamer backend libraries for LongoMatch" ctype="CProject">
+  <MonoDevelop.Autotools.MakefileInfo RelativeMakefileName="Makefile.am" IsAutotoolsProject="True" RelativeConfigureInPath=".">
+    <BuildFilesVar />
+    <DeployFilesVar />
+    <ResourcesVar />
+    <OthersVar />
+    <GacRefVar />
+    <AsmRefVar />
+    <ProjectRefVar />
+  </MonoDevelop.Autotools.MakefileInfo>
+  <MonoDevelop.ChangeLogAddIn.ChangeLogInfo policy="UseParentPolicy" />
   <Configurations active="Release">
     <Configuration name="Debug" SourceDirectory="." ctype="CProjectConfiguration">
       <Output directory="../LongoMatch/bin/Debug" output="libcesarplayer.dll" />
@@ -14,23 +24,27 @@
     </Configuration>
   </Configurations>
   <Contents>
-    <File subtype="Code" buildaction="Nothing" name="src/bacon-video-widget.h" />
-    <File subtype="Code" buildaction="Compile" name="src/bacon-video-widget-gst-0.10.c" />
-    <File subtype="Code" buildaction="Compile" name="src/baconvideowidget-marshal.c" />
-    <File subtype="Code" buildaction="Nothing" name="src/baconvideowidget-marshal.h" />
-    <File subtype="Code" buildaction="Nothing" name="src/macros.h" />
-    <File subtype="Code" buildaction="Compile" name="src/gstscreenshot.c" />
-    <File subtype="Code" buildaction="Nothing" name="src/gstscreenshot.h" />
-    <File subtype="Code" buildaction="Compile" name="src/gst-video-editor.c" />
-    <File subtype="Code" buildaction="Nothing" name="src/gst-video-editor.h" />
-    <File subtype="Code" buildaction="Compile" name="src/bacon-resize.c" />
-    <File subtype="Code" buildaction="Nothing" name="src/bacon-resize.h" />
-    <File subtype="Code" buildaction="Compile" name="src/video-utils.c" />
-    <File subtype="Code" buildaction="Nothing" name="src/video-utils.h" />
-    <File subtype="Code" buildaction="Compile" name="src/gst-camera-capturer.c" />
-    <File subtype="Code" buildaction="Nothing" name="src/gst-camera-capturer.h" />
+    <File subtype="Directory" buildaction="Nothing" name="." />
+    <File subtype="Code" buildaction="Compile" name="bacon-resize.c" />
+    <File subtype="Code" buildaction="Nothing" name="bacon-resize.h" />
+    <File subtype="Code" buildaction="Nothing" name="bacon-video-widget.h" />
+    <File subtype="Code" buildaction="Compile" name="bacon-video-widget-gst-0.10.c" />
+    <File subtype="Code" buildaction="Nothing" name="common.h" />
+    <File subtype="Code" buildaction="Compile" name="gst-camera-capturer.c" />
+    <File subtype="Code" buildaction="Nothing" name="gst-camera-capturer.h" />
+    <File subtype="Code" buildaction="Compile" name="gstscreenshot.c" />
+    <File subtype="Code" buildaction="Nothing" name="gstscreenshot.h" />
+    <File subtype="Code" buildaction="Compile" name="gst-smart-video-scaler.c" />
+    <File subtype="Code" buildaction="Nothing" name="gst-smart-video-scaler.h" />
+    <File subtype="Code" buildaction="Compile" name="gst-video-editor.c" />
+    <File subtype="Code" buildaction="Nothing" name="gst-video-editor.h" />
+    <File subtype="Code" buildaction="Compile" name="gstvideowidget.c" />
+    <File subtype="Code" buildaction="Nothing" name="gstvideowidget.h" />
+    <File subtype="Code" buildaction="Nothing" name="macros.h" />
+    <File subtype="Code" buildaction="Compile" name="main.c" />
+    <File subtype="Code" buildaction="Compile" name="video-utils.c" />
+    <File subtype="Code" buildaction="Nothing" name="video-utils.h" />
   </Contents>
-  <compiler ctype="GccCompiler" />
   <Packages>
     <Package file="/usr/lib/pkgconfig/gstreamer-0.10.pc" name="GStreamer" IsProject="False" />
     <Package file="/usr/lib/pkgconfig/gstreamer-audio-0.10.pc" name="GStreamer Audio library" IsProject="False" />
@@ -42,14 +56,5 @@
     <Package file="/usr/lib/pkgconfig/gtk+-2.0.pc" name="GTK+" IsProject="False" />
     <Package file="/usr/lib/pkgconfig/gstreamer-pbutils-0.10.pc" name="GStreamer Base Utils Library" IsProject="False" />
   </Packages>
-  <MonoDevelop.Autotools.MakefileInfo RelativeMakefileName="Makefile.am" IsAutotoolsProject="True" RelativeConfigureInPath=".">
-    <BuildFilesVar />
-    <DeployFilesVar />
-    <ResourcesVar />
-    <OthersVar />
-    <GacRefVar />
-    <AsmRefVar />
-    <ProjectRefVar />
-  </MonoDevelop.Autotools.MakefileInfo>
-  <MonoDevelop.ChangeLogAddIn.ChangeLogInfo policy="UseParentPolicy" />
+  <compiler ctype="GccCompiler" />
 </Project>
\ No newline at end of file
diff --git a/libcesarplayer/src/macros.h b/libcesarplayer/macros.h
similarity index 100%
rename from libcesarplayer/src/macros.h
rename to libcesarplayer/macros.h
diff --git a/libcesarplayer/src/main.c b/libcesarplayer/main.c
similarity index 100%
rename from libcesarplayer/src/main.c
rename to libcesarplayer/main.c
diff --git a/libcesarplayer/src/video-utils.c b/libcesarplayer/video-utils.c
similarity index 100%
rename from libcesarplayer/src/video-utils.c
rename to libcesarplayer/video-utils.c
diff --git a/libcesarplayer/src/video-utils.h b/libcesarplayer/video-utils.h
similarity index 100%
rename from libcesarplayer/src/video-utils.h
rename to libcesarplayer/video-utils.h
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]