Permalink
Browse files

Added MakeSimple

    To make this easy to use modified the names of the libraries and thus include directories.
    This overall made the code more consistent.
  • Loading branch information...
1 parent 10cc234 commit 024ec7797f23a3c5131705f03cd264745ad8ceca Martin York committed Jul 17, 2012
Showing with 29 additions and 7 deletions.
  1. +1 −1 Json/Makefile
  2. +22 −0 MakeSimple
  3. +2 −2 Serialize/JsonSerializer.h
  4. +3 −3 Serialize/Makefile
  5. +1 −1 build
View
@@ -2,7 +2,7 @@
THORSANVIL_ROOT = $(realpath ../)
-TARGET = json.slib
+TARGET = Json.slib
EXTRA_HEADERS = ParserShiftReduce.tab.hpp location.hh position.hh stack.hh
CLEAN_EXTRA = location.hh position.hh stack.hh
NOCOVERAGE = Lexer.lex ParserShiftReduce.tab
View
@@ -0,0 +1,22 @@
+
+SRC = $(wildcard Json/*.cpp) $(wildcard Serialize/*.cpp)
+OBJ = $(patsubst %.cpp,%.o,$(SRC))
+
+CXXFLAGS += -Wno-c++11-extensions
+CPPFLAGS += -I. -Ibuild/include -Ibuild/include3rd
+
+serialize.a: $(OBJ)
+ $(AR) $(ARFLAGS) $@ $(OBJ)
+
+Json/ParserRecursive.cpp: Json/ParserShiftReduce.tab.cpp
+
+%.o: %.cpp
+ $(CXX) -c $^ -o $@ $(CPPFLAGS) $(CXXFLAGS)
+
+%.tab.cpp: %.y
+ $(YACC) -o $@ -d $<
+
+%.lex.cpp: %.l
+ $(LEX) -t $< | sed -e 's/<stdout>/$*.lex.cpp/' -e 's/extern "C" int isatty/\/\/ Removed extern "C" int isatty/' > $@
+
+
@@ -60,8 +60,8 @@
* std::cout << jsonExport(vec) << "\n";
* std::cin >> jsonImport(vec);
*/
-#include "json/ScannerSax.h"
-#include "json/ParserShiftReduce.h"
+#include "Json/ScannerSax.h"
+#include "Json/ParserShiftReduce.h"
#include <boost/mpl/at.hpp>
#include <boost/mpl/pop_front.hpp>
#include <boost/mpl/for_each.hpp>
View
@@ -1,9 +1,9 @@
THORSANVIL_ROOT = $(realpath ../)
-LINK_LIBS = json
-TARGET = serialize.slib
-UNITTEST_LINK_LIBS = json
+LINK_LIBS = Json
+TARGET = Serialize.slib
+UNITTEST_LINK_LIBS = Json
include ${THORSANVIL_ROOT}/build/tools/Makefile
2 build
Submodule build updated from fdb563 to 9c461b

0 comments on commit 024ec77

Please sign in to comment.