KCL-Planning · rpgoldman · Sep 14, 2016 · Sep 8, 2017 · Sep 8, 2017 · Sep 9, 2017
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+*.o
+validate
+tan
+*.dSYM
diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ SEARCHDIRS := -I${MYCODEDIR} -I${PARSER}
 
 # makemake variables
 
-DEPENDFLAGS := -g -Wall -Werror ${SEARCHDIRS}
+DEPENDFLAGS := -g -Wall ${SEARCHDIRS}
 
 # C preprocessor (C, C++, FORTRAN)
 
@@ -39,6 +39,16 @@ CFLAGS  = ${DEPENDFLAGS}
 CXX      ?= g++
 CXXFLAGS  = ${DEPENDFLAGS} -ansi -Wall
 
+# C/C++/Eiffel/FORTRAN linker
+
+LINKER    := $(CXX) -g
+LDFLAGS    = 
+LOADLIBES := 
+
+# LEX generator
+LEX	?= flex
+YACC	?= bison
+
 %.o : %.cc
 	${CXX} ${CPPFLAGS} ${CXXFLAGS} -c $< -o $@
 
@@ -52,20 +62,7 @@ CXXFLAGS  = ${DEPENDFLAGS} -ansi -Wall
 	${CXX} ${CPPFLAGS} ${CXXFLAGS} -c $< -o $@
 
 %.cpp : %.yacc
-	flex -+ src/Parser/pddl+.lex -o /src/Parser/lex.yy.cc; bison $< -o src/pddl+.cpp
-
-
-
-# C/C++/Eiffel/FORTRAN linker
-
-LINKER    := g++ -g 
-LDFLAGS    = 
-LOADLIBES := 
-
-
-
-# This is what makemake added
-
+	${LEX} -+ src/Parser/pddl+.lex -o /src/Parser/lex.yy.cc; ${YACC} $< -o src/pddl+.cpp
 
 # validate
 

diff --git a/obj/parser/src/DebugWriteController.o b/obj/parser/src/DebugWriteController.o
diff --git a/obj/parser/src/parse.o b/obj/parser/src/parse.o
diff --git a/obj/parser/src/pddl+.o b/obj/parser/src/pddl+.o
diff --git a/obj/parser/src/ptree.o b/obj/parser/src/ptree.o
diff --git a/obj/tan/src/DebugWriteController.o b/obj/tan/src/DebugWriteController.o
diff --git a/obj/tan/src/FuncAnalysis.o b/obj/tan/src/FuncAnalysis.o
diff --git a/obj/tan/src/TypedAnalyser.o b/obj/tan/src/TypedAnalyser.o
diff --git a/obj/tan/src/TypedAnalysis.o b/obj/tan/src/TypedAnalysis.o
diff --git a/obj/tan/src/pddl+.o b/obj/tan/src/pddl+.o
diff --git a/obj/tan/src/ptree.o b/obj/tan/src/ptree.o
diff --git a/obj/tan/src/typecheck.o b/obj/tan/src/typecheck.o
diff --git a/obj/validate/src/Action.o b/obj/validate/src/Action.o
diff --git a/obj/validate/src/Analysis.o b/obj/validate/src/Analysis.o
diff --git a/obj/validate/src/CausalGraph.o b/obj/validate/src/CausalGraph.o
diff --git a/obj/validate/src/Commitments.o b/obj/validate/src/Commitments.o
diff --git a/obj/validate/src/DebugWriteController.o b/obj/validate/src/DebugWriteController.o
diff --git a/obj/validate/src/Environment.o b/obj/validate/src/Environment.o
diff --git a/obj/validate/src/Evaluator.o b/obj/validate/src/Evaluator.o
diff --git a/obj/validate/src/Events.o b/obj/validate/src/Events.o
diff --git a/obj/validate/src/FastEnvironment.o b/obj/validate/src/FastEnvironment.o
diff --git a/obj/validate/src/FuncExp.o b/obj/validate/src/FuncExp.o
diff --git a/obj/validate/src/LaTeXSupport.o b/obj/validate/src/LaTeXSupport.o
diff --git a/obj/validate/src/Ownership.o b/obj/validate/src/Ownership.o
diff --git a/obj/validate/src/Plan.o b/obj/validate/src/Plan.o
diff --git a/obj/validate/src/Polynomial.o b/obj/validate/src/Polynomial.o
diff --git a/obj/validate/src/PrettyPrinter.o b/obj/validate/src/PrettyPrinter.o
diff --git a/obj/validate/src/Proposition.o b/obj/validate/src/Proposition.o
diff --git a/obj/validate/src/RepairAdvice.o b/obj/validate/src/RepairAdvice.o
diff --git a/obj/validate/src/RobustAnalyse.o b/obj/validate/src/RobustAnalyse.o
diff --git a/obj/validate/src/SimpleEval.o b/obj/validate/src/SimpleEval.o
diff --git a/obj/validate/src/State.o b/obj/validate/src/State.o
diff --git a/obj/validate/src/TIM.o b/obj/validate/src/TIM.o
diff --git a/obj/validate/src/TimSupport.o b/obj/validate/src/TimSupport.o
diff --git a/obj/validate/src/TrajectoryConstraints.o b/obj/validate/src/TrajectoryConstraints.o
diff --git a/obj/validate/src/Utils.o b/obj/validate/src/Utils.o
diff --git a/obj/validate/src/Validator.o b/obj/validate/src/Validator.o
diff --git a/obj/validate/src/main.o b/obj/validate/src/main.o
diff --git a/obj/validate/src/pddl+.o b/obj/validate/src/pddl+.o
diff --git a/obj/validate/src/ptree.o b/obj/validate/src/ptree.o
diff --git a/obj/validate/src/random.o b/obj/validate/src/random.o
diff --git a/obj/validate/src/typecheck.o b/obj/validate/src/typecheck.o
diff --git a/parser b/parser
diff --git a/src/Action.o b/src/Action.o
diff --git a/src/DebugWriteController.o b/src/DebugWriteController.o
diff --git a/src/Environment.o b/src/Environment.o
diff --git a/src/Events.o b/src/Events.o
diff --git a/src/FuncAnalysis.o b/src/FuncAnalysis.o
diff --git a/src/FuncExp.o b/src/FuncExp.o
diff --git a/src/LaTeXSupport.o b/src/LaTeXSupport.o
diff --git a/src/Ownership.o b/src/Ownership.o
diff --git a/src/Plan.o b/src/Plan.o
diff --git a/src/Polynomial.o b/src/Polynomial.o
diff --git a/src/PrettyPrinter.o b/src/PrettyPrinter.o
diff --git a/src/Proposition.o b/src/Proposition.o
diff --git a/src/RepairAdvice.o b/src/RepairAdvice.o
diff --git a/src/RobustAnalyse.o b/src/RobustAnalyse.o
diff --git a/src/State.o b/src/State.o
diff --git a/src/TrajectoryConstraints.o b/src/TrajectoryConstraints.o
diff --git a/src/TypedAnalyser.o b/src/TypedAnalyser.o
diff --git a/src/TypedAnalysis.o b/src/TypedAnalysis.o
diff --git a/src/Utils.o b/src/Utils.o
diff --git a/src/Validator.o b/src/Validator.o
diff --git a/src/main.o b/src/main.o
diff --git a/src/pddl+.o b/src/pddl+.o
diff --git a/src/ptree.o b/src/ptree.o
diff --git a/src/random.o b/src/random.o
diff --git a/src/typecheck.o b/src/typecheck.o
diff --git a/tan b/tan
diff --git a/validate b/validate