# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1405285752 -10800
# Node ID dd35d66c371464fe04535250367c50073de6811b
# Parent  a9d0d35476ae31457eb8b0d5eb0e40420abf9520
Improve build process.

diff -r a9d0d35476ae -r dd35d66c3714 Makefile
--- a/Makefile	Sun Jul 13 23:56:55 2014 +0300
+++ b/Makefile	Mon Jul 14 00:09:12 2014 +0300
@@ -1,6 +1,14 @@
 #
 # Generic UNIX targets
 #
+DMLIB = ./
+BINPATH ?= 
+OBJPATH ?= ./obj/unix/
+EXEEXT ?=
+PREFIX ?= /usr/local
+INSTALL = install
+RANLIB = ranlib
+
 SDL_CFLAGS=`sdl-config --cflags`
 SDL_LDFLAGS=`sdl-config --static-libs`
 
@@ -16,14 +24,6 @@
 ZLIB_CFLAGS=`pkg-config --cflags zlib`
 ZLIB_LDFLAGS=`pkg-config --libs zlib`
 
-RANLIB=ranlib
-
-DMLIB = ./
-BINPATH ?= 
-OBJPATH ?= ./unix/
-EXEEXT ?=
-PREFIX ?= /usr/local
-INSTALL = install
 
 include $(DMLIB)Makefile.gen
 
diff -r a9d0d35476ae -r dd35d66c3714 Makefile.gen
--- a/Makefile.gen	Sun Jul 13 23:56:55 2014 +0300
+++ b/Makefile.gen	Mon Jul 14 00:09:12 2014 +0300
@@ -15,6 +15,9 @@
 EXTRA_CFLAGS=-O3 -march=core2 -DDM_DEVEL
 endif
 
+MKDIR ?= mkdir
+MKDIR_P ?= $(MKDIR) -p
+
 
 ###
 ### Editor
@@ -279,11 +282,22 @@
 TARGETS += $(DMLIB_A) $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(BINARIES))) \
 	$(TOOL_TARGETS) $(TESTS_TARGETS)
 
-all: $(TARGETS)
+NONBUILD+=$(OBJPATH) $(BINPATH)
+
+
+all: $(NONBUILD) $(TARGETS)
+
 
 ###
 ### Generic rules
 ###
+$(OBJPATH):
+	$(MKDIR_P) $@
+
+$(BINPATH):
+	$(MKDIR_P) $@
+
+
 $(OBJPATH)%.d: $(DMLIBSRC)%.c
 	@echo > $@
 	@grep '#\s*include\s*\"' $< | sed 's/#\s*include\s\s*"\(.*\)"/\1/' | \
diff -r a9d0d35476ae -r dd35d66c3714 Makefile.w32
--- a/Makefile.w32	Sun Jul 13 23:56:55 2014 +0300
+++ b/Makefile.w32	Mon Jul 14 00:09:12 2014 +0300
@@ -1,14 +1,14 @@
 #
 # For win32 version cross-compilation with MinGW suite @ Linux
 #
+DMLIB = ./
+BINPATH=./exe/
+OBJPATH=./obj/win32/
+EXEEXT=.exe
+
 MINGW_PREFIX=i686-w64-mingw32-
 MINGW_PATH=/usr/i686-w64-mingw32
 
-DMLIB = ./
-BINPATH=./exe/
-OBJPATH=./win32/
-EXEEXT=.exe
-
 # C-compiler, flags and linker flags
 CC=$(MINGW_PREFIX)gcc
 AR=$(MINGW_PREFIX)ar