diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-10-25 10:01:57 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-25 10:02:53 -0700 |
| commit | 51a330d58957437996ba03579265c266fb27a5e4 (patch) | |
| tree | 8512612cdc0f2339123fbf4fdb57e1729fb4827c /crawl-ref/source/makefile | |
| parent | 0971e94a69b5b6b23058e37653b7f8c48cc2ac6e (diff) | |
| download | crawl-ref-51a330d58957437996ba03579265c266fb27a5e4.tar.gz crawl-ref-51a330d58957437996ba03579265c266fb27a5e4.zip | |
makefile: replace 'atomic' with simplified resulting code
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/makefile')
| -rw-r--r-- | crawl-ref/source/makefile | 11 |
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 |