move stuff to ui and printer subdirs

timschmidt · Sep 13, 2012 · 025c818 · 025c818
1 parent 6929e10
commit 025c818
Show file tree

Hide file tree

Showing 30 changed files with 110 additions and 36 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -32,24 +32,17 @@ repsnapper_CPPFLAGS = \
 	-g -O3 $(WARNING_FLAGS)
 
 SHARED_SRC= \
+	src/platform.cpp \
+	src/objtree.cpp \
 	src/model.cpp \
 	src/model2.cpp \
-	src/view.cpp \
-	src/gllight.cpp \
-	src/arcball.cpp \
-	src/objtree.cpp \
 	src/shape.cpp \
-	src/triangle.cpp \
 	src/flatshape.cpp \
-	src/files.cpp \
-	src/filechooser.cpp \
-	src/platform.cpp \
+	src/triangle.cpp \
+	src/gllight.cpp \
+	src/arcball.cpp \
 	src/render.cpp \
-	src/reprap_serial.cpp \
-	src/printer.cpp \
-	src/printer2.cpp \
-	src/progress.cpp \
-	src/connectview.cpp \
+	src/files.cpp \
 	src/settings.cpp \
 	src/settings-ui.cpp
 
@@ -64,21 +57,17 @@ SHARED_INC= \
 	src/triangle.h \
 	src/flatshape.h \
 	src/files.h \
-	src/filechooser.h \
 	src/stdafx.h \
 	src/platform.h \
 	src/render.h \
-	src/reprap_serial.h \
-	src/printer.h \
-	src/progress.h \
-	src/connectview.h \
 	src/settings.h \
 	src/settings-ui.h \
-	src/view.h \
 	src/types.h
 
+include src/ui/Makefile.am
 include src/slicer/Makefile.am
 include src/gcode/Makefile.am
+include src/printer/Makefile.am
 
 # TEST_SOURCES=unittest.cpp
 

diff --git a/src/flatshape.cpp b/src/flatshape.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "flatshape.h"
-#include "progress.h"
+#include "ui/progress.h"
 // #include "settings.h"
 #include "clipping.h"
 

diff --git a/src/gcode/Makefile b/src/gcode/Makefile
@@ -0,0 +1,8 @@
+# Delegate everything to the toplevel makefile
+# this is only here so 'make' works in src/
+all:
+	@$(MAKE) -C ../.. $@
+
+# Catch all rule
+%:
+	@$(MAKE) -C ../.. $@
diff --git a/src/gcode/Makefile.am b/src/gcode/Makefile.am
@@ -0,0 +1,20 @@
+#
+# Combined Makefile for Linux and OS/X
+#
+#
+# Copyright 2009+ Joachim Glauche
+# Copyright 2011 Bas Wijnen <wijnen@debian.org>
+#
+# This file is part of RepSnapper and is made available under
+# the terms of the GNU General Public License, version 2, or at your
+# option, any later version, incorporated herein by reference.
+
+SHARED_SRC += \
+	src/gcode/gcode.cpp \
+	src/gcode/gcodestate.cpp \
+	src/gcode/command.cpp
+
+SHARED_INC += \
+	src/gcode/gcode.h \
+	src/gcode/gcodestate.h \
+	src/gcode/command.h
diff --git a/src/gcode/command.cpp b/src/gcode/command.cpp
@@ -27,7 +27,7 @@
 #include <sstream>
 
 #include "model.h"
-#include "progress.h"
+#include "ui/progress.h"
 #include "geometry.h"
 #include "ctype.h"
 

diff --git a/src/gcode/gcode.cpp b/src/gcode/gcode.cpp
@@ -26,7 +26,7 @@
 #include <sstream>
 
 #include "model.h"
-#include "progress.h"
+#include "ui/progress.h"
 #include "geometry.h"
 #include "ctype.h"
 #include "settings.h"

diff --git a/src/model.cpp b/src/model.cpp
@@ -30,10 +30,9 @@
 #include "model.h"
 #include "objtree.h"
 #include "settings.h"
-#include "connectview.h"
 #include "layer.h"
 #include "infill.h"
-#include "progress.h"
+#include "ui/progress.h"
 #include "shape.h"
 #include "flatshape.h"
 

diff --git a/src/model2.cpp b/src/model2.cpp
@@ -40,9 +40,7 @@
 #include "model.h"
 #include "objtree.h"
 #include "settings.h"
-#include "connectview.h"
-#include "progress.h"
-
+#include "ui/progress.h"
 #include "slicer/layer.h"
 #include "slicer/infill.h"
 #include "slicer/clipping.h"

diff --git a/src/printer/Makefile b/src/printer/Makefile
@@ -0,0 +1,8 @@
+# Delegate everything to the toplevel makefile
+# this is only here so 'make' works in src/
+all:
+	@$(MAKE) -C ../.. $@
+
+# Catch all rule
+%:
+	@$(MAKE) -C ../.. $@
diff --git a/src/printer/Makefile.am b/src/printer/Makefile.am
@@ -0,0 +1,20 @@
+#
+# Combined Makefile for Linux and OS/X
+#
+#
+# Copyright 2009+ Joachim Glauche
+# Copyright 2011 Bas Wijnen <wijnen@debian.org>
+#
+# This file is part of RepSnapper and is made available under
+# the terms of the GNU General Public License, version 2, or at your
+# option, any later version, incorporated herein by reference.
+
+SHARED_SRC += \
+	src/printer/reprap_serial.cpp \
+	src/printer/printer.cpp \
+	src/printer/printer2.cpp
+
+SHARED_INC += \
+	src/printer/reprap_serial.h \
+	src/printer/printer.h
+
diff --git a/src/printer.cpp → src/printer/printer.cpp b/src/printer.cpp → src/printer/printer.cpp
@@ -28,9 +28,9 @@
 #include "config.h"
 
 #include "printer.h"
-#include "view.h"
+#include "ui/view.h"
 
-#include "progress.h"
+#include "ui/progress.h"
 #include "model.h"
 
 #if IOCHANNEL

diff --git a/src/printer.h → src/printer/printer.h b/src/printer.h → src/printer/printer.h
diff --git a/src/printer2.cpp → src/printer/printer2.cpp b/src/printer2.cpp → src/printer/printer2.cpp
diff --git a/src/printer_iochannel.cpp → src/printer/printer_iochannel.cpp b/src/printer_iochannel.cpp → src/printer/printer_iochannel.cpp
diff --git a/src/printer_libreprap.cpp → src/printer/printer_libreprap.cpp b/src/printer_libreprap.cpp → src/printer/printer_libreprap.cpp
diff --git a/src/reprap_serial.cpp → src/printer/reprap_serial.cpp b/src/reprap_serial.cpp → src/printer/reprap_serial.cpp
diff --git a/src/reprap_serial.h → src/printer/reprap_serial.h b/src/reprap_serial.h → src/printer/reprap_serial.h
diff --git a/src/render.cpp b/src/render.cpp
@@ -23,7 +23,7 @@
 #include "arcball.h"
 #include "gllight.h"
 #include "settings.h"
-#include "view.h"
+#include "ui/view.h"
 #include "model.h"
 #include "slicer/geometry.h"
 

diff --git a/src/repsnapper.cpp b/src/repsnapper.cpp
@@ -25,10 +25,10 @@
 #include <giomm/file.h>
 #include <gtk/gtkgl.h>
 
-#include "view.h"
-#include "model.h"
+#include "ui/view.h"
+#include "ui/progress.h"
 #include "gcode/gcode.h"
-#include "progress.h"
+#include "model.h"
 
 using namespace std;
 

diff --git a/src/shape.cpp b/src/shape.cpp
@@ -20,7 +20,7 @@
 
 #include "shape.h"
 #include "files.h"
-#include "progress.h"
+#include "ui/progress.h"
 #include "settings.h"
 #include "clipping.h"
 

diff --git a/src/ui/Makefile b/src/ui/Makefile
@@ -0,0 +1,8 @@
+# Delegate everything to the toplevel makefile
+# this is only here so 'make' works in src/
+all:
+	@$(MAKE) -C ../.. $@
+
+# Catch all rule
+%:
+	@$(MAKE) -C ../.. $@
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
@@ -0,0 +1,24 @@
+#
+# Combined Makefile for Linux and OS/X
+#
+#
+# Copyright 2009+ Joachim Glauche
+# Copyright 2011 Bas Wijnen <wijnen@debian.org>
+#
+# This file is part of RepSnapper and is made available under
+# the terms of the GNU General Public License, version 2, or at your
+# option, any later version, incorporated herein by reference.
+
+SHARED_SRC += \
+	src/ui/view.cpp \
+	src/ui/connectview.cpp \
+	src/ui/filechooser.cpp \
+	src/ui/progress.cpp
+
+SHARED_INC += \
+	src/ui/view.h \
+	src/ui/connectview.h \
+	src/ui/filechooser.h \
+	src/ui/progress.h
+
+
diff --git a/src/connectview.cpp → src/ui/connectview.cpp b/src/connectview.cpp → src/ui/connectview.cpp
diff --git a/src/connectview.h → src/ui/connectview.h b/src/connectview.h → src/ui/connectview.h
@@ -22,7 +22,7 @@
 #include <gtkmm.h>
 #include "types.h"
 
-#include "printer.h"
+#include "printer/printer.h"
 
 class ConnectView : public Gtk::VBox {
   Gtk::HBox	     m_hbox;

diff --git a/src/filechooser.cpp → src/ui/filechooser.cpp b/src/filechooser.cpp → src/ui/filechooser.cpp
diff --git a/src/filechooser.h → src/ui/filechooser.h b/src/filechooser.h → src/ui/filechooser.h
diff --git a/src/progress.cpp → src/ui/progress.cpp b/src/progress.cpp → src/ui/progress.cpp
diff --git a/src/progress.h → src/ui/progress.h b/src/progress.h → src/ui/progress.h
diff --git a/src/view.cpp → src/ui/view.cpp b/src/view.cpp → src/ui/view.cpp
diff --git a/src/view.h → src/ui/view.h b/src/view.h → src/ui/view.h
@@ -23,7 +23,7 @@
 #include <gtkmm.h>
 
 #include "stdafx.h"
-#include "printer.h"
+#include "printer/printer.h"
 
 #include "filechooser.h"