better makefile
This commit is contained in:
parent
28b38f2734
commit
332988a4f3
30
Makefile
30
Makefile
|
@ -18,6 +18,7 @@ INCFS = $(shell find $(INCF) -type d)
|
||||||
|
|
||||||
LOGF = ./thirdparty/Log/
|
LOGF = ./thirdparty/Log/
|
||||||
LOGO = $(LOGF)Log.o
|
LOGO = $(LOGF)Log.o
|
||||||
|
export LOG_USEMUTEX = 0
|
||||||
|
|
||||||
INCLUDES = -I$(LOGF) $(addprefix -I, $(INCFS))
|
INCLUDES = -I$(LOGF) $(addprefix -I, $(INCFS))
|
||||||
LDFLAGS =
|
LDFLAGS =
|
||||||
|
@ -29,7 +30,12 @@ DEPFILES = $(wildcard $(DEPF)*.d)
|
||||||
SOURCEDIRS = $(shell find $(SRCF) -type d -printf "%p/\n")
|
SOURCEDIRS = $(shell find $(SRCF) -type d -printf "%p/\n")
|
||||||
BUILDDIRS = $(patsubst $(SRCF)%, $(BUILDDIR)%, $(SOURCEDIRS))
|
BUILDDIRS = $(patsubst $(SRCF)%, $(BUILDDIR)%, $(SOURCEDIRS))
|
||||||
|
|
||||||
OBJFILESTEST = $(filter-out $(BUILDDIR)main.o, $(OBJFILES))
|
BUILDDIRTEST = $(BUILDDIR)tests/
|
||||||
|
TESTSRCFILES = $(wildcard $(TESTF)*.cpp)
|
||||||
|
TESTOBJFILES = $(patsubst $(TESTF)%, $(BUILDDIRTEST)%, $(patsubst %.cpp, %.o, $(TESTSRCFILES)))
|
||||||
|
OBJFILESTEST = $(filter-out $(BUILDDIR)main.o, $(OBJFILES)) $(TESTOBJFILES)
|
||||||
|
|
||||||
|
BUILDDIRS += $(BUILDDIRTEST)
|
||||||
|
|
||||||
INCLUDES += $(addprefix -I, $(SOURCEDIRS))
|
INCLUDES += $(addprefix -I, $(SOURCEDIRS))
|
||||||
|
|
||||||
|
@ -39,11 +45,18 @@ $(NAME): $(BUILDDIRS) $(DEPF) $(OBJFILES)
|
||||||
@echo "Linking $@"
|
@echo "Linking $@"
|
||||||
@$(CXX) $(CFLAGS) -o $@ $(filter %.o, $^) $(LDFLAGS)
|
@$(CXX) $(CFLAGS) -o $@ $(filter %.o, $^) $(LDFLAGS)
|
||||||
|
|
||||||
|
# normal cpp files
|
||||||
$(BUILDDIR)%.o: $(SRCF)%.cpp
|
$(BUILDDIR)%.o: $(SRCF)%.cpp
|
||||||
@echo "Compiling: $@"
|
@echo "Compiling: $@"
|
||||||
@$(CXX) $(CFLAGS) $(INCLUDES) $< -MM -MT $@ > $(DEPF)$(subst /,_,$*).d
|
@$(CXX) $(CFLAGS) $(INCLUDES) $< -MM -MT $@ > $(DEPF)$(subst /,_,$*).d
|
||||||
@$(CXX) -c -o $@ $(CFLAGS) $(INCLUDES) $<
|
@$(CXX) -c -o $@ $(CFLAGS) $(INCLUDES) $<
|
||||||
|
|
||||||
|
# test cpp files
|
||||||
|
$(BUILDDIRTEST)%.o: $(TESTF)%.cpp
|
||||||
|
@echo "Compiling: $@"
|
||||||
|
@$(CXX) $(CFLAGS) $(INCLUDES) $< -MM -MT $@ > $(DEPF)test_$(subst /,_,$*).d
|
||||||
|
@$(CXX) -c -o $@ $(CFLAGS) $(INCLUDES) $<
|
||||||
|
|
||||||
$(NAME)_strip: $(NAME)
|
$(NAME)_strip: $(NAME)
|
||||||
@echo "Strip $<"
|
@echo "Strip $<"
|
||||||
@strip -o $@ $<
|
@strip -o $@ $<
|
||||||
|
@ -61,14 +74,17 @@ clean:
|
||||||
$(RM) -r $(NAME) $(BUILDDIR) $(NAMETEST) $(NAME)_strip
|
$(RM) -r $(NAME) $(BUILDDIR) $(NAMETEST) $(NAME)_strip
|
||||||
$(MAKE) -C $(LOGF) $@
|
$(MAKE) -C $(LOGF) $@
|
||||||
|
|
||||||
$(NAMETEST): $(BUILDDIRS) $(DEPF) $(TESTF)*.cpp $(OBJFILESTEST)
|
$(NAMETEST): $(BUILDDIRS) $(DEPF) $(OBJFILESTEST)
|
||||||
@echo "Compiling tests"
|
@echo "Linking tests"
|
||||||
@$(CXX) -o $@ $(filter %.o, $^) $(filter %.cpp, $^) $(CFLAGS) -I$(SRCF) $(INCLUDES) $(LDFLAGS)
|
@$(CXX) -o $@ $(filter %.o, $^) $(filter %.a, $^) $(CFLAGS) $(LDFLAGS)
|
||||||
|
|
||||||
runtest: $(NAMETEST)
|
runtest: $(BUILDDIR)testrun
|
||||||
|
|
||||||
|
$(BUILDDIR)testrun: $(NAMETEST)
|
||||||
@echo "Running tests"
|
@echo "Running tests"
|
||||||
./$<
|
bash -c '. test.env 2> /dev/null; ./$<'
|
||||||
|
@touch $(BUILDDIR)testrun
|
||||||
|
|
||||||
.PHONY: clean all $(NAMETEST) clean-depends runtest
|
.PHONY: clean all clean-depends runtest
|
||||||
|
|
||||||
include $(DEPFILES)
|
include $(DEPFILES)
|
||||||
|
|
Loading…
Reference in New Issue