Tied gui into main lumiera build

Makefile.am

@@ -36,6 +36,9 @@ include $(top_srcdir)/admin/Makefile.am
 include $(top_srcdir)/src/lib/Makefile.am
 #include $(top_srcdir)/src/backend/Makefile.am
 
+# gui
+include $(top_srcdir)/src/gui/Makefile.am
+
 # plugins
 #include $(top_srcdir)/src...
 

configure.ac

@@ -75,5 +75,51 @@ AC_MSG_RESULT([NoBug build level: $nobug_level])
 # END NoBug
 
 
+############## Internatinalization
+#GETTEXT_PACKAGE=gtk-lumiera
+#AC_SUBST(GETTEXT_PACKAGE)
+#AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
+#AM_GLIB_GNU_GETTEXT
+#IT_PROG_INTLTOOL([0.35.0])
+
+# END Internatinalization
+
+
+############## X11 Dependancies
+AC_PATH_X
+AC_PATH_XTRA
+# CFLAGS="$CFLAGS $X_CFLAGS"
+LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
+
+AC_CHECK_HEADERS([X11/Xlib.h X11/Xutil.h],[],
+	[AC_MSG_ERROR([Xlib.h or Xutil.h not found install xdevel])])
+
+AC_CHECK_HEADERS([sys/ipc.h sys/shm.h],,
+	[AC_MSG_ERROR([Required header not found. Please check that it is installed])]
+)
+AC_CHECK_HEADERS([X11/extensions/Xvlib.h X11/extensions/XShm.h],,
+	[AC_MSG_ERROR([Required xvideo (Xv) extension to X not found. Please check that it is installed.])],
+        [#include <X11/Xlib.h>]
+)
+
+AC_CHECK_LIB(Xext, XInitExtension, ,
+    [AC_MSG_ERROR([Could not link with libXext. Check that you have libXext installed])], -lX11
+)
+AC_CHECK_LIB(Xv, XvQueryAdaptors, ,
+    [AC_MSG_ERROR([Could not link with libXv. Check that you have libXv installed])]
+)
+
+# END X11 Dependancies
+
+
+############## Gtk Dependancies
+PKG_CHECK_MODULES(GTK_LUMIERA, [gtkmm-2.4 >= 2.8 gdl-1.0 >= 0.6.1 cairomm-1.0 >= 0.6.0])
+
+AC_SUBST(GTK_LUMIERA_CFLAGS)
+AC_SUBST(GTK_LUMIERA_LIBS)
+
+# END Gtk Dependancies
+
+
 AC_CONFIG_FILES(Makefile)
 AC_OUTPUT

src/gui/Makefile.am

@@ -1,17 +1,76 @@
-## Process this file with automake to produce Makefile.in
+#  Copyright (C)         Lumiera.org
+#    2007,               Joel Holdsworth <joel@airwebreathe.org.uk>
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-SUBDIRS = src po
+lumigui_srcdir = $(top_srcdir)/src/gui
+#noinst_LIBRARIES += liblumigui.a
 
-gtk_lumieradocdir = ${prefix}/doc/gtk-lumiera
+#lumigui_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror
-gtk_lumieradoc_DATA = 
+#lumigui_CPPFLAGS = -I$(top_srcdir)/src/
 
-EXTRA_DIST = $(gtk_lumieradoc_DATA)
+INCLUDES = \
+	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
+	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+	$(GTK_LUMIERA_CFLAGS)
 
-# Copy all the spec files. Of cource, only one is actually used.
+AM_CFLAGS =\
-dist-hook:
+	 -Wall\
-	for specfile in *.spec; do \
+	 -g
-		if test -f $$specfile; then \
-			cp -p $$specfile $(distdir); \
-		fi \
-	done
 
+bin_PROGRAMS += lumigui
+
+lumigui_SOURCES =                                            \
+	  $(lumigui_srcdir)/gtk-lumiera.cpp                   \
+    $(lumigui_srcdir)/gtk-lumiera.hpp                   \
+	  $(lumigui_srcdir)/window-manager.cpp                \
+    $(lumigui_srcdir)/window-manager.hpp                \
+    $(lumigui_srcdir)/workspace/actions.cpp             \
+    $(lumigui_srcdir)/workspace/actions.hpp             \
+    $(lumigui_srcdir)/workspace/workspace-window.cpp    \
+    $(lumigui_srcdir)/workspace/workspace-window.hpp    \
+    $(lumigui_srcdir)/dialogs/render.cpp                \
+    $(lumigui_srcdir)/dialogs/render.hpp                \
+    $(lumigui_srcdir)/dialogs/preferences-dialog.cpp    \
+    $(lumigui_srcdir)/dialogs/preferences-dialog.hpp    \
+    $(lumigui_srcdir)/panels/panel.cpp                  \
+    $(lumigui_srcdir)/panels/panel.hpp                  \
+    $(lumigui_srcdir)/panels/timeline-panel.cpp         \
+    $(lumigui_srcdir)/panels/timeline-panel.hpp         \
+    $(lumigui_srcdir)/panels/viewer-panel.cpp           \
+    $(lumigui_srcdir)/panels/viewer-panel.hpp           \
+    $(lumigui_srcdir)/panels/assets-panel.cpp           \
+    $(lumigui_srcdir)/panels/asset-panels.hpp           \
+    $(lumigui_srcdir)/widgets/video-display-widget.cpp  \
+    $(lumigui_srcdir)/widgets/video-display-widget.hpp  \
+    $(lumigui_srcdir)/widgets/timeline-widget.cpp       \
+    $(lumigui_srcdir)/widgets/timeline-widget.hpp       \
+    $(lumigui_srcdir)/model/project.cpp                 \
+    $(lumigui_srcdir)/model/project.hpp                 \
+    $(lumigui_srcdir)/output/displayer.cpp              \
+    $(lumigui_srcdir)/output/displayer.hpp              \
+    $(lumigui_srcdir)/output/gdkdisplayer.cpp           \
+    $(lumigui_srcdir)/output/gdkdisplayer.hpp           \
+    $(lumigui_srcdir)/output/xvdisplayer.cpp            \
+    $(lumigui_srcdir)/output/xvdisplayer.hpp
+
+lumigui_LDFLAGS = 
+lumigui_LDADD = $(GTK_LUMIERA_LIBS) 
+
+themesdir = $(datadir)/themes
+themes_DATA = $(lumigui_srcdir)/lumiera_ui.rc
+
+EXTRA_DIST += $(themes_DATA)

src/gui/src/Makefile.am

@@ -1,55 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-INCLUDES = \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-	$(GTK_LUMIERA_CFLAGS)
-
-AM_CFLAGS =\
-	 -Wall\
-	 -g
-
-bin_PROGRAMS = gtk-lumiera
-
-gtk_lumiera_SOURCES =                 \
-	  gtk-lumiera.cpp                   \
-    gtk-lumiera.hpp                   \
-	  window-manager.cpp                \
-    window-manager.hpp                \
-    workspace/actions.cpp             \
-    workspace/actions.hpp             \
-    workspace/workspace-window.cpp    \
-    workspace/workspace-window.hpp    \
-    dialogs/render.cpp                \
-    dialogs/render.hpp                \
-    dialogs/preferences-dialog.cpp    \
-    dialogs/preferences-dialog.hpp    \
-    panels/panel.cpp                  \
-    panels/panel.hpp                  \
-    panels/timeline-panel.cpp         \
-    panels/timeline-panel.hpp         \
-    panels/viewer-panel.cpp           \
-    panels/viewer-panel.hpp           \
-    panels/assets-panel.cpp           \
-    panels/asset-panels.hpp           \
-    widgets/video-display-widget.cpp  \
-    widgets/video-display-widget.hpp  \
-    widgets/timeline-widget.cpp       \
-    widgets/timeline-widget.hpp       \
-    model/project.cpp                 \
-    model/project.hpp                 \
-    output/displayer.cpp              \
-    output/displayer.hpp              \
-    output/gdkdisplayer.cpp           \
-    output/gdkdisplayer.hpp           \
-    output/xvdisplayer.cpp            \
-    output/xvdisplayer.hpp            
-
-gtk_lumiera_LDFLAGS = 
-
-gtk_lumiera_LDADD = $(GTK_LUMIERA_LIBS)
-
-EXTRA_DIST = 
-
-

src/gui/workspace/workspace-window.cpp

@@ -32,7 +32,7 @@
 #include <libgdl-1.0/gdl/gdl-dock-placeholder.h>
 #include <libgdl-1.0/gdl/gdl-dock-bar.h>
 
-#include "gtk-lumiera.hpp"
+#include "../gtk-lumiera.hpp"
 #include "workspace-window.hpp"
 
 using namespace Gtk;