From f4b1c42411d34486600b49584c7a0014ccb1b7bf Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Mon, 19 Sep 2011 23:06:02 +0300 Subject: [PATCH] Keep d-files and objects in test directory --- tests/Makefile | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 6c52d9ea..dbec16b8 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,5 +1,15 @@ -CFLAGS += -g3 -Wall -W -Wextra -DLINUX -I../include -I../projects/stargazer -I../stglibs/stgconffiles.lib -I. -DUSE_ABSTRACT_SETTINGS -DLINUX -CXXFLAGS = ${CFLAGS} +INCS = -I . \ + -I ../include \ + -I ../stglibs/common.lib/include \ + -I ../stglibs/conffiles.lib/include \ + -I ../stglibs/logger.lib/include \ + -I ../stglibs/locker.lib/include \ + -I ../stglibs/scriptexecuter.lib/include \ + -I ../projects/stargazer +DEFS = -DLINUX \ + -DUSE_ABSTRACT_SETTINGS +CFLAGS += -g3 -Wall -W -Wextra $(INCS) $(DEFS) +CXXFLAGS = $(CFLAGS) LIBS = -lpthread PROG = tests @@ -18,26 +28,28 @@ SOURCES = main.cpp \ ../stglibs/logger.lib/logger.cpp \ ../stglibs/scriptexecuter.lib/scriptexecuter.cpp -.PHONY: all includes clean +.PHONY: all clean -all: includes $(PROG) +all: $(PROG) -includes: - make -C ../stglibs includes - -$(PROG): $(subst .cpp,.o,$(SOURCES)) +$(PROG): $(addsuffix .o,$(basename $(SOURCES))) $(CXX) $(LDFLAGS) $^ $(LIBS) -o $@ clean: - rm -f *.o *.d $(PROG) + rm -f $(addsuffix .o,$(basename $(SOURCES))) $(addsuffix .d,$(SOURCES)) $(PROG) ifneq ($(MAKECMDGOALS),distclean) ifneq ($(MAKECMDGOALS),clean) --include $(subst .cpp,.d,$(SOURCES)) +-include $(addsuffix .d,$(SOURCES)) endif endif -%.d: %.cpp - @$(CC) -MM $(CXXFLAGS) $< > $@.$$$$; \ +%.cpp.d: %.cpp + @$(CXX) -MM $(CXXFLAGS) $< > $@.$$$$; \ + sed 's,\($*\).o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \ + rm -f $@.$$$$ + +%.c.d: %.c + @$(CC) -MM $(CFLAGS) $< > $@.$$$$; \ sed 's,\($*\).o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \ rm -f $@.$$$$ -- 2.43.2