fiddlerwoaroof/crawl - Change CDH37HWAVXOPATZC7GW4R6VJZRNKLDLCPUFJF364GOT25OBXLO2AC

makefile: use atomic target for contribs

This is not the ideal solution, but it avoids an infinite loop, so…

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

Created by Steven Noonan on October 25, 2009

CDH37HWAVXOPATZC7GW4R6VJZRNKLDLCPUFJF364GOT25OBXLO2AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/makefile at line 515 [7.2455714]
∅:D[5.2861] → [6.3077:3096]
B:BD[8.4824] → [6.3077:3096]
```
LIBS += $(LIBPCRE)
```
[5.2861]
[9.4078]
```
CONTRIB_LIBS += $(LIBPCRE)
```
Replacement in crawl-ref/source/makefile at line 519 [7.2455714]
∅:D[5.2883] → [6.3097:3120]
B:BD[9.4139] → [6.3097:3120]
```
LIBS += $(LIBFREETYPE)
```
[5.2883]
[9.4139]
```
CONTRIB_LIBS += $(LIBFREETYPE)
```
Replacement in crawl-ref/source/makefile at line 523 [7.2455714]
∅:D[5.2906] → [6.3121:3144]
B:BD[10.3502] → [6.3121:3144]
```
LIBS += $(LIBSDLIMAGE)
```
[5.2906]
[10.3524]
```
CONTRIB_LIBS += $(LIBSDLIMAGE)
```
Replacement in crawl-ref/source/makefile at line 527 [7.2455714]
∅:D[5.2923] → [6.3145:3163]
B:BD[9.4190] → [6.3145:3163]
```
LIBS += $(LIBSDL)
```
[5.2923]
[8.4824]
```
CONTRIB_LIBS += $(LIBSDL)
```
Replacement in crawl-ref/source/makefile at line 531 [7.2455714]
∅:D[5.2943] → [6.3164:3182]
B:BD[9.4300] → [6.3164:3182]
```
LIBS += $(LIBPNG)
```
[5.2943]
[9.4300]
```
CONTRIB_LIBS += $(LIBPNG)
```
Replacement in crawl-ref/source/makefile at line 535 [7.2455714]
∅:D[5.2961] → [6.3183:3199]
B:BD[9.4350] → [6.3183:3199]
```
LIBS += $(LIBZ)
```
[5.2961]
[9.4350]
```
CONTRIB_LIBS += $(LIBZ)
```
Replacement in crawl-ref/source/makefile at line 539 [7.2455714]
∅:D[5.2989] → [6.3200:3231]
B:BD[8.4873] → [6.3200:3231]
```
LIBS += $(LIBLUA) $(LIBSQLITE)
```
[5.2989]
[11.2833]
```
CONTRIB_LIBS += $(LIBLUA) $(LIBSQLITE)
```

Replacement in crawl-ref/source/makefile at line 543 [7.2455714]

B:BD[8.4874] → [6.3232:3254]

B:BD[6.3254] → [4.2844:2913]

LIBS += $(EXTRA_LIBS)
GAME_DEPENDS := $(DESTTILEFILES) $(OBJECTS) $(EXTRA_OBJECTS) contrib

[8.4874]

[12.12974]

LIBS += $(EXTRA_LIBS) $(CONTRIB_LIBS)
GAME_DEPENDS := $(DESTTILEFILES) $(OBJECTS) $(EXTRA_OBJECTS) $(CONTRIB_LIBS)

Insertion in crawl-ref/source/makefile at line 554 [7.2455714]

[12.13410]


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))))

Replacement in crawl-ref/source/makefile at line 621 [7.2455714]

B:BD[8.5028] → [4.2914:2976]

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

[8.5028]

[12.14179]

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

Replacement in crawl-ref/source/makefile at line 684 [7.2455714]

B:BD[12.15905] → [3.3088:3174]

	$(RM) $(OBJECTS) $(OBJECTS:.o=.d) *.ixx build.h compflag.h .contrib-libs .contrib-ok

[12.15905]

[12.15978]

	$(RM) $(OBJECTS) $(OBJECTS:.o=.d) *.ixx build.h compflag.h .contrib-ok

Replacement in crawl-ref/source/makefile at line 722 [7.2455714]
B:BD[12.16753] → [4.2977:3031]
```
$(OBJECTS:%.o=%.cc): $(CC_DEP) $(TILEDEFHDRS) contrib
```
[12.16753]
[12.16799]
```
$(OBJECTS:%.o=%.cc): $(CC_DEP) $(TILEDEFHDRS) $(CONTRIB_LIBS)
```
Replacement in crawl-ref/source/makefile at line 734 [7.2455714]
B:BD[2.2845] → [2.2845:2875]
∅:D[2.2875] → [5.3233:3260]
B:BD[8.5326] → [5.3233:3260]
```
.INTERMEDIATE: .contrib-libs
.contrib-libs: .contrib-ok
```
[2.2845]
[5.3260]
```
$(call atomic,$(CONTRIB_LIBS),.contrib-ok)
```
Deletion in crawl-ref/source/makefile at line 736 [7.2455714]
B:BD[5.3294] → [5.3294:3315]
```
	touch .contrib-libs
```
Deletion in crawl-ref/source/makefile at line 737 [7.2455714]
B:BD[7.2456452] → [4.3032:3055]
∅:D[4.3055] → [13.615992:615993]
∅:D[5.3339] → [13.615992:615993]
∅:D[14.3545] → [13.615992:615993]
∅:D[10.3729] → [13.615992:615993]
∅:D[12.17307] → [13.615992:615993]
B:BD[13.615992] → [13.615992:615993]
B:BD[13.615993] → [4.3056:3073]
```
contrib: .contrib-libs
.PHONY: contrib
```

makefile: use atomic target for contribs

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/makefile at line 515 [7.2455714]

Replacement in crawl-ref/source/makefile at line 519 [7.2455714]

Replacement in crawl-ref/source/makefile at line 523 [7.2455714]

Replacement in crawl-ref/source/makefile at line 527 [7.2455714]

Replacement in crawl-ref/source/makefile at line 531 [7.2455714]

Replacement in crawl-ref/source/makefile at line 535 [7.2455714]

Replacement in crawl-ref/source/makefile at line 539 [7.2455714]

Replacement in crawl-ref/source/makefile at line 543 [7.2455714]

Insertion in crawl-ref/source/makefile at line 554 [7.2455714]

Replacement in crawl-ref/source/makefile at line 621 [7.2455714]

Replacement in crawl-ref/source/makefile at line 684 [7.2455714]

Replacement in crawl-ref/source/makefile at line 722 [7.2455714]

Replacement in crawl-ref/source/makefile at line 734 [7.2455714]

Deletion in crawl-ref/source/makefile at line 736 [7.2455714]

Deletion in crawl-ref/source/makefile at line 737 [7.2455714]