--- a/Makefile.gen	Wed Feb 04 19:09:42 2015 +0200
+++ b/Makefile.gen	Wed Feb 04 19:47:34 2015 +0200
@@ -1,8 +1,14 @@
 ###
 ### Get settings from config.mak
 ###
+ifneq ($(DMCONFIG),)
+include $(DMCONFIG)
+else
 include config.mak
+endif
 
+MKDIR ?= mkdir
+MKDIR_P ?= $(MKDIR) -p
 BINPATH ?= ./
 DMLIB ?= ./
 TOOL_BINPATH ?= $(DMLIB)tools/
@@ -11,12 +17,18 @@
 DMLIBSRC = $(DMLIB)src/
 
 DM_CFLAGS += -I$(DMLIBSRC)
+
 ifeq ($(EXTRA_CFLAGS),)
 EXTRA_CFLAGS=-O3 -march=core2 -DDM_DEVEL
 endif
 
-MKDIR ?= mkdir
-MKDIR_P ?= $(MKDIR) -p
+
+###
+### Build demo target?
+###
+ifneq ($(DEMO_BIN),)
+BINARIES += $(DEMO_BIN)
+endif
 
 
 ###
@@ -274,7 +286,7 @@
 TARGETS += $(DMLIB_A) $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(BINARIES))) \
 	$(TOOL_TARGETS) $(TESTS_TARGETS)
 
-NONBUILD+=$(OBJPATH) $(BINPATH)
+NONBUILD += $(OBJPATH) $(BINPATH)
 
 
 all: $(NONBUILD) $(TARGETS)
@@ -467,7 +479,7 @@
 
 $(TOOL_BINPATH)ppl$(EXEEXT): $(DMLIBSRC)setupfont.h $(OBJPATH)ppl.o $(DMLIB_A) 
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lm
 
 $(TOOL_BINPATH)objlink$(EXEEXT): $(OBJPATH)objlink.o $(DMLIB_A)
 	@echo " LINK $+"
@@ -487,7 +499,7 @@
 
 $(TOOL_BINPATH)auval$(EXEEXT): $(OBJPATH)auval.o $(OBJPATH)dmeval.o $(OBJPATH)dmevalw.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) -lm
 
 
 ###
@@ -495,7 +507,7 @@
 ###
 $(BINPATH)$(DEMO_BIN)$(EXEEXT): $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lm
 
 
 ###