fiddlerwoaroof/crawl - Change B6O2SADSCKGOSL5NQ6FGSWZOYU3JXH3MOYCR6REQO4VY5NCB6LAAC

makefile: correct contributing library dependencies

Signed-off-by: Steven Noonan <steven@uplinklabs.net>

Created by Steven Noonan on October 24, 2009

B6O2SADSCKGOSL5NQ6FGSWZOYU3JXH3MOYCR6REQO4VY5NCB6LAAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/makefile at line 35 [5.2455714]
B:BD[3.3741] → [4.3173:3207]
```
MAKEFLAGS := --no-print-directory
```
Deletion in crawl-ref/source/makefile at line 277 [5.2455714]
B:BD[6.5785] → [6.5785:5786]
B:BD[6.5786] → [7.3800:3840]
∅:D[7.3840] → [8.4011:4076]
B:BD[8.4011] → [8.4011:4076]
```
ifneq (,$(findstring MINGW,$(uname_S)))
CONTRIB_DEPENDS += $(LIBSDL) $(LIBSDLIMAGE) $(LIBFREETYPE)
endif
```
Replacement in crawl-ref/source/makefile at line 514 [5.2455714]
∅:D[9.3091] → [8.4794:4824]
∅:D[10.3382] → [8.4794:4824]
∅:D[7.4858] → [8.4794:4824]
B:BD[8.4794] → [8.4794:4824]
```
CONTRIB_DEPENDS += $(LIBPCRE)
```
[10.3382]
[2.3077]
```
CONTRIBS += pcre
```
Replacement in crawl-ref/source/makefile at line 518 [5.2455714]
∅:D[9.3112] → [11.4105:4139]
∅:D[10.3423] → [11.4105:4139]
B:BD[11.4105] → [11.4105:4139]
```
CONTRIB_DEPENDS += $(LIBFREETYPE)
```
[10.3423]
[2.3097]
```
CONTRIBS += freetype
```
Replacement in crawl-ref/source/makefile at line 522 [5.2455714]
B:BD[10.3468] → [10.3468:3502]
```
CONTRIB_DEPENDS += $(LIBSDLIMAGE)
```
[10.3468]
[2.3121]
```
CONTRIBS += sdl-image
```
Replacement in crawl-ref/source/makefile at line 526 [5.2455714]
∅:D[9.3128] → [11.4161:4190]
∅:D[10.3546] → [11.4161:4190]
B:BD[11.4161] → [11.4161:4190]
```
CONTRIB_DEPENDS += $(LIBSDL)
```
[10.3546]
[2.3145]
```
CONTRIBS += sdl
```
Replacement in crawl-ref/source/makefile at line 530 [5.2455714]
∅:D[9.3168] → [11.4271:4300]
∅:D[10.3584] → [11.4271:4300]
B:BD[11.4271] → [11.4271:4300]
```
CONTRIB_DEPENDS += $(LIBPNG)
```
[10.3584]
[2.3164]
```
CONTRIBS += libpng
```
Replacement in crawl-ref/source/makefile at line 534 [5.2455714]
∅:D[9.3185] → [11.4323:4350]
∅:D[10.3620] → [11.4323:4350]
B:BD[11.4323] → [11.4323:4350]
```
CONTRIB_DEPENDS += $(LIBZ)
```
[10.3620]
[2.3183]
```
CONTRIBS += zlib
```
Replacement in crawl-ref/source/makefile at line 538 [5.2455714]
B:BD[8.4831] → [8.4831:4873]
```
CONTRIB_DEPENDS += $(LIBLUA) $(LIBSQLITE)
```
[8.4831]
[2.3200]
```
CONTRIBS += lua/src sqlite
```
Replacement in crawl-ref/source/makefile at line 544 [5.2455714]
∅:D[2.3254] → [8.4874:4954]
∅:D[10.3658] → [8.4874:4954]
B:BD[8.4874] → [8.4874:4954]
```
GAME_DEPENDS := $(DESTTILEFILES) $(OBJECTS) $(EXTRA_OBJECTS) $(CONTRIB_DEPENDS)
```
[2.3254]
[12.12974]
```
GAME_DEPENDS := $(DESTTILEFILES) $(OBJECTS) $(EXTRA_OBJECTS) contrib
```

Replacement in crawl-ref/source/makefile at line 608 [5.2455714]

B:BD[8.5028] → [8.5028:5112]

$(UTIL)levcomp.tab.cc: $(CONTRIB_DEPENDS)
$(UTIL)levcomp.lex.cc: $(CONTRIB_DEPENDS)

[8.5028]

[12.14179]

$(UTIL)levcomp.tab.cc: contrib
$(UTIL)levcomp.lex.cc: contrib

Replacement in crawl-ref/source/makefile at line 671 [5.2455714]
B:BD[12.15905] → [13.2961:2997]
```
	$(RM) *.o *.ixx build.h compflag.h
```
[12.15905]
[12.15978]
```
	$(RM) *.o *.ixx build.h compflag.h .contrib-libs .contrib-ok
```
Replacement in crawl-ref/source/makefile at line 709 [5.2455714]
B:BD[12.16753] → [8.5245:5310]
```
$(OBJECTS:%.o=%.cc): $(CC_DEP) $(TILEDEFHDRS) $(CONTRIB_DEPENDS)
```
[12.16753]
[12.16799]
```
$(OBJECTS:%.o=%.cc): $(CC_DEP) $(TILEDEFHDRS)
```
Replacement in crawl-ref/source/makefile at line 720 [5.2455714]
B:BD[8.5326] → [8.5326:5373]
∅:D[8.5373] → [12.16995:16996]
B:BD[12.16995] → [12.16995:16996]
B:BD[12.16996] → [8.5374:5442]
∅:D[14.3290] → [5.2456219:2456220]
∅:D[8.5442] → [5.2456219:2456220]
∅:D[12.17035] → [5.2456219:2456220]
B:BD[5.2456219] → [5.2456219:2456220]
B:BD[5.2456220] → [8.5443:5507]
∅:D[14.3326] → [5.2456274:2456275]
∅:D[8.5507] → [5.2456274:2456275]
∅:D[12.17126] → [5.2456274:2456275]
B:BD[5.2456274] → [5.2456274:2456275]
B:BD[5.2456275] → [8.5508:5669]
∅:D[14.3359] → [15.646:647]
∅:D[8.5669] → [15.646:647]
∅:D[12.17175] → [15.646:647]
B:BD[15.646] → [15.646:647]
B:BD[15.647] → [8.5670:5821]
```
.PHONY: pcre lua sqlite sdl sdl-image freetype
$(LIBPCRE): .contrib-ok
	+@$(MAKE) -C contrib pcre
pcre: $(LIBPCRE)
$(LIBLUA): .contrib-ok
	+@$(MAKE) -C contrib lua
lua: $(LIBLUA)
$(LIBSQLITE): .contrib-ok
	+@$(MAKE) -C contrib sqlite
sqlite: $(LIBSQLITE)
$(LIBFREETYPE): .contrib-ok
	+@$(MAKE) -C contrib freetype
freetype: $(LIBFREETYPE)
$(LIBSDL): .contrib-ok
	+@$(MAKE) -C contrib sdl
sdl: $(LIBSDL)
$(LIBSDLIMAGE): .contrib-ok
	+@$(MAKE) -C contrib sdl-image
sdl-image: $(LIBSDLIMAGE)
```
[8.5326]
[5.2456451]
```
.contrib-libs: .contrib-ok
	+@$(MAKE) -C contrib $(CONTRIBS)
	touch .contrib-libs
```
Replacement in crawl-ref/source/makefile at line 724 [5.2455714]
B:BD[5.2456452] → [10.3659:3729]
```
$(LIBPNG): .contrib-ok
	+@$(MAKE) -C contrib libpng
libpng: $(LIBPNG)
```
[5.2456452]
[16.615992]
```
contrib: .contrib-libs
```
Insertion in crawl-ref/source/makefile at line 726 [5.2455714]
[16.615993]
[10.3730]
```
.PHONY: contrib
```
Replacement in crawl-ref/source/makefile at line 738 [5.2455714]
B:BD[12.17593] → [8.5822:5855]
```
rltile-build: $(CONTRIB_DEPENDS)
```
[12.17593]
[12.17607]
```
rltile-build:: contrib
```

makefile: correct contributing library dependencies

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/makefile at line 35 [5.2455714]

Deletion in crawl-ref/source/makefile at line 277 [5.2455714]

Replacement in crawl-ref/source/makefile at line 514 [5.2455714]

Replacement in crawl-ref/source/makefile at line 518 [5.2455714]

Replacement in crawl-ref/source/makefile at line 522 [5.2455714]

Replacement in crawl-ref/source/makefile at line 526 [5.2455714]

Replacement in crawl-ref/source/makefile at line 530 [5.2455714]

Replacement in crawl-ref/source/makefile at line 534 [5.2455714]

Replacement in crawl-ref/source/makefile at line 538 [5.2455714]

Replacement in crawl-ref/source/makefile at line 544 [5.2455714]

Replacement in crawl-ref/source/makefile at line 608 [5.2455714]

Replacement in crawl-ref/source/makefile at line 671 [5.2455714]

Replacement in crawl-ref/source/makefile at line 709 [5.2455714]

Replacement in crawl-ref/source/makefile at line 720 [5.2455714]

Replacement in crawl-ref/source/makefile at line 724 [5.2455714]

Insertion in crawl-ref/source/makefile at line 726 [5.2455714]

Replacement in crawl-ref/source/makefile at line 738 [5.2455714]