diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-10-25 02:11:46 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-25 02:11:46 -0700 |
| commit | 045ee813f5c30b1a660017c891bcd9d203c44224 (patch) | |
| tree | 5f7079653f0dcc334ebb4894117a89bae3f4cdb0 | |
| parent | 31828fededc2a11427b8cd18b499e91f46d2178f (diff) | |
| download | crawl-ref-045ee813f5c30b1a660017c891bcd9d203c44224.tar.gz crawl-ref-045ee813f5c30b1a660017c891bcd9d203c44224.zip | |
makefile: remove phony 'contrib' target, use .contrib-libs instead
This fixes a weird 'make' loop with:
make CROSSHOST=i686-pc-mingw32 NO_YACC=1
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| -rw-r--r-- | crawl-ref/source/makefile | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 498384cb29..979137900c 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) contrib +GAME_DEPENDS := $(DESTTILEFILES) $(OBJECTS) $(EXTRA_OBJECTS) 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 -$(UTIL)levcomp.lex.cc: contrib +$(UTIL)levcomp.tab.cc: .contrib-libs +$(UTIL)levcomp.lex.cc: .contrib-libs ifndef NO_YACC @@ -714,7 +714,7 @@ ifdef PCH CC_DEP := AppHdr.h.gch endif -$(OBJECTS:%.o=%.cc): $(CC_DEP) $(TILEDEFHDRS) contrib +$(OBJECTS:%.o=%.cc): $(CC_DEP) $(TILEDEFHDRS) .contrib-libs %.o: %.m $(QUIET_CXX)$(CC) $(CFLAGS) $(CFLAGS_L) -c $< -o $@ @@ -732,9 +732,6 @@ $(OBJECTS:%.o=%.cc): $(CC_DEP) $(TILEDEFHDRS) contrib +@$(MAKE) -C contrib $(CONTRIBS) touch .contrib-libs -contrib: .contrib-libs - -.PHONY: contrib ############################################################################# # Build unrandart data |