Skip to content

Commit 1cbe0c3

Browse files
committed
fix locations
1 parent 1280bfe commit 1cbe0c3

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

Makefile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ INCLUDES := -Iinclude
66
SRC_DIR := ./src/parsergen
77
OBJ_DIR := ./build/obj
88
BIN_DIR := ./bin
9+
LIB_DIR := ./lib
910
BIN_EXT := .exe
1011

1112
SRC_FILES := $(wildcard $(SRC_DIR)/*.cpp)
@@ -26,39 +27,39 @@ endif
2627
.DEFAULT_GOAL := example
2728

2829
libparsergen: $(OBJ_FILES)
29-
ar rcs bin/libparsergen.a $(OBJ_FILES) $(FMT_OBJ)
30+
ar rcs $(LIB_DIR)/libparsergen.a $(OBJ_FILES) $(FMT_OBJ)
3031

3132
$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
3233
$(CXX) $(INCLUDES) $(CXXFLAGS) -c $< -o $@
3334

3435
$(PARSERGEN): libparsergen
35-
$(CXX) $(INCLUDES) $(CXXFLAGS) ./src/main.cpp -L$(BIN_DIR) -lparsergen -o $(BIN_DIR)/$(PARSERGEN_NAME)$(BIN_EXT)
36+
$(CXX) $(INCLUDES) $(CXXFLAGS) ./src/main.cpp -L$(LIB_DIR) -lparsergen -o $(BIN_DIR)/$(PARSERGEN_NAME)$(BIN_EXT)
3637

3738
fmt:
3839
$(CXX) $(INCLUDES) $(CXXFLAGS) -c src/format.cc -o $(FMT_OBJ)
3940

4041

4142
# meta
4243
bootstrap: libparsergen
43-
$(CXX) $(CXXFLAGS) $(INCLUDES) examples/bootstrap_parser.cpp -L$(BIN_DIR) -lparsergen -I. -o $(BIN_DIR)/$@$(BIN_EXT)
44+
$(CXX) $(CXXFLAGS) $(INCLUDES) examples/bootstrap_parser.cpp -L$(LIB_DIR) -lparsergen -I. -o $(BIN_DIR)/$@$(BIN_EXT)
4445

4546
metagrammar: libparsergen $(PARSERGEN)
4647
$(PARSERGEN) $(SRC_DIR)/metagrammar.gram -o include/parsergen/grammar_parser.hpp
4748

4849
# Calculator
4950
calc: libparsergen $(PARSERGEN)
5051
$(PARSERGEN) examples/calc/calc.gram -o examples/calc/calc.hpp
51-
$(CXX) $(CXXFLAGS) $(INCLUDES) examples/calc/main.cpp -L$(BIN_DIR) -lparsergen -I. -o $(BIN_DIR)/$@$(BIN_EXT)
52+
$(CXX) $(CXXFLAGS) $(INCLUDES) examples/calc/main.cpp -L$(LIB_DIR) -lparsergen -I. -o $(BIN_DIR)/$@$(BIN_EXT)
5253

5354
# JSON parser
5455
json: libparsergen $(PARSERGEN)
5556
$(PARSERGEN) examples/json/json.gram -o examples/json/json_parser.hpp
56-
$(CXX) $(CXXFLAGS) $(INCLUDES) examples/json/main.cpp -L$(BIN_DIR) -lparsergen -I. -o $(BIN_DIR)/$@$(BIN_EXT)
57+
$(CXX) $(CXXFLAGS) $(INCLUDES) examples/json/main.cpp -L$(LIB_DIR) -lparsergen -I. -o $(BIN_DIR)/$@$(BIN_EXT)
5758

5859
test: libparsergen
59-
$(CXX) $(CXXFLAGS) $(INCLUDES) -Itests tests/main.cpp -L$(BIN_DIR) -lparsergen -I. -o $(BIN_DIR)/$@$(BIN_EXT)
60+
$(CXX) $(CXXFLAGS) $(INCLUDES) -Itests tests/main.cpp -L$(LIB_DIR) -lparsergen -I. -o $(BIN_DIR)/$@$(BIN_EXT)
6061

6162
clean:
6263
$(RM) $(call FixPath,$(OBJ_DIR)/*.o)
63-
$(RM) $(call FixPath,$(BIN_DIR)/*.a)
64+
$(RM) $(call FixPath,$(LIB_DIR)/*.a)
6465
$(RM) $(call FixPath,$(BIN_DIR)/*$(BIN_EXT))

0 commit comments

Comments
 (0)