# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1403315528 -10800
# Node ID 904c359b1ced0b4ef169955d76214c76c9cc7e09
# Parent  edac1485308db217dbd53e0ae3c44b6bdc290719
Improve build system.

diff -r edac1485308d -r 904c359b1ced Makefile
--- a/Makefile	Sat Jun 21 03:02:43 2014 +0300
+++ b/Makefile	Sat Jun 21 04:52:08 2014 +0300
@@ -16,7 +16,7 @@
 
 # Miscellaneous
 BINPATH=
-OBJPATH=
+OBJPATH=obj/unix/
 EXEEXT=
 
 
diff -r edac1485308d -r 904c359b1ced Makefile.gen
--- a/Makefile.gen	Sat Jun 21 03:02:43 2014 +0300
+++ b/Makefile.gen	Sat Jun 21 04:52:08 2014 +0300
@@ -3,6 +3,9 @@
 #CFLAGS += -std=c99 -pedantic
 THLIBS=th-libs/
 
+MKDIR ?= mkdir
+MKDIR_P ?= $(MKDIR) -p
+
 #
 # Version strings
 #
@@ -22,12 +25,19 @@
 
 TARGETS+=$(THLIBS_A) $(NNCHAT_BIN)
 
+NONBUILD+=$(OBJPATH) $(BINPATH)
 
 #
 # Target rules
 #
 all: $(NONBUILD) $(TARGETS)
 
+$(OBJPATH):
+	$(MKDIR_P) $@
+
+$(BINPATH):
+	$(MKDIR_P) $@
+
 $(OBJPATH)%.o: $(THLIBS)%.c $(THLIBS)%.h
 	$(CC) $(CFLAGS) -c -o $@ $<
 
diff -r edac1485308d -r 904c359b1ced Makefile.w32
--- a/Makefile.w32	Sat Jun 21 03:02:43 2014 +0300
+++ b/Makefile.w32	Sat Jun 21 04:52:08 2014 +0300
@@ -14,18 +14,14 @@
 
 # Miscellaneous
 EXEEXT=.exe
-OBJPATH=./win32/
-BINPATH=./installer/
-NONBUILD=$(OBJPATH)
+OBJPATH=obj/win32/
+BINPATH=installer/
 
 EXTRAOBJS= resource.o
 ICON=resource.ico
 
 include Makefile.gen
 
-$(OBJPATH):
-	mkdir $@
-
 resource.rc: resource.rc.in $(ICON) VERSION
 	sed -e "s/@VERSION@/$(NN_VERSION)/g;s/@VERSION_COM@/$(NN_VERSION_COM)/g;s/@ICON@/$(ICON)/g;s#@EXE@#$(notdir $(NNCHAT_BIN))#g" < $< > $@