Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix variable name in Makefiles. #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix variable name in Makefiles. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions src/DiNo/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
########################################

# choice of compilers
CPLUSPLUS = g++
CXX = g++
FLEX = flex
BYACC = byacc

Expand All @@ -28,7 +28,7 @@ INCLUDE_DIR = include/
COMPILER_DEFINES = -DNO_RUN_TIME_CHECKING -DCATCH_DIV -DSYSCONF_RDCL -D_FILE_OFFSET_BITS=64
COMPILER_SWITCHES = -m32 -w -O4
PDDL_PARSER_NAME = pddl2upm
DINO_DEFINES = -DCOMPILER_NAME=$(CPLUSPLUS) -DCOMPILER_DEFINES="$(COMPILER_DEFINES)" -DCOMPILER_SWITCHES="$(COMPILER_SWITCHES)" -DPDDL_PARSER_NAME=$(PDDL_PARSER_NAME)
DINO_DEFINES = -DCOMPILER_NAME=$(CXX) -DCOMPILER_DEFINES="$(COMPILER_DEFINES)" -DCOMPILER_SWITCHES="$(COMPILER_SWITCHES)" -DPDDL_PARSER_NAME=$(PDDL_PARSER_NAME)

#uncomment and write the correct validator path to enable automatic plan validation
VAL_DIR:=$(strip $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
Expand All @@ -55,62 +55,62 @@ OBJS = \
util.o

dino: $(OBJS)
$(CPLUSPLUS) -g -o dino $(CFLAGS) $(OBJS)
$(CXX) -g -o dino $(CFLAGS) $(OBJS)
mv dino ../../$(BIN_DIR)

mu.o: mu.cpp mu.hpp y.tab.h
$(CPLUSPLUS) -c $(CFLAGS) $(DINO_DEFINES) $(VAL_DEFINES) mu.cpp
$(CXX) -c $(CFLAGS) $(DINO_DEFINES) $(VAL_DEFINES) mu.cpp

cpp_code.o: cpp_code.cpp mu.hpp y.tab.h
$(CPLUSPLUS) -g -c $(CFLAGS) $(DINO_DEFINES) $(VAL_DEFINES) cpp_code.cpp
$(CXX) -g -c $(CFLAGS) $(DINO_DEFINES) $(VAL_DEFINES) cpp_code.cpp

cpp_code_as.o: cpp_code_as.cpp mu.hpp y.tab.h
$(CPLUSPLUS) -c $(CFLAGS) cpp_code_as.cpp
$(CXX) -c $(CFLAGS) cpp_code_as.cpp

cpp_sym.o: cpp_sym.cpp mu.hpp y.tab.h
$(CPLUSPLUS) -c $(CFLAGS) cpp_sym.cpp
$(CXX) -c $(CFLAGS) cpp_sym.cpp

cpp_sym_aux.o: cpp_sym_aux.cpp mu.hpp y.tab.h
$(CPLUSPLUS) -c $(CFLAGS) cpp_sym_aux.cpp
$(CXX) -c $(CFLAGS) cpp_sym_aux.cpp

cpp_sym_decl.o: cpp_sym_decl.cpp mu.hpp y.tab.h
$(CPLUSPLUS) -c $(CFLAGS) cpp_sym_decl.cpp
$(CXX) -c $(CFLAGS) cpp_sym_decl.cpp

decl.o: decl.cpp mu.hpp y.tab.h
$(CPLUSPLUS) -c $(CFLAGS) decl.cpp
$(CXX) -c $(CFLAGS) decl.cpp

error.o: error.cpp mu.hpp y.tab.h
$(CPLUSPLUS) -c $(CFLAGS) error.cpp
$(CXX) -c $(CFLAGS) error.cpp

expr.o: expr.cpp mu.hpp y.tab.h
$(CPLUSPLUS) -c $(CFLAGS) expr.cpp
$(CXX) -c $(CFLAGS) expr.cpp

lextable.o: lextable.cpp mu.hpp lextable.hpp y.tab.h
$(CPLUSPLUS) -c $(CFLAGS) lextable.cpp
$(CXX) -c $(CFLAGS) lextable.cpp

rule.o: rule.cpp mu.hpp y.tab.h
$(CPLUSPLUS) -c $(CFLAGS) rule.cpp
$(CXX) -c $(CFLAGS) rule.cpp

stmt.o: stmt.cpp mu.hpp y.tab.h
$(CPLUSPLUS) -c $(CFLAGS) stmt.cpp
$(CXX) -c $(CFLAGS) stmt.cpp

symtab.o: symtab.cpp mu.hpp lextable.hpp y.tab.h
$(CPLUSPLUS) -c $(CFLAGS) symtab.cpp
$(CXX) -c $(CFLAGS) symtab.cpp

util.o: util.cpp mu.hpp y.tab.h
$(CPLUSPLUS) -c $(CFLAGS) util.cpp
$(CXX) -c $(CFLAGS) util.cpp

parse.o: parse.cpp mu.hpp y.tab.h
$(CPLUSPLUS) -c $(CFLAGS) parse.cpp
$(CXX) -c $(CFLAGS) parse.cpp

lex.yy.o: lex.yy.c mu.hpp lextable.hpp
$(CPLUSPLUS) -c $(CFLAGS) lex.yy.c
$(CXX) -c $(CFLAGS) lex.yy.c

lex.yy.c: mu.l mu.hpp y.tab.h
$(FLEX) mu.l

y.tab.o: y.tab.c mu.hpp y.tab.h
$(CPLUSPLUS) -c -DYYDEBUG=0 -DYYMAXDEPTH=25000 $(CFLAGS) y.tab.c
$(CXX) -c -DYYDEBUG=0 -DYYMAXDEPTH=25000 $(CFLAGS) y.tab.c

y.tab.c + y.tab.h: mu.y
$(BYACC) -dt mu.y
Expand Down
10 changes: 5 additions & 5 deletions src/DiNo_parser/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# choice of compilers
CPLUSPLUS = g++
CXX = g++
FLEX = flex++
#FLEX = flex-+
BYACC = bison
Expand All @@ -20,17 +20,17 @@ OBJS = pddl+.o \
ptree.o

pddl2upm: pddl+.o parse.o ptree.o
$(CPLUSPLUS) -g $(OBJS) -o pddl2upm $(CFLAGS)
$(CXX) -g $(OBJS) -o pddl2upm $(CFLAGS)
mv pddl2upm ../../$(PDDL_PARSER_DIR)

pddl+.o: pddl+.cpp lex.yy.cc
$(CPLUSPLUS) -c pddl+.cpp $(CFLAGS)
$(CXX) -c pddl+.cpp $(CFLAGS)

parse.o: parse.cpp
$(CPLUSPLUS) -c parse.cpp $(CFLAGS)
$(CXX) -c parse.cpp $(CFLAGS)

ptree.o: ptree.cpp
$(CPLUSPLUS) -c ptree.cpp $(CFLAGS)
$(CXX) -c ptree.cpp $(CFLAGS)

lex.yy.cc: pddl+.lex
$(FLEX) pddl+.lex
Expand Down