fiddlerwoaroof/crawl - Change I7F3ARBYSHD2DGOSMJJKV3FEXJ6WVWKL5PJ3NRM3Q7HZD74QZ3CQC

makefile_tiles.unix: cleanup and compile corrections

Replace 'make' with '$(MAKE)'
Allow jobserver option to be inherited via '+$(MAKE)'
Use pkg-config for Freetype2 and PNG cflags/ldflags

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

Created by Steven Noonan on September 29, 2009

I7F3ARBYSHD2DGOSMJJKV3FEXJ6WVWKL5PJ3NRM3Q7HZD74QZ3CQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/makefile_tiles.unix at line 32 [5.5756330]
B:BD[4.2657] → [4.2657:2678]
```
PNG_LIB := -L/sw/lib
```

Replacement in crawl-ref/source/makefile_tiles.unix at line 52 [5.5756330]

B:BD[4.2683] → [4.2683:2709]

B:BD[4.2709] → [6.165172:165217]

PNG_INCLUDE :=
PNG_LIB :=
FREETYPE_INCLUDE := -I/usr/include/freetype2

[4.2683]

[3.3431]

PNG_INCLUDE := $(shell pkg-config libpng --cflags)
PNG_LDFLAGS := $(shell pkg-config libpng --libs)
FREETYPE_INCLUDE := $(shell pkg-config freetype2 --cflags)
FREETYPE_LDFLAGS := $(shell pkg-config freetype2 --libs)

Replacement in crawl-ref/source/makefile_tiles.unix at line 57 [5.5756330]

B:BD[3.3483] → [3.3483:3552]

EXTRA_LIBS := -lpng $(SDL_LDFLAGS) -lGL -lGLU -lSDL_image -lfreetype

[3.3483]

[4.2709]

EXTRA_LIBS := $(PNG_LDFLAGS) $(SDL_LDFLAGS) $(FREETYPE_LDFLAGS) -lGL -lGLU -lSDL_image

Replacement in crawl-ref/source/makefile_tiles.unix at line 228 [5.5756330]
B:BD[5.5761492] → [7.1278310:1278354]
```
	cd $(RLTILES) && make -f makefile.unix all
```
[5.5761492]
[5.5761600]
```
	+$(MAKE) -C rltiles -f makefile.unix all
```
Replacement in crawl-ref/source/makefile_tiles.unix at line 240 [5.5756330]
B:BD[5.5761714] → [5.5761714:5761773]
```
	cd $(RLTILES) && make -f makefile.unix distclean && cd ..
```
[5.5761714]
[5.5761799]
```
	+$(MAKE) -C $(RLTILES) -f makefile.unix distclean && cd ..
```
Replacement in crawl-ref/source/makefile_tiles.unix at line 288 [5.5756330]
B:BD[5.5762912] → [5.5762912:5762943]
```
	cd $(LUASRC) && $(MAKE) clean
```
[5.5762912]
[5.5762943]
```
	+$(MAKE) -C $(LUASRC) clean
```
Replacement in crawl-ref/source/makefile_tiles.unix at line 291 [5.5756330]
B:BD[5.5762955] → [5.5762955:5762986]
```
	cd $(SQLSRC) && $(MAKE) clean
```
[5.5762955]
[5.5762986]
```
	+$(MAKE) -C $(SQLSRC) clean
```
Replacement in crawl-ref/source/makefile_tiles.unix at line 332 [5.5756330]
B:BD[5.5763849] → [5.5763849:5763885]
```
	cd $(LUASRC) && $(MAKE) crawl_unix
```
[5.5763849]
[5.5763885]
```
	+$(MAKE) -C $(LUASRC) crawl_unix
```
Replacement in crawl-ref/source/makefile_tiles.unix at line 339 [5.5756330]
B:BD[5.5764015] → [5.5764015:5764040]
```
	cd $(SQLSRC) && $(MAKE)
```
[5.5764015]
[2.31852]
```
	+$(MAKE) -C $(SQLSRC)
```

makefile_tiles.unix: cleanup and compile corrections

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/makefile_tiles.unix at line 32 [5.5756330]

Replacement in crawl-ref/source/makefile_tiles.unix at line 52 [5.5756330]

Replacement in crawl-ref/source/makefile_tiles.unix at line 57 [5.5756330]

Replacement in crawl-ref/source/makefile_tiles.unix at line 228 [5.5756330]

Replacement in crawl-ref/source/makefile_tiles.unix at line 240 [5.5756330]

Replacement in crawl-ref/source/makefile_tiles.unix at line 288 [5.5756330]

Replacement in crawl-ref/source/makefile_tiles.unix at line 291 [5.5756330]

Replacement in crawl-ref/source/makefile_tiles.unix at line 332 [5.5756330]

Replacement in crawl-ref/source/makefile_tiles.unix at line 339 [5.5756330]