contribs: fix parallel make and simplify MinGW builds

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

8 files changed, 14 insertions, 132 deletions

diff --git a/crawl-ref/source/contrib/Makefile b/crawl-ref/source/contrib/Makefile
index 5c00e642fb..f1431e0407 100644
--- a/crawl-ref/source/contrib/Makefile
+++ b/crawl-ref/source/contrib/Makefile
@@ -1,140 +1,22 @@
-uname_S ?= $(shell uname -s)
 PREFIX:=$(shell pwd)/install
 
-all: lua sqlite sdl sdl-image freetype libpng pcre zlib
+SUBDIRS = lua/src sqlite sdl sdl-image freetype libpng pcre zlib
 
-.PHONY: lua sqlite sdl sdl-image freetype libpng pcre zlib
+all:
+	@$(MAKE) $(SUBDIRS)
 
-# 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 \
+clean distclean:
+	@for a in $(SUBDIRS); do \
+	    make -C $$a distclean; \
 	done
+	rm -rf $(PREFIX)
 
-#
-# 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
-
-$(PREFIX)/lib/libpcre.a: pcre/libpcre.a
-	@$(MAKE) -C pcre install prefix=$(PREFIX)
-
-pcre: $(PREFIX)/lib/libpcre.a
-
-
-#
-# 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
+$(SUBDIRS):
+	@cd $@; \
+	$(MAKE) all prefix=$(PREFIX); \
+	$(MAKE) install prefix=$(PREFIX)
 
-$(PREFIX)/lib/libz.a: zlib/libz.a
-	@$(MAKE) -C zlib install
+libpng freetype: zlib
+sdl-image: sdl libpng
 
-zlib: $(PREFIX)/lib/libz.a
+.PHONY: $(SUBDIRS)
diff --git a/crawl-ref/source/contrib/freetype b/crawl-ref/source/contrib/freetype
-Subproject 94b26257462f63065dce6b3248958e800d9e894
+Subproject bef9d7af30d99a0beade781abd8f365d5daedc2
diff --git a/crawl-ref/source/contrib/libpng b/crawl-ref/source/contrib/libpng
-Subproject 1a5f7d3be987aa8b8d35b554f143f76e6429958
+Subproject c87ba54002fd115b42de3689d1a68c2b22fe6c7
diff --git a/crawl-ref/source/contrib/lua b/crawl-ref/source/contrib/lua
-Subproject 9540ee4655ff723d7dd88d476725dff2d7ad0b4
+Subproject ba3b6a4968195c29f7f0023b8106843fd2458e4
diff --git a/crawl-ref/source/contrib/sdl b/crawl-ref/source/contrib/sdl
-Subproject a99f392911f097a76e2b73277ae22857314a05d
+Subproject bee99a81b808294ed71f40678ac826e86ed02e5
diff --git a/crawl-ref/source/contrib/sdl-image b/crawl-ref/source/contrib/sdl-image
-Subproject 0fcc067578c37ac5f42675bfa1240d7e116f3aa
+Subproject 2462061b9ab636f1c50fb7d3f61d58e7dc7603d
diff --git a/crawl-ref/source/contrib/sqlite b/crawl-ref/source/contrib/sqlite
-Subproject 035e853bef3cf55f509f9212dc0bdf61ba643ea
+Subproject 4ea3d289aeeca6cd5bc53877f727d67f2fb6e44
diff --git a/crawl-ref/source/contrib/zlib b/crawl-ref/source/contrib/zlib
-Subproject b2a18ab12a1080d4ac946a8819b5656f7dae2b6
+Subproject 1b3a504bdd9e158ce234f731fdf8e80b3c8a8d6