diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | build/Makefile.common | 51 | ||||
| -rw-r--r-- | test/Makefile | 28 |
3 files changed, 71 insertions, 10 deletions
@@ -15,6 +15,7 @@ INSTALL := install SED := sed LCOV := lcov GENHTML := genhtml +TOUCH := touch # Toolchain flags WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \ @@ -33,6 +34,7 @@ MVFLAGS := ECHOFLAGS := MAKEFLAGS := PKGCONFIGFLAGS := +TOUCHFLAGS := EXEEXT := diff --git a/build/Makefile.common b/build/Makefile.common index 2fa77ac..0388859 100644 --- a/build/Makefile.common +++ b/build/Makefile.common @@ -43,10 +43,11 @@ OBJECTS := $(subst /,_,$(subst .c,.o,$(SOURCES))) # Rules release: setup $(addprefix $(RELEASEDIR)/,$(OBJECTS)) - @$(AR) $(ARFLAGS) $(COMPONENT).a $(RELEASEDIR)/* + @$(AR) $(ARFLAGS) $(COMPONENT).a $(addprefix $(RELEASEDIR)/,$(OBJECTS)) debug: setup $(addprefix $(DEBUGDIR)/,$(OBJECTS)) - @$(AR) $(ARFLAGS) $(COMPONENT)-debug.a $(DEBUGDIR)/* + @$(AR) $(ARFLAGS) $(COMPONENT)-debug.a \ + $(addprefix $(DEBUGDIR)/,$(OBJECTS)) test: debug $(TARGET_TESTS) @@ -80,8 +81,8 @@ distclean: clean -@$(RM) $(RMFLAGS) -r $(TOP)/dist setup: - @$(MKDIR) $(MKDIRFLAGS) $(RELEASEDIR) - @$(MKDIR) $(MKDIRFLAGS) $(DEBUGDIR) + @$(MKDIR) $(MKDIRFLAGS) $(RELEASEDIR)/deps + @$(MKDIR) $(MKDIRFLAGS) $(DEBUGDIR)/deps @$(MKDIR) $(MKDIRFLAGS) $(COVERAGEDIR) export: release @@ -102,18 +103,54 @@ uninstall: @$(RM) $(RMFLAGS) $(PREFIX)/lib/pkgconfig/$(COMPONENT).pc @$(RM) $(RMFLAGS) -r $(PREFIX)/include/hubbub +$(RELEASEDIR)/deps/created: + @$(MKDIR) $(MKDIRFLAGS) $(RELEASEDIR)/deps + @$(TOUCH) $(TOUCHFLAGS) $(RELEASEDIR)/deps/created + +$(DEBUGDIR)/deps/created: + @$(MKDIR) $(MKDIRFLAGS) $(DEBUGDIR)/deps + @$(TOUCH) $(TOUCHFLAGS) $(DEBUGDIR)/deps/created + +DEPFILES := + +define do_dep +DEPFILES += $(2) +$$(RELEASEDIR)/deps/$(2): $$(RELEASEDIR)/deps/created $(1) + @$$(ECHO) $$(ECHOFLAGS) "DEP $(1)" + @$$(RM) $$(RMFLAGS) $$(RELEASEDIR)/deps/$(2) + @$$(CC) $$(RELEASECFLAGS) -MM -MT \ + '$$(RELEASEDIR)/deps/$(2) $$(RELEASEDIR)/$(3)' \ + -MF $$(RELEASEDIR)/deps/$(2) $(1) + +$$(DEBUGDIR)/deps/$(2): $$(DEBUGDIR)/deps/created $(1) + @$$(ECHO) $$(ECHOFLAGS) "DEP $(1)" + @$$(RM) $$(RMFLAGS) $$(DEBUGDIR)/deps/$(2) + @$$(CC) $$(DEBUGCFLAGS) -MM -MT \ + '$$(DEBUGDIR)/deps/$(2) $$(DEBUGDIR)/$(3)' \ + -MF $$(DEBUGDIR)/deps/$(2) $(1) + +endef + # Finally, build rules for compilation define do_compile -$$(RELEASEDIR)/$(2): $(1) +$$(RELEASEDIR)/$(2): $$(RELEASEDIR)/deps/$(3) @$$(ECHO) $$(ECHOFLAGS) "==> $(1)" @$$(CC) -c $$(RELEASECFLAGS) -o $$@ $(1) -$$(DEBUGDIR)/$(2): $(1) +$$(DEBUGDIR)/$(2): $$(DEBUGDIR)/deps/$(3) @$$(ECHO) $$(ECHOFLAGS) "==> $(1)" @$$(CC) -c $$(DEBUGCFLAGS) -o $$@ $(1) endef $(eval $(foreach SOURCE,$(filter %.c,$(SOURCES)), \ - $(call do_compile,$(SOURCE),$(subst /,_,$(SOURCE:.c=.o))))) + $(call do_dep,$(SOURCE),$(subst /,_,$(SOURCE:.c=.d)),$(subst /,_,$(SOURCE:.c=.o))))) + +ifneq ($(findstring clean,$(MAKECMDGOALS)),clean) +-include $(sort $(addprefix $(RELEASEDIR)/deps/,$(DEPFILES))) +-include $(sort $(addprefix $(DEBUGDIR)/deps/,$(DEPFILES))) +endif + +$(eval $(foreach SOURCE,$(filter %.c,$(SOURCES)), \ + $(call do_compile,$(SOURCE),$(subst /,_,$(SOURCE:.c=.o)),$(subst /,_,$(SOURCE:.c=.d))))) diff --git a/test/Makefile b/test/Makefile index 97648e4..b2061c8 100644 --- a/test/Makefile +++ b/test/Makefile @@ -49,7 +49,8 @@ TESTS_$(d) := $(TESTS_$(d)) regression/cscodec-segv regression/filter-segv \ ITEMS_CLEAN := $(ITEMS_CLEAN) \ $(addprefix $(d), $(addsuffix $(EXEEXT), $(TESTS_$(d)))) \ $(addprefix $(d), $(addsuffix .gcda, $(TESTS_$(d)))) \ - $(addprefix $(d), $(addsuffix .gcno, $(TESTS_$(d)))) + $(addprefix $(d), $(addsuffix .gcno, $(TESTS_$(d)))) \ + $(addprefix $(d), $(addsuffix .d, $(TESTS_$(d)))) ITEMS_DISTCLEAN := $(ITEMS_DISTCLEAN) $(d)log # Targets for top-level makefile to run @@ -64,9 +65,23 @@ TARGET_TESTS := $(TARGET_TESTS) test_$(d) test_$(d): $(d) $(addprefix $(d), $(TESTS_$(d))) @$(PERL) $(TOP)/$<testrunner.pl $(TOP)/$< $(EXEEXT) +DEP_$(d) := + +define dep_test +DEP_$(d) += $(2) +$(2): $(1) + @$$(RM) $$(RMFLAGS) $(2) + @$$(CC) $$(DEBUGCFLAGS) -MM -MT '$(2) $(3)' -MF $(2) $(1) + +endef + # Build rules for each test binary -- they all depend on the debug library +# FIXME - these need to depend on the debug library, so they're rebuilt when +# it changes. Simply adding it to the prerequisites list causes all test +# drivers to be rebuilt every time, regardless of if there have been any +# changes. define compile_test -$(2): $$(TOP)/$$(COMPONENT)-debug.a $(1) +$(2): $(3) @$$(ECHO) $$(ECHOFLAGS) "==> $(1)" @$$(CC) -c -g $$(DEBUGCFLAGS) -o $$@.o $(1) @$$(LD) -g -o $$@ $$@.o $$(LDFLAGS) -lhubbub-debug -lgcov @@ -75,7 +90,14 @@ $(2): $$(TOP)/$$(COMPONENT)-debug.a $(1) endef $(eval $(foreach TEST,$(addprefix $(d), $(TESTS_$(d))), \ - $(call compile_test,$(addsuffix .c, $(TEST)),$(TEST)))) + $(call dep_test,$(addsuffix .c, $(TEST)),$(addsuffix .d, $(TEST)),$(TEST)))) + +ifneq ($(findstring clean,$(MAKECMDGOALS)),clean) +-include $(sort $(DEP_$(d))) +endif + +$(eval $(foreach TEST,$(addprefix $(d), $(TESTS_$(d))), \ + $(call compile_test,$(addsuffix .c, $(TEST)),$(TEST),$(addsuffix .d, $(TEST))))) # Now include any children we may have MAKE_INCLUDES := $(wildcard $(d)*/Makefile) |