diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-10-25 02:50:26 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-25 03:27:06 -0700 |
| commit | 072c4b78e20ecb65b9a4ff09612adf27aeb8f3e6 (patch) | |
| tree | b27be4163df44e0e9d13a4c70a8bf30d9fc92c9b /crawl-ref | |
| parent | a351b1055cb8bf2b443d9286f965cb888a1fd99b (diff) | |
| download | crawl-ref-072c4b78e20ecb65b9a4ff09612adf27aeb8f3e6.tar.gz crawl-ref-072c4b78e20ecb65b9a4ff09612adf27aeb8f3e6.zip | |
Revert "makefile: remove phony 'contrib' target, use .contrib-libs instead"
This reverts commit 045ee813f5c30b1a660017c891bcd9d203c44224.
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 979137900c..498384cb29 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -541,7 +541,7 @@ LIBS += $(LIBLUA) $(LIBSQLITE) EXTRA_OBJECTS += version.o LIBS += $(EXTRA_LIBS) -GAME_DEPENDS := $(DESTTILEFILES) $(OBJECTS) $(EXTRA_OBJECTS) +GAME_DEPENDS := $(DESTTILEFILES) $(OBJECTS) $(EXTRA_OBJECTS) contrib SRC_PKG_BASE := stone_soup SRC_VERSION := $(shell git describe --tags --long) PKG_SRC_DIR := $(SRC_PKG_BASE)-$(SRC_VERSION)-src @@ -613,8 +613,8 @@ version.cc: build.h compflag.h # The level compiler # -$(UTIL)levcomp.tab.cc: .contrib-libs -$(UTIL)levcomp.lex.cc: .contrib-libs +$(UTIL)levcomp.tab.cc: contrib +$(UTIL)levcomp.lex.cc: contrib ifndef NO_YACC @@ -714,7 +714,7 @@ ifdef PCH CC_DEP := AppHdr.h.gch endif -$(OBJECTS:%.o=%.cc): $(CC_DEP) $(TILEDEFHDRS) .contrib-libs +$(OBJECTS:%.o=%.cc): $(CC_DEP) $(TILEDEFHDRS) contrib %.o: %.m $(QUIET_CXX)$(CC) $(CFLAGS) $(CFLAGS_L) -c $< -o $@ @@ -732,6 +732,9 @@ $(OBJECTS:%.o=%.cc): $(CC_DEP) $(TILEDEFHDRS) .contrib-libs +@$(MAKE) -C contrib $(CONTRIBS) touch .contrib-libs +contrib: .contrib-libs + +.PHONY: contrib ############################################################################# # Build unrandart data |