Skip to content

Commit

Permalink
Merge pull request nojhan#18 from IOHprofiler/developing
Browse files Browse the repository at this point in the history 
update Makefile
  • Loading branch information
@FurongYe
FurongYe committed Sep 27, 2019
2 parents 05f5a16 + 8812d23 commit dff318a
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 73 deletions.
14 changes: 2 additions & 12 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,8 @@ SUBDIRS=src
ROOT_DIR=$(shell pwd)
OBJS_DIR=build/Cpp/obj
BIN_DIR=build/Cpp/bin
CPP_SOURCE=${wildcard *.cpp}
CPP_OBJS=${patsubst %.cpp, %.o, $(CPP_SOURCE)}
HPP_SOURCE=${wildcard *.hpp}
HPP_OBJS=${patsubst %.hpp, %.o, $(HPP_SOURCE)}

export CC BIN OBJS_DIR BIN_DIR ROOT_DIR CCFLAGS LDFLAGS
all:$(SUBDIRS) $(CPP_OBJS) $(HPP_OBJS) DEBUG
all:$(SUBDIRS) DEBUG
$(SUBDIRS):ECHO
mkdir -p $(BIN_DIR)
mkdir -p $(OBJS_DIR)
Expand All @@ -20,10 +15,5 @@ DEBUG:ECHO
make -C build/Cpp
ECHO:
@echo $(SUBDIRS)
$(CPP_OBJS):%.o:%.cpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $(ROOT_DIR)/$(OBJS_DIR)/$@ ${LDFLAGS}
$(HPP_OBJS):%.o:%.hpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $(ROOT_DIR)/$(OBJS_DIR)/$@ ${LDFLAGS}
CLEAN:
@rm $(OBJS_DIR)/*.o
@rm -rf $(BIN_DIR)/*
@rm $(OBJS_DIR)/*.o
12 changes: 6 additions & 6 deletions build/Cpp/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ BIN1=IOHprofiler_run_experiment
BIN2=IOHprofiler_run_suite
BIN3=IOHprofiler_run_problem
all: bin/$(BIN1) bin/$(BIN2) bin/$(BIN3)
bin/$(BIN1):$(ODIR)/$(OBJS)
bin/$(BIN1):$(ODIR)/$(OBJS) IOHprofiler_run_experiment.cpp
cp configuration.ini bin/
$(CC) ${CCFLAGS} -pthread -o $@ $^ IOHprofiler_run_experiment.cpp ${LDFLAGS}
bin/$(BIN2):$(ODIR)/$(OBJS)
$(CC) ${CCFLAGS} -pthread -o $@ $^ IOHprofiler_run_suite.cpp ${LDFLAGS}
bin/$(BIN3):$(ODIR)/$(OBJS)
$(CC) ${CCFLAGS} -pthread -o $@ $^ IOHprofiler_run_problem.cpp ${LDFLAGS}
$(CC) ${CCFLAGS} -pthread -o $@ $^ ${LDFLAGS}
bin/$(BIN2):$(ODIR)/$(OBJS) IOHprofiler_run_suite.cpp
$(CC) ${CCFLAGS} -pthread -o $@ $^ ${LDFLAGS}
bin/$(BIN3):$(ODIR)/$(OBJS) IOHprofiler_run_problem.cpp
$(CC) ${CCFLAGS} -pthread -o $@ $^ ${LDFLAGS}
CLEAN:
@rm -rf bin/IOHprofiler_run_experiment
@rm -rf bin/IOHprofiler_run_suite
Expand Down
13 changes: 0 additions & 13 deletions build/Cpp/Makefile-local
View file

This file was deleted.

12 changes: 6 additions & 6 deletions src/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ SUBDIRS=Suites \
Problems \
Template
CPP_SOURCE=${wildcard *.cpp}
CPP_OBJS=${patsubst %.cpp, %.o, $(CPP_SOURCE)}
CPP_OBJS=${patsubst %.cpp, $(ROOT_DIR)/$(OBJS_DIR)/%.o, $(CPP_SOURCE)}
HPP_SOURCE=${wildcard *.hpp}
HPP_OBJS=${patsubst %.hpp, %.o, $(HPP_SOURCE)}
HPP_OBJS=${patsubst %.hpp, $(ROOT_DIR)/$(OBJS_DIR)/%.o, $(HPP_SOURCE)}
all:$(SUBDIRS) $(CPP_OBJS) $(HPP_OBJS)
$(SUBDIRS):ECHO
make -C $@
$(CPP_OBJS):%.o:%.cpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $(ROOT_DIR)/$(OBJS_DIR)/$@ ${LDFLAGS}
$(HPP_OBJS):%.o:%.hpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $(ROOT_DIR)/$(OBJS_DIR)/$@ ${LDFLAGS}
$(CPP_OBJS):$(ROOT_DIR)/$(OBJS_DIR)/%.o:%.cpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $@ ${LDFLAGS}
$(HPP_OBJS):$(ROOT_DIR)/$(OBJS_DIR)/%.o:%.hpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $@ ${LDFLAGS}
ECHO:
@echo $(SUBDIRS)
12 changes: 6 additions & 6 deletions src/Problems/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
SUBDIRS=common_used_functions
CPP_SOURCE=${wildcard *.cpp}
CPP_OBJS=${patsubst %.cpp, %.o, $(CPP_SOURCE)}
CPP_OBJS=${patsubst %.cpp, $(ROOT_DIR)/$(OBJS_DIR)/%.o, $(CPP_SOURCE)}
HPP_SOURCE=${wildcard *.hpp}
HPP_OBJS=${patsubst %.hpp, %.o, $(HPP_SOURCE)}
HPP_OBJS=${patsubst %.hpp, $(ROOT_DIR)/$(OBJS_DIR)/%.o, $(HPP_SOURCE)}
all:$(SUBDIRS) $(CPP_OBJS) $(HPP_OBJS)
$(SUBDIRS):ECHO
make -C $@
$(CPP_OBJS):%.o:%.cpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $(ROOT_DIR)/$(OBJS_DIR)/$@ ${LDFLAGS}
$(HPP_OBJS):%.o:%.hpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $(ROOT_DIR)/$(OBJS_DIR)/$@ ${LDFLAGS}
$(CPP_OBJS):$(ROOT_DIR)/$(OBJS_DIR)/%.o:%.cpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $@ ${LDFLAGS}
$(HPP_OBJS):$(ROOT_DIR)/$(OBJS_DIR)/%.o:%.hpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $@ ${LDFLAGS}
ECHO:
@echo $(SUBDIRS)
12 changes: 6 additions & 6 deletions src/Problems/common_used_functions/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
CPP_SOURCE=${wildcard *.cpp}
CPP_OBJS=${patsubst %.cpp, %.o, $(CPP_SOURCE)}
CPP_OBJS=${patsubst %.cpp, $(ROOT_DIR)/$(OBJS_DIR)/%.o, $(CPP_SOURCE)}
HPP_SOURCE=${wildcard *.hpp}
HPP_OBJS=${patsubst %.hpp, %.o, $(HPP_SOURCE)}
HPP_OBJS=${patsubst %.hpp, $(ROOT_DIR)/$(OBJS_DIR)/%.o, $(HPP_SOURCE)}
all:$(CPP_OBJS) $(HPP_OBJS)
$(SUBDIRS):ECHO
make -C $@
$(CPP_OBJS):%.o:%.cpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $(ROOT_DIR)/$(OBJS_DIR)/$@ ${LDFLAGS}
$(HPP_OBJS):%.o:%.hpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $(ROOT_DIR)/$(OBJS_DIR)/$@ ${LDFLAGS}
$(CPP_OBJS):$(ROOT_DIR)/$(OBJS_DIR)/%.o:%.cpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $@ ${LDFLAGS}
$(HPP_OBJS):$(ROOT_DIR)/$(OBJS_DIR)/%.o:%.hpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $@ ${LDFLAGS}
ECHO:
@echo $(SUBDIRS)
12 changes: 6 additions & 6 deletions src/Suites/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
CPP_SOURCE=${wildcard *.cpp}
CPP_OBJS=${patsubst %.cpp, %.o, $(CPP_SOURCE)}
CPP_OBJS=${patsubst %.cpp, $(ROOT_DIR)/$(OBJS_DIR)/%.o, $(CPP_SOURCE)}
HPP_SOURCE=${wildcard *.hpp}
HPP_OBJS=${patsubst %.hpp, %.o, $(HPP_SOURCE)}
HPP_OBJS=${patsubst %.hpp, $(ROOT_DIR)/$(OBJS_DIR)/%.o, $(HPP_SOURCE)}
all:$(CPP_OBJS) $(HPP_OBJS)
$(SUBDIRS):ECHO
make -C $@
$(CPP_OBJS):%.o:%.cpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $(ROOT_DIR)/$(OBJS_DIR)/$@ ${LDFLAGS}
$(HPP_OBJS):%.o:%.hpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $(ROOT_DIR)/$(OBJS_DIR)/$@ ${LDFLAGS}
$(CPP_OBJS):$(ROOT_DIR)/$(OBJS_DIR)/%.o:%.cpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $@ ${LDFLAGS}
$(HPP_OBJS):$(ROOT_DIR)/$(OBJS_DIR)/%.o:%.hpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $@ ${LDFLAGS}
ECHO:
@echo $(SUBDIRS)
14 changes: 8 additions & 6 deletions src/Template/Experiments/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
CPP_SOURCE=${wildcard *.cpp}
CPP_OBJS=${patsubst %.cpp, %.o, $(CPP_SOURCE)}
CPP_OBJS=${patsubst %.cpp, $(ROOT_DIR)/$(OBJS_DIR)/%.o, $(CPP_SOURCE)}
HPP_SOURCE=${wildcard *.hpp}
HPP_OBJS=${patsubst %.hpp, %.o, $(HPP_SOURCE)}
HPP_OBJS=${patsubst %.hpp, $(ROOT_DIR)/$(OBJS_DIR)/%.o, $(HPP_SOURCE)}
all:$(CPP_OBJS) $(HPP_OBJS)
$(CPP_OBJS):%.o:%.cpp
$(CC) ${CCFLAGS} -c -x c++$^ -o $(ROOT_DIR)/$(OBJS_DIR)/$@ ${LDFLAGS}
$(HPP_OBJS):%.o:%.hpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $(ROOT_DIR)/$(OBJS_DIR)/$@ ${LDFLAGS}
$(SUBDIRS):ECHO
make -C $@
$(CPP_OBJS):$(ROOT_DIR)/$(OBJS_DIR)/%.o:%.cpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $@ ${LDFLAGS}
$(HPP_OBJS):$(ROOT_DIR)/$(OBJS_DIR)/%.o:%.hpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $@ ${LDFLAGS}
ECHO:
@echo $(SUBDIRS)
12 changes: 6 additions & 6 deletions src/Template/Loggers/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
CPP_SOURCE=${wildcard *.cpp}
CPP_OBJS=${patsubst %.cpp, %.o, $(CPP_SOURCE)}
CPP_OBJS=${patsubst %.cpp, $(ROOT_DIR)/$(OBJS_DIR)/%.o, $(CPP_SOURCE)}
HPP_SOURCE=${wildcard *.hpp}
HPP_OBJS=${patsubst %.hpp, %.o, $(HPP_SOURCE)}
HPP_OBJS=${patsubst %.hpp, $(ROOT_DIR)/$(OBJS_DIR)/%.o, $(HPP_SOURCE)}
all:$(CPP_OBJS) $(HPP_OBJS)
$(SUBDIRS):ECHO
make -C $@
$(CPP_OBJS):%.o:%.cpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $(ROOT_DIR)/$(OBJS_DIR)/$@ ${LDFLAGS}
$(HPP_OBJS):%.o:%.hpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $(ROOT_DIR)/$(OBJS_DIR)/$@ ${LDFLAGS}
$(CPP_OBJS):$(ROOT_DIR)/$(OBJS_DIR)/%.o:%.cpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $@ ${LDFLAGS}
$(HPP_OBJS):$(ROOT_DIR)/$(OBJS_DIR)/%.o:%.hpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $@ ${LDFLAGS}
ECHO:
@echo $(SUBDIRS)
12 changes: 6 additions & 6 deletions src/Template/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
SUBDIRS=Experiments \
Loggers
CPP_SOURCE=${wildcard *.cpp}
CPP_OBJS=${patsubst %.cpp, %.o, $(CPP_SOURCE)}
CPP_OBJS=${patsubst %.cpp, $(ROOT_DIR)/$(OBJS_DIR)/%.o, $(CPP_SOURCE)}
HPP_SOURCE=${wildcard *.hpp}
HPP_OBJS=${patsubst %.hpp, %.o, $(HPP_SOURCE)}
HPP_OBJS=${patsubst %.hpp, $(ROOT_DIR)/$(OBJS_DIR)/%.o, $(HPP_SOURCE)}
all:$(SUBDIRS) $(CPP_OBJS) $(HPP_OBJS)
$(SUBDIRS):ECHO
make -C $@
$(CPP_OBJS):%.o:%.cpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $(ROOT_DIR)/$(OBJS_DIR)/$@ ${LDFLAGS}
$(HPP_OBJS):%.o:%.hpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $(ROOT_DIR)/$(OBJS_DIR)/$@ ${LDFLAGS}
$(CPP_OBJS):$(ROOT_DIR)/$(OBJS_DIR)/%.o:%.cpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $@ ${LDFLAGS}
$(HPP_OBJS):$(ROOT_DIR)/$(OBJS_DIR)/%.o:%.hpp
$(CC) ${CCFLAGS} -c -x c++ $^ -o $@ ${LDFLAGS}
ECHO:
@echo $(SUBDIRS)

0 comments on commit dff318a

Please sign in to comment.