GNOME.org
 

[longomatch] Update makefiles

commit 00340a437a9d93f8b4618e48a783d153389e93ab
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Sun Dec 18 20:18:26 2011 +0100

    Update makefiles

 LongoMatch.Core/Makefile.am           |   18 +++++++++++++-----
 LongoMatch.GUI.Multimedia/Makefile.am |    1 -
 LongoMatch.GUI/Makefile.am            |    9 ++++++---
 LongoMatch.Multimedia/Makefile.am     |   13 ++++++-------
 LongoMatch.Services/Makefile.am       |   12 ++++++------
 Makefile.am                           |    1 +
 build/build.environment.mk            |   18 +++++++++++++-----
 build/build.rules.mk                  |    2 +-
 configure.ac                          |    4 ++++
 9 files changed, 50 insertions(+), 28 deletions(-)
---
diff --git a/LongoMatch.Core/Makefile.am b/LongoMatch.Core/Makefile.am
index 0f83237..4213a7e 100644
--- a/LongoMatch.Core/Makefile.am
+++ b/LongoMatch.Core/Makefile.am
@@ -4,7 +4,6 @@ TARGET = library
 LINK = $(REF_DEP_LONGOMATCH_CORE)
 
 SOURCES = \
-	Common/Cairo.cs \
 	Common/CaptureSettings.cs \
 	Common/Cloner.cs \
 	Common/ConsoleCrayon.cs \
@@ -13,7 +12,7 @@ SOURCES = \
 	Common/EncodingProfiles.cs \
 	Common/EncodingSettings.cs \
 	Common/Enums.cs \
-	Common/Images.cs \
+	Common/Image.cs \
 	Common/Job.cs \
 	Common/Log.cs \
 	Common/PlayList.cs \
@@ -21,15 +20,25 @@ SOURCES = \
 	Common/VideoStandards.cs \
 	Config.cs \
 	Handlers/Handlers.cs \
+	Handlers/Multimedia.cs \
+	Interfaces/GUI/IBusyDialog.cs \
+	Interfaces/GUI/ICapturer.cs \
+	Interfaces/GUI/IGUIToolkit.cs \
+	Interfaces/GUI/IMainWindow.cs \
+	Interfaces/GUI/IPlayer.cs \
+	Interfaces/GUI/IPlaylistWidget.cs \
+	Interfaces/GUI/IRenderingStateBar.cs \
+	Interfaces/Multimedia/IFramesCapturer.cs \
+	Interfaces/Multimedia/IMultimediaToolkit.cs \
+	Interfaces/Multimedia/IVideoEditor.cs \
 	Interfaces/IDatabase.cs \
 	Interfaces/IPlayList.cs \
-	Interfaces/IPlaylistWidget.cs \
 	Interfaces/IRenderingJobsManager.cs \
 	Interfaces/ISubCategory.cs \
 	Interfaces/ITag.cs \
-	Interfaces/ITimelineNode.cs \
 	Interfaces/ITemplates.cs \
 	Interfaces/ITemplatesService.cs \
+	Interfaces/ITimelineNode.cs \
 	Store/Category.cs \
 	Store/Drawing.cs \
 	Store/GameUnit.cs \
@@ -49,7 +58,6 @@ SOURCES = \
 	Store/Templates/CategoriesTemplate.cs \
 	Store/Templates/SubCategoryTemplate.cs \
 	Store/Templates/TeamTemplate.cs \
-	Store/Templates/Template.cs \
 	Store/Time.cs \
 	Store/TimeNode.cs
 
diff --git a/LongoMatch.GUI.Multimedia/Makefile.am b/LongoMatch.GUI.Multimedia/Makefile.am
index a33b616..e8c14e4 100644
--- a/LongoMatch.GUI.Multimedia/Makefile.am
+++ b/LongoMatch.GUI.Multimedia/Makefile.am
@@ -18,4 +18,3 @@ RESOURCES = \
 
 include $(top_srcdir)/build/build.mk
 
-EXTRA_DIST += LongoMatch.Gui.Multimedia.dll.config
diff --git a/LongoMatch.GUI/Makefile.am b/LongoMatch.GUI/Makefile.am
index bb0c53b..a46fdaa 100644
--- a/LongoMatch.GUI/Makefile.am
+++ b/LongoMatch.GUI/Makefile.am
@@ -56,7 +56,6 @@ SOURCES = \
 	Gui/Base/TimelineWidgetBase.cs \
 	Gui/Base/TimeScaleBase.cs \
 	Gui/Component/ButtonsWidget.cs \
-	Gui/Component/TimelineLabelsWidget.cs \
 	Gui/Component/CategoriesTemplateEditor.cs \
 	Gui/Component/CategoryProperties.cs \
 	Gui/Component/DrawingToolBox.cs \
@@ -80,6 +79,7 @@ SOURCES = \
 	Gui/Component/TagsTreeWidget.cs \
 	Gui/Component/TeamTaggerWidget.cs \
 	Gui/Component/TeamTemplateEditor.cs \
+	Gui/Component/TimelineLabelsWidget.cs \
 	Gui/Component/TimeLineWidget.cs \
 	Gui/Component/TimeReferenceWidget.cs \
 	Gui/Component/TimeScale.cs \
@@ -106,7 +106,6 @@ SOURCES = \
 	Gui/Dialog/UpdateDialog.cs \
 	Gui/Dialog/VideoEditionProperties.cs \
 	Gui/Dialog/Win32CalendarDialog.cs \
-	Gui/MainWindow.cs \
 	Gui/Popup/CalendarPopup.cs \
 	Gui/Popup/MessagePopup.cs \
 	Gui/TransparentDrawingArea.cs \
@@ -118,7 +117,11 @@ SOURCES = \
 	Gui/TreeView/PlaysTreeView.cs \
 	Gui/TreeView/RenderingJobsTreeView.cs \
 	Gui/TreeView/SubCategoriesTreeView.cs \
-	Gui/TreeView/TagsTreeView.cs
+	Gui/TreeView/TagsTreeView.cs \
+	Gui/Cairo.cs \
+	Gui/GUIToolkit.cs \
+	Gui/Helpers.cs \
+	Gui/MainWindow.cs
 
 RESOURCES = \
 	$(top_srcdir)/images/longomatch.png\
diff --git a/LongoMatch.Multimedia/Makefile.am b/LongoMatch.Multimedia/Makefile.am
index 80ff949..cd34ae5 100644
--- a/LongoMatch.Multimedia/Makefile.am
+++ b/LongoMatch.Multimedia/Makefile.am
@@ -4,21 +4,17 @@ TARGET = library
 LINK = $(REF_DEP_LONGOMATCH_MULTIMEDIA)
 
 SOURCES = \
-	Capturer/GstCameraCapturer.cs \
 	Capturer/FakeCapturer.cs \
+	Capturer/GstCameraCapturer.cs \
 	Capturer/LiveSourceTimer.cs \
 	Capturer/ObjectManager.cs \
-	Common/Enum.cs \
 	Common/Constants.cs \
+	Common/Enum.cs \
 	Common/Handlers.cs \
-	Editor/EditorState.cs \
 	Editor/VideoSegment.cs \
 	Editor/GstVideoSplitter.cs \
-	Interfaces/IFramesCapturer.cs \
 	Interfaces/ICapturer.cs \
-	Interfaces/IVideoEditor.cs \
 	Interfaces/IPlayer.cs \
-	MultimediaFactory.cs \
 	Player/GstPlayer.cs \
 	Player/ObjectManager.cs \
 	Utils/FramesCapturer.cs \
@@ -27,7 +23,10 @@ SOURCES = \
 	Utils/MpegRemuxer.cs \
 	Utils/PreviewMediaFile.cs \
 	Utils/TimeString.cs \
-	Utils/VideoDevice.cs
+	Utils/VideoDevice.cs \
+	MultimediaFactory.cs
 
 
 include $(top_srcdir)/build/build.mk
+
+EXTRA_DIST += LongoMatch.Multimedia.dll.config
diff --git a/LongoMatch.Services/Makefile.am b/LongoMatch.Services/Makefile.am
index 9dd3942..143fb73 100644
--- a/LongoMatch.Services/Makefile.am
+++ b/LongoMatch.Services/Makefile.am
@@ -4,15 +4,15 @@ TARGET = library
 LINK = $(REF_DEP_LONGOMATCH_SERVICES)
 
 SOURCES = \
+	Services/Core.cs \
+	Services/DataBase.cs \
+	Services/EventsManager.cs \
 	Services/GameUnitsManager.cs \
+	Services/HotKeysManager.cs \
 	Services/PlaylistManager.cs \
-	Services/VideoDrawingsManager.cs \
 	Services/ProjectsManager.cs \
 	Services/TemplatesService.cs \
-	Services/EventsManager.cs \
-	Services/Core.cs \
-	Services/HotKeysManager.cs \
-	Services/DataBase.cs \
-	Services/RenderingJobsManager.cs
+	Services/RenderingJobsManager.cs \
+	Services/VideoDrawingsManager.cs
 
 include $(top_srcdir)/build/build.mk
diff --git a/Makefile.am b/Makefile.am
index 4d2128d..fa91cad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,7 @@ SUBDIRS = \
 	images \
 	libcesarplayer \
 	LongoMatch.Core \
+	LongoMatch.Addins \
 	LongoMatch.Multimedia \
 	LongoMatch.GUI.Multimedia \
 	LongoMatch.GUI \
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 1218b0f..c9b48bb 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -7,24 +7,33 @@ DEFAULT_INSTALL_DIR = $(pkglibdir)
 
 # External libraries to link against, generated from configure
 LINK_SYSTEM = -r:System
+LINK_SYSTEM_CORE = -r:System.Core
+LINK_SYSTEM_DRAWING = -r:System.Drawing
 LINK_CAIRO = -r:Mono.Cairo
 LINK_MONO_POSIX = -r:Mono.Posix
+LINK_MONO_ADDINS = $(MONO_ADDINS_LIBS)
 LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
 LINK_GLIB = $(GLIBSHARP_LIBS)
 LINK_GTK = $(GTKSHARP_LIBS)
 LINK_GCONF = $(GCONFSHARP_LIBS)
 LINK_DB40 = $(DB4O_LIBS)
+LINK_LONGOMATCH_ADDINS = -r:$(DIR_BIN)/LongoMatch.Addins.dll
 LINK_LONGOMATCH_CORE = -r:$(DIR_BIN)/LongoMatch.dll
 LINK_LONGOMATCH_MULTIMEDIA = -r:$(DIR_BIN)/LongoMatch.Multimedia.dll
 LINK_LONGOMATCH_GUI_MULTIMEDIA = -r:$(DIR_BIN)/LongoMatch.GUI.Multimedia.dll
 LINK_LONGOMATCH_GUI = -r:$(DIR_BIN)/LongoMatch.GUI.dll
 LINK_LONGOMATCH_SERVICES = -r:$(DIR_BIN)/LongoMatch.Services.dll
 
+
+REF_DEP_LONGOMATCH_ADDINS = \
+                     $(LINK_MONO_ADDINS) \
+                     $(LINK_LONGOMATCH_CORE)
+
 REF_DEP_LONGOMATCH_CORE = \
+                     $(LINK_SYSTEM_DRAWING) \
                      $(LINK_MONO_POSIX) \
                      $(LINK_GLIB) \
-                     $(LINK_GTK) \
-                     $(LINK_CAIRO)
+                     $(LINK_GTK)
 
 REF_DEP_LONGOMATCH_MULTIMEDIA = \
                      $(LINK_MONO_POSIX) \
@@ -36,11 +45,11 @@ REF_DEP_LONGOMATCH_GUI_MULTIMEDIA = \
                      $(LINK_MONO_POSIX) \
                      $(LINK_GLIB) \
                      $(LINK_GTK) \
-                     $(LINK_CAIRO) \
                      $(LINK_LONGOMATCH_CORE) \
                      $(LINK_LONGOMATCH_MULTIMEDIA)
 
 REF_DEP_LONGOMATCH_GUI = \
+                     $(LINK_SYSTEM_DRAWING) \
                      $(LINK_MONO_POSIX) \
                      $(LINK_GLIB) \
                      $(LINK_GTK) \
@@ -62,10 +71,9 @@ REF_DEP_LONGOMATCH_SERVICES = \
 
 REF_DEP_LONGOMATCH = \
                      $(LINK_MONO_POSIX) \
-                     $(LINK_DB40) \
                      $(LINK_GLIB) \
                      $(LINK_GTK) \
-                     $(LINK_CAIRO) \
+                     $(LINK_LONGOMATCH_ADDINS) \
                      $(LINK_LONGOMATCH_CORE) \
                      $(LINK_LONGOMATCH_MULTIMEDIA) \
                      $(LINK_LONGOMATCH_SERVICES) \
diff --git a/build/build.rules.mk b/build/build.rules.mk
index 9e68a32..114cb25 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -67,7 +67,7 @@ $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
 		$(GMCS_FLAGS) \
 		$(ASSEMBLY_BUILD_FLAGS) \
 		-nowarn:0278 -nowarn:0078 $$warn -unsafe \
-		-define:HAVE_GTK_2_10 -define:NET_2_0 -codepage:utf8 \
+		-define:HAVE_GTK -codepage:utf8 \
 		-debug -target:$(TARGET) -out:$@ \
 		$(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) $(ENABLE_ATK_FLAG) \
 		$(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD)
diff --git a/configure.ac b/configure.ac
index 545aaf1..c11763c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,6 +77,8 @@ PKG_CHECK_MODULES([GTKSHARP], [gtk-sharp-2.0])
 AC_SUBST(GTKSHARP_LIBS)
 PKG_CHECK_MODULES([DB4O], [db4o])
 AC_SUBST(DB4O_LIBS)
+PKG_CHECK_MODULES([MONO_ADDINS], [mono-addins])
+AC_SUBST(MONO_ADDINS_LIBS)
 
 dnl package checks for libcesarplayer
 PKG_CHECK_MODULES(CESARPLAYER, [gtk+-2.0 >= 2.8 gdk-2.0 gio-2.0 glib-2.0 gstreamer-0.10 gstreamer-audio-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gobject-2.0 gstreamer-interfaces-0.10])
@@ -99,8 +101,10 @@ build/m4/shave/shave-libtool
 images/Makefile
 libcesarplayer/Makefile
 
+LongoMatch.Addins/Makefile
 LongoMatch.Core/Makefile
 LongoMatch.Multimedia/Makefile
+LongoMatch.Multimedia/LongoMatch.Multimedia.dll.config
 LongoMatch.GUI.Multimedia/Makefile
 LongoMatch.GUI/Makefile
 LongoMatch.Services/Makefile
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]