# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1348787297 -10800
# Node ID 6e169d87d963126f7f14c677b8e39094177696e0
# Parent  32250b436bca27d4412f3c6ede70fdb0b444f918
Improve buildsystem to support more flexible builds.

diff -r 32250b436bca -r 6e169d87d963 Makefile
--- a/Makefile	Fri Sep 28 01:54:23 2012 +0300
+++ b/Makefile	Fri Sep 28 02:08:17 2012 +0300
@@ -6,8 +6,9 @@
 
 RANLIB=ranlib
 
+DMLIB = ./
 BINPATH ?= ./exe/
 OBJPATH ?= ./unix/
 EXEEXT ?=
 
-include Makefile.gen
+include $(DMLIB)Makefile.gen
diff -r 32250b436bca -r 6e169d87d963 Makefile.gen
--- a/Makefile.gen	Fri Sep 28 01:54:23 2012 +0300
+++ b/Makefile.gen	Fri Sep 28 02:08:17 2012 +0300
@@ -123,7 +123,9 @@
 endif
 
 ifeq ($(DM_USE_C),yes)
+TARGETS += jmix_c.c
 DMLIB_OBJS+=jmix_c.o
+
 endif
 
 #ifeq ($(DM_USE_SIMD),yes)
@@ -161,7 +163,7 @@
 
 BINARIES += vecmattest fptest
 
-TARGETS=$(DMLIB_A) $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(BINARIES)))
+TARGETS += $(DMLIB_A) $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(BINARIES)))
 
 all: $(TARGETS)
 
@@ -169,11 +171,11 @@
 ### Generic rules
 ###
 
-$(OBJPATH)%.o: %.c %.h
+$(OBJPATH)%.o: $(DMLIB)%.c $(DMLIB)%.h
 	@echo " CC $<"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
-$(OBJPATH)%.o: %.c
+$(OBJPATH)%.o: $(DMLIB)%.c
 	@echo " CC $<"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
@@ -182,23 +184,23 @@
 ### dmlib rules
 ###
 
-jmix_c.c: jmix_c.in.c jmix_c.h jmix_post.h
+$(DMLIB)jmix_c.c: $(DMLIB)jmix_c.in.c $(DMLIB)jmix_c.h $(DMLIB)jmix_post.h
 	(echo "#include \"jssmix.h\"" && cpp $<) | sed "s/^# .*//g" > $@
 
 
-$(OBJPATH)dmimage.o: dmimage.c stb_image.c
+$(OBJPATH)dmimage.o: $(DMLIB)dmimage.c $(DMLIB)stb_image.c
 	@echo " CC $+"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
-$(OBJPATH)dmblit.o: dmblit.c dmscaledblit.h dmblitfunc.h
+$(OBJPATH)dmblit.o: $(DMLIB)dmblit.c $(DMLIB)dmscaledblit.h $(DMLIB)dmblitfunc.h
 	@echo " CC $+"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
-$(OBJPATH)dmline.o: dmline.c dmdrawline.h dmlinefunc.h
+$(OBJPATH)dmline.o: $(DMLIB)dmline.c $(DMLIB)dmdrawline.h $(DMLIB)dmlinefunc.h
 	@echo " CC $+"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
-$(OBJPATH)dmargs.o: dmargs.c dmargs.h dmargs_int.c
+$(OBJPATH)dmargs.o: $(DMLIB)dmargs.c $(DMLIB)dmargs.h $(DMLIB)dmargs_int.c
 	@echo " CC $+"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
diff -r 32250b436bca -r 6e169d87d963 Makefile.w32
--- a/Makefile.w32	Fri Sep 28 01:54:23 2012 +0300
+++ b/Makefile.w32	Fri Sep 28 02:08:17 2012 +0300
@@ -4,6 +4,7 @@
 MINGW_PREFIX=i686-w64-mingw32-
 MINGW_PATH=/usr/i686-w64-mingw32
 
+DMLIB = ./
 BINPATH=./exe/
 OBJPATH=./win32/
 EXEEXT=.exe
@@ -21,4 +22,4 @@
 LDFLAGS=-lmingw32 -s
 
 
-include Makefile.gen
+include $(DMLIB)Makefile.gen