source tree reorg

Makefile

@@ -1,20 +1,20 @@
 OSTD_PATH = ../octastd
 
 LIBCS_CXXFLAGS = \
-	-std=c++14 -Wall -Wextra -Wshadow -Wold-style-cast -I. -g \
+	-std=c++14 -Wall -Wextra -Wshadow -Wold-style-cast -Iinclude -Isrc -g \
 	-fvisibility=hidden -I$(OSTD_PATH)
 
 LIBCS_LDFLAGS = -shared
 
 LIBCS_OBJ = \
-	cubescript.o \
-	cs_gen.o \
-	cs_vm.o \
-	cs_val.o \
-	cs_util.o \
-	lib_str.o \
-	lib_math.o \
-	lib_list.o
+	src/cubescript.o \
+	src/cs_gen.o \
+	src/cs_vm.o \
+	src/cs_val.o \
+	src/cs_util.o \
+	src/lib_str.o \
+	src/lib_math.o \
+	src/lib_list.o
 
 LIBCS_LIB = libcubescript.a
 
@@ -34,7 +34,7 @@ repl: $(LIBCS_LIB) tools/repl.cc tools/linenoise.cc tools/linenoise.hh
 	tools/linenoise.cc tools/repl.cc -o repl $(LIBCS_LIB)
 
 clean:
-	rm -f $(LIBCS_LIB) $(LIBCS_OBJ)
+	rm -f $(LIBCS_LIB) $(LIBCS_OBJ) repl
 
 cubescript.o: cubescript.hh cubescript_conf.hh cs_vm.hh
 cs_gen.o: cubescript.hh cubescript_conf.hh cs_vm.hh cs_util.hh

src/cs_gen.cc

@@ -1,4 +1,4 @@
-#include "cubescript.hh"
+#include "cubescript/cubescript.hh"
 #include "cs_vm.hh"
 #include "cs_util.hh"
 

src/cs_util.cc

@@ -1,4 +1,4 @@
-#include "cubescript_conf.hh"
+#include "cubescript/cubescript_conf.hh"
 #include "cs_util.hh"
 
 #include <ctype.h>

src/cs_val.cc

@@ -1,4 +1,4 @@
-#include "cubescript.hh"
+#include "cubescript/cubescript.hh"
 #include "cs_vm.hh"
 #include "cs_util.hh"
 

src/cs_vm.cc

@@ -1,4 +1,4 @@
-#include "cubescript.hh"
+#include "cubescript/cubescript.hh"
 #include "cs_vm.hh"
 #include "cs_util.hh"
 

src/cs_vm.hh

@@ -1,7 +1,7 @@
 #ifndef LIBCUBESCRIPT_CS_VM_HH
 #define LIBCUBESCRIPT_CS_VM_HH
 
-#include "cubescript.hh"
+#include "cubescript/cubescript.hh"
 
 #include <stdlib.h>
 

src/cubescript.cc

@@ -1,4 +1,4 @@
-#include "cubescript.hh"
+#include "cubescript/cubescript.hh"
 #include "cs_vm.hh"
 
 namespace cscript {

src/lib_list.cc

@@ -1,4 +1,4 @@
-#include "cubescript.hh"
+#include "cubescript/cubescript.hh"
 #include "cs_util.hh"
 
 namespace cscript {

src/lib_math.cc

@@ -3,7 +3,7 @@
 
 #include <ostd/functional.hh>
 
-#include "cubescript.hh"
+#include "cubescript/cubescript.hh"
 
 namespace cscript {
 

src/lib_str.cc

@@ -1,6 +1,6 @@
 #include <ostd/functional.hh>
 
-#include "cubescript.hh"
+#include "cubescript/cubescript.hh"
 
 namespace cscript {
 

tools/repl.cc

@@ -5,7 +5,7 @@
 #include <ostd/string.hh>
 #include <ostd/maybe.hh>
 
-#include <cubescript.hh>
+#include <cubescript/cubescript.hh>
 
 using namespace cscript;
 
@@ -157,9 +157,9 @@ static CsCommand *get_hint_cmd(ostd::ConstCharRange buf) {
 }
 #endif /* CS_REPL_HAS_HINTS */
 
-#include "tools/edit_linenoise.hh"
-#include "tools/edit_readline.hh"
-#include "tools/edit_fallback.hh"
+#include "edit_linenoise.hh"
+#include "edit_readline.hh"
+#include "edit_fallback.hh"
 
 /* usage */