- Reorganize sources to split them across three parts:

- The main program, the frontend
	- A pyton loader library
	- The backend library
Happy hacking.


git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@240 3ecf2c5c-341e-0410-92b4-d18e462d057c

src/Makefile.am

@@ -18,7 +18,7 @@
 # along with SGPEMv2; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-SUBDIRS = builtin-policies gtkgui pyloader testsuite
+SUBDIRS = backend builtin-policies pyloader testsuite
 
 #additional rules:
 %_wrap.cc : %.i
@@ -36,16 +36,26 @@ localedir = @datadir@/locale
 sgpemv2_CPPFLAGS = -I@top_srcdir@ \
 		-DPYCDIR="\"$(pycdir)\"" \
 		-DMODDIR="\"$(moddir)\"" \
-		-DLOCALEDIR="\"$(localedir)\""
-sgpemv2_LDFLAGS = -L@builddir@/gtkgui -L@builddir@/pyloader
-sgpemv2_LDADD = -lgtkgui -lpyloader
+		-DLOCALEDIR="\"$(localedir)\"" \
+		$(CAIRO_CFLAGS) \
+		$(GTKMM_CFLAGS)
+sgpemv2_LDFLAGS = -L@builddir@/backend -L@builddir@/pyloader
+sgpemv2_LDADD = -lbackend -lpyloader \
+		$(CAIRO_LIBS) \
+		$(GTKMM_LIBS)
 
 # Please keep this in sorted order:
 sgpemv2_SOURCES = \
+	graphicalterminalio.cc \
 	main.cc \
-	parseopts.cc
+	mainwindow.cc \
+	parseopts.cc \
+	startgui.cc
 
 noinst_HEADERS = \
+	iomanager.hh \
 	main.hh \
+	mainwindow.hh \
+	startgui.hh \
+	graphicalterminalio.hh \
 	parseopts.hh
-

src/backend/Makefile.am

@@ -1,4 +1,4 @@
-# src/gtkgui/Makefile.am - Copyright 2005, 2006, University
+# src/backend/Makefile.am - Copyright 2005, 2006, University
 #               of Padova, dept. of Pure and Applied
 #               Mathematics
 #
@@ -18,11 +18,15 @@
 # along with SGPEMv2; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-# If needed, setup testsuite for this component
-# SUBDIRS = testsuite
+# you'll want to setup a testsuite for this component, sooner or later.
+#SUBDIRS = testsuite
+
+#additional rules:
+%_wrap.cc : %.i
+	$(SWIG) $(SWIG_PYTHON_OPT) -o $@  $<
 
 # Program & library names
-pkglib_LTLIBRARIES = libgtkgui.la
+pkglib_LTLIBRARIES = libbackend.la
 
 # Other directories
 sharedir = @datadir@/sgpemv2
@@ -30,25 +34,22 @@ pycdir = $(sharedir)/policies
 moddir = $(sharedir)/modules
 localedir = @datadir@/locale
 
-libgtkgui_la_CPPFLAGS = -I@top_srcdir@ \
+libbackend_la_CPPFLAGS = -I@top_srcdir@ \
 		-DPYCDIR="\"$(pycdir)\"" \
 		-DMODDIR="\"$(moddir)\"" \
-		-DLOCALEDIR="\"$(localedir)\""
-libgtkgui_la_CXXFLAGS = \
-		$(CAIRO_CFLAGS) \
-		$(GTKMM_CFLAGS)
-libgtkgui_la_LIBADD = \
-		$(CAIRO_LIBS) \
-		$(GTKMM_LIBS)
+		-DLOCALEDIR="\"$(localedir)\"" \
+		$(PYTHON_CPPFLAGS)
+libbackend_la_LIBADD = $(PYTHON_LDFLAGS) \
+		$(PYTHON_EXTRA_LIBS)
+libbackend_la_LDFLAGS = $(PYTHON_EXTRA_LDFLAGS)
 
 # Please keep this in sorted order:
-libgtkgui_la_SOURCES = \
-	graphicalterminalio.cc \
-	mainwindow.cc \
-	startgui.cc
+libbackend_la_SOURCES = empty.cc
+
+noinst_HEADERS = 
+
+# !! temp file for debug, will be deleted as soon as 
+# !! source's in place
+empty.cc :
+	echo "int main() {}" > @builddir@/$@
 
-noinst_HEADERS = \
-	iomanager.hh \
-	mainwindow.hh \
-	startgui.hh \
-	graphicalterminalio.hh

src/graphicalterminalio.cc

@@ -1,4 +1,4 @@
-// src/gtkgui/graphicalterminalio.cc - Copyright 2005, 2006, University
+// src/graphicalterminalio.cc - Copyright 2005, 2006, University
 //               of Padova, dept. of Pure and Applied
 //               Mathematics
 //

src/graphicalterminalio.hh

@@ -1,4 +1,4 @@
-// src/gtkgui/graphicalterminalio.hh - Copyright 2005, 2006, University
+// src/graphicalterminalio.hh - Copyright 2005, 2006, University
 //               of Padova, dept. of Pure and Applied
 //               Mathematics
 //
@@ -18,8 +18,8 @@
 // along with SGPEMv2; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-#ifndef GTKGUI_GRAPHICALTERMINALIO_HH
-#define GTKGUI_GRAPHICALTERMINALIO_HH 1
+#ifndef GRAPHICALTERMINALIO_HH
+#define GRAPHICALTERMINALIO_HH 1
 
 #include "config.h"
 #include "gettext.h"

src/iomanager.hh

@@ -1,4 +1,4 @@
-// src/gtkgui/iomanager.hh - Copyright 2005, 2006, University
+// src/iomanager.hh - Copyright 2005, 2006, University
 //               of Padova, dept. of Pure and Applied
 //               Mathematics
 //

src/main.cc

@@ -23,7 +23,7 @@
 
 #include "main.hh"
 #include "parseopts.hh"
-#include "gtkgui/startgui.hh"
+#include "startgui.hh"
 
 #include <algorithm>
 #include <functional>

src/main.hh

@@ -21,7 +21,7 @@
 #ifndef MAIN_HH
 #define MAIN_HH 1
 
-// found in gtkgui/mainwindow.hh
+// found in mainwindow.hh
 extern void build_gui(int argc, char** argv);
 
 #endif

src/mainwindow.cc

@@ -1,4 +1,4 @@
-// src/gtkgui/mainwindow.cc - Copyright 2005, 2006, University
+// src/mainwindow.cc - Copyright 2005, 2006, University
 //               of Padova, dept. of Pure and Applied
 //               Mathematics
 //

src/mainwindow.hh

@@ -1,4 +1,4 @@
-// src/gtkgui/mainwindow.hh - Copyright 2005, 2006, University
+// src/mainwindow.hh - Copyright 2005, 2006, University
 //               of Padova, dept. of Pure and Applied
 //               Mathematics
 //

src/startgui.cc

@@ -1,4 +1,4 @@
-// src/gtkgui/startgui.cc - Copyright 2005, 2006, University
+// src/startgui.cc - Copyright 2005, 2006, University
 //               of Padova, dept. of Pure and Applied
 //               Mathematics
 //

src/startgui.hh

@@ -1,4 +1,4 @@
-// src/gtkgui/startgui.hh - Copyright 2005, 2006, University
+// src/startgui.hh - Copyright 2005, 2006, University
 //               of Padova, dept. of Pure and Applied
 //               Mathematics
 //