summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/makefile11
1 files changed, 5 insertions, 6 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile
index 22856a4385..1b36d16eb4 100644
--- a/crawl-ref/source/makefile
+++ b/crawl-ref/source/makefile
@@ -552,11 +552,6 @@ PKG_TIDY_LIST := $(UTIL)*.o $(LEVCOMP) *.o \
$(UTIL)*.tab.cc $(UTIL)*.tab.h $(UTIL)*.lex.cc *.ixx
PKG_EXCLUDES := $(PWD)/misc/src-pkg-excludes.lst
-sp :=
-sp +=
-sentinel = .sentinel.$(subst $(sp),_,$(subst /,_,$1))
-atomic = $(eval $1: $(call sentinel,$1) ; @:)$(call sentinel,$1): $2 ; @touch $$@ $(foreach t,$1,$(if $(wildcard $t),,$(shell rm -f $(call sentinel,$1))))
-
.PHONY: all test install clean clean-contrib distclean debug profile wizard
##########################################################################
@@ -731,8 +726,12 @@ $(OBJECTS:%.o=%.cc): $(CC_DEP) $(TILEDEFHDRS) $(CONTRIB_LIBS)
# Contribs
#
-$(call atomic,$(CONTRIB_LIBS),.contrib-ok)
+$(CONTRIB_LIBS): .contrib-libs
+ @:
+
+.contrib-libs:
+@$(MAKE) -C contrib $(CONTRIBS)
+ @touch .contrib-libs
#############################################################################
# Build unrandart data