fiddlerwoaroof/crawl - Change ULUV425OHDMQTVU734WIILSSCAYCE55HDND5UAZHMULR6XJWFJKQC

contribs: fix parallel make and simplify MinGW builds

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

Created by Steven Noonan on October 24, 2009

ULUV425OHDMQTVU734WIILSSCAYCE55HDND5UAZHMULR6XJWFJKQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/contrib/Makefile at line 1 [5.6052]
B:BD[5.6052] → [3.3182:3211]
```
uname_S ?= $(shell uname -s)
```

Replacement in crawl-ref/source/contrib/Makefile at line 3 [5.6052]

B:BD[5.6112] → [5.6112:6168]

all: lua sqlite sdl sdl-image freetype libpng pcre zlib

[5.6112]

[5.6168]

SUBDIRS = lua/src sqlite sdl sdl-image freetype libpng pcre zlib

Replacement in crawl-ref/source/contrib/Makefile at line 5 [5.6052]
B:BD[5.6169] → [5.6169:6228]
```
.PHONY: lua sqlite sdl sdl-image freetype libpng pcre zlib
```
[5.6169]
[5.6228]
```
all:
	@$(MAKE) $(SUBDIRS)
```

Replacement in crawl-ref/source/contrib/Makefile at line 8 [5.6052]

B:BD[5.6229] → [2.3009:3165]

∅:D[2.3165] → [5.6229:6254]

B:BD[5.6229] → [5.6229:6254]

B:BD[5.6254] → [2.3166:3348]

# Only clean submodules we actually posses.  Some makefiles don't have
# 'distclean' target, so try both 'clean' and 'distclean', and discard
# any errors.
clean:
	rm -rf $(PREFIX)
	@for a in freetype libpng lua sdl sdl-image sqlite pcre zlib; do \
		if [ -f $$a/Makefile ] || [ -f $$a/makefile ] ; then \
			make -k -C $$a clean distclean 2> /dev/null; \
		fi \

[5.6229]

[2.3348]

clean distclean:
	@for a in $(SUBDIRS); do \
	    make -C $$a distclean; \

Replacement in crawl-ref/source/contrib/Makefile at line 12 [5.6052]

∅:D[2.3354] → [5.6453:6893]

B:BD[5.6453] → [5.6453:6893]

B:BD[5.6893] → [6.3015:3136]

∅:D[6.3136] → [5.6995:7566]

B:BD[5.6995] → [5.6995:7566]


#
# Check for GNU Make >=3.80
#
eval_available :=
$(eval eval_available := T)
ifneq ($(eval_available),T)
ifneq (,$(findstring MINGW,$(uname_S)))
  $(error FreeType needs GNU Make 3.80 or later. Get this from http://prdownloads.sourceforge.net/mingw/make-3.81-MSYS-1.0.11-2.tar.bz2)
else
  $(error FreeType's build system needs GNU Make 3.80 or later)
endif
endif
#
# FreeType 2
#
freetype/objs/.libs/libfreetype.a: $(PREFIX)/lib/libz.a
	cd freetype && ./configure --prefix=$(PREFIX) --with-zlib=$(PREFIX) --enable-static --disable-shared $(CONFIGURE_FLAGS)
	@+$(MAKE) -C freetype
$(PREFIX)/lib/libfreetype.a: freetype/objs/.libs/libfreetype.a
	@$(MAKE) -C freetype install
freetype: $(PREFIX)/lib/libfreetype.a
#
# Lua
#
lua/src/liblua.a:
	@+$(MAKE) -C lua/src crawl_unix
$(PREFIX)/lib/liblua.a: lua/src/liblua.a
	@$(MAKE) -C lua/src install prefix=$(PREFIX)
lua: $(PREFIX)/lib/liblua.a
#
# SQLite
#
sqlite/libsqlite3.a:
	@+$(MAKE) -C sqlite
$(PREFIX)/lib/libsqlite3.a: sqlite/libsqlite3.a
	@$(MAKE) -C sqlite install prefix=$(PREFIX)
sqlite: $(PREFIX)/lib/libsqlite3.a
#
# PCRE
#
pcre/libpcre.a:
	@+$(MAKE) -C pcre

[2.3354]

[5.7566]

	rm -rf $(PREFIX)

Replacement in crawl-ref/source/contrib/Makefile at line 14 [5.6052]

B:BD[5.7567] → [5.7567:7650]

$(PREFIX)/lib/libpcre.a: pcre/libpcre.a
	@$(MAKE) -C pcre install prefix=$(PREFIX)

[5.7567]

[5.7650]

$(SUBDIRS):
	@cd $@; \
	$(MAKE) all prefix=$(PREFIX); \
	$(MAKE) install prefix=$(PREFIX)

Replacement in crawl-ref/source/contrib/Makefile at line 19 [5.6052]
B:BD[5.7651] → [5.7651:7681]
```
pcre: $(PREFIX)/lib/libpcre.a
```
[5.7651]
[5.7681]
```
libpng freetype: zlib
sdl-image: sdl libpng
```

Replacement in crawl-ref/source/contrib/Makefile at line 22 [5.6052]

B:BD[5.7682] → [5.7682:7740]

B:BD[5.7740] → [6.3137:3291]

∅:D[6.3291] → [5.7844:8010]

B:BD[5.7844] → [5.7844:8010]

B:BD[5.8010] → [7.3018:3041]

∅:D[7.3041] → [8.3015:3109]

B:BD[5.8010] → [8.3015:3109]

∅:D[8.3109] → [5.8085:8494]

B:BD[5.8085] → [5.8085:8494]

B:BD[5.8494] → [4.3038:3116]

∅:D[4.3116] → [7.3042:3071]

B:BD[5.8549] → [7.3042:3071]

∅:D[7.3071] → [6.3292:3513]

B:BD[5.8549] → [6.3292:3513]

∅:D[6.3513] → [5.8751:9086]

B:BD[5.8751] → [5.8751:9086]


#
# libpng
#
libpng/.libs/libpng.a: $(PREFIX)/lib/libz.a
	cd libpng && ./configure --prefix=$(PREFIX) --enable-static --disable-shared $(CONFIGURE_FLAGS) CPPFLAGS="-I$(PREFIX)/include" LDFLAGS="-L$(PREFIX)/lib"
	@+$(MAKE) -C libpng
$(PREFIX)/lib/libpng.a: libpng/.libs/libpng.a
	@$(MAKE) -C libpng install
libpng: $(PREFIX)/lib/libpng.a
#
# SDL
#
sdl/build/.libs/libSDL.a:
	-cd sdl && autoreconf
	cd sdl && ./configure --prefix=$(PREFIX) --enable-static --disable-shared $(CONFIGURE_FLAGS)
	@+$(MAKE) -C sdl
$(PREFIX)/lib/libSDL.a: sdl/build/.libs/libSDL.a
	@$(MAKE) -C sdl install
ifneq (,$(findstring MINGW,$(uname_S)))
#
# Very hackish fix for MinGW
	sed 's/-mwindows/-lwinmm -lpng -lz -mwindows/' install/bin/sdl-config > install/bin/sdl-config.fixed
	mv install/bin/sdl-config.fixed install/bin/sdl-config
	chmod 755 install/bin/sdl-config
endif
sdl: $(PREFIX)/lib/libSDL.a
#
# SDL_image
#
sdl-image/.libs/libSDL_image.a: $(PREFIX)/lib/libpng.a $(PREFIX)/lib/libSDL.a
	-cd sdl-image && autoreconf
	cd sdl-image && ./configure --prefix=$(PREFIX) --with-sdl-prefix=$(PREFIX) --enable-static --disable-shared --enable-bmp --enable-png $(CONFIGURE_FLAGS) LDFLAGS="-L$(PREFIX)/lib -lpng -lz" CPPFLAGS="-I$(PREFIX)/include"
	@+$(MAKE) -C sdl-image
$(PREFIX)/lib/libSDL_image.a: sdl-image/.libs/libSDL_image.a
	@$(MAKE) -C sdl-image install
sdl-image: $(PREFIX)/lib/libSDL_image.a
#
# zlib
#
zlib/libz.a:
	cd zlib && ./configure --prefix=$(PREFIX)
	@+$(MAKE) -C zlib
$(PREFIX)/lib/libz.a: zlib/libz.a
	@$(MAKE) -C zlib install
zlib: $(PREFIX)/lib/libz.a

[5.7682]

.PHONY: $(SUBDIRS)