--- a/Makefile.gen	Fri May 16 03:01:51 2014 +0300
+++ b/Makefile.gen	Fri May 16 03:22:39 2014 +0300
@@ -8,8 +8,9 @@
 TOOL_BINPATH ?= $(DMLIB)tools/
 TESTS_BINPATH ?= $(DMLIB)tests/
 
+DMLIBSRC = $(DMLIB)src/
 
-DM_CFLAGS += -I$(DMLIB)
+DM_CFLAGS += -I$(DMLIBSRC)
 ifeq ($(EXTRA_CFLAGS),)
 EXTRA_CFLAGS=-O3 -march=core2 -DDM_DEVEL
 endif
@@ -283,7 +284,7 @@
 ###
 ### Generic rules
 ###
-$(OBJPATH)%.d: $(DMLIB)%.c
+$(OBJPATH)%.d: $(DMLIBSRC)%.c
 	@echo > $@
 	@grep '#\s*include\s*\"' $< | sed 's/#\s*include\s\s*"\(.*\)"/\1/' | \
 	while read i; do if test -e "$$i"; then echo "$$i" >> $@; fi; done
@@ -317,14 +318,15 @@
 
 
 
-$(OBJPATH)%.o: $(DMLIB)%.c $(DMLIB)%.h
+$(OBJPATH)%.o: $(DMLIBSRC)%.c $(DMLIBSRC)%.h
 	@echo " CC $<"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
-$(OBJPATH)%.o: $(DMLIB)%.c
+$(OBJPATH)%.o: $(DMLIBSRC)%.c
 	@echo " CC $<"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
+
 $(OBJPATH)%.o: %.c %.h
 	@echo " CC $<"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
@@ -341,7 +343,7 @@
 $(MINIJSS)jmix_c.c: $(MINIJSS)jmix_c_in.c $(MINIJSS)jmixtmpl_c.h $(MINIJSS)jmix_post_c.h
 	(echo "#include \"jssmix.h\"" && cpp $< $(DM_CFLAGS)) | sed "s/^# .*//g" > $@
 
-$(OBJPATH)dmimage.o: $(DMLIB)dmimage.c $(DMLIB)stb_image.c $(DMLIB)dmimage.h
+$(OBJPATH)dmimage.o: $(DMLIBSRC)dmimage.c $(DMLIBSRC)stb_image.c $(DMLIBSRC)dmimage.h
 	@echo " CC $+"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
@@ -358,19 +360,19 @@
 	@echo " CC $+"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
-$(OBJPATH)dmblit.o: $(DMLIB)dmblit.c $(DMLIB)dmscaledblit.h $(DMLIB)dmunscaledblit.h $(DMLIB)dmblitfunc.h $(DMLIB)dmlib.h
+$(OBJPATH)dmblit.o: $(DMLIBSRC)dmblit.c $(DMLIBSRC)dmscaledblit.h $(DMLIBSRC)dmunscaledblit.h $(DMLIBSRC)dmblitfunc.h $(DMLIBSRC)dmlib.h
 	@echo " CC $+"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
-$(OBJPATH)dmline.o: $(DMLIB)dmline.c $(DMLIB)dmdrawline.h $(DMLIB)dmlinefunc.h $(DMLIB)dmlineclip.h $(DMLIB)dmlib.h
+$(OBJPATH)dmline.o: $(DMLIBSRC)dmline.c $(DMLIBSRC)dmdrawline.h $(DMLIBSRC)dmlinefunc.h $(DMLIBSRC)dmlineclip.h $(DMLIBSRC)dmlib.h
 	@echo " CC $+"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
-$(OBJPATH)dmargs.o: $(DMLIB)dmargs.c $(DMLIB)dmargs.h $(DMLIB)dmargs_int.c $(DMLIB)dmlib.h
+$(OBJPATH)dmargs.o: $(DMLIBSRC)dmargs.c $(DMLIBSRC)dmargs.h $(DMLIBSRC)dmargs_int.c $(DMLIBSRC)dmlib.h
 	@echo " CC $+"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
-$(OBJPATH)libgfx.o: $(DMLIB)libgfx.c $(DMLIB)libgfx.h
+$(OBJPATH)libgfx.o: $(DMLIBSRC)libgfx.c $(DMLIBSRC)libgfx.h
 	@echo " CC $+"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) $(LIBPNG_CFLAGS)
 
@@ -378,19 +380,19 @@
 $(DMLIB)assets/SetupFont.dmf: $(DMLIB)assets/SetupFont.fnt
 	$(FONTCONV_BIN) -o $@ $<
 
-$(DMLIB)setupfont.h: $(DMLIB)assets/SetupFont.dmf
+$(DMLIBSRC)setupfont.h: $(DMLIB)assets/SetupFont.dmf
 	$(DATA2INC_BIN) -q -C -n engineSetupFont -t Uint8 $< $@
 
-$(DMLIB)setupimage.h: $(DMLIB)assets/SetupImage.png
+$(DMLIBSRC)setupimage.h: $(DMLIB)assets/SetupImage.png
 	$(DATA2INC_BIN) -q -C -n engineSetupImage -t Uint8 $< $@
 
-$(DMLIB)setupmenubar.h: $(DMLIB)assets/SetupMenuBar.png
+$(DMLIBSRC)setupmenubar.h: $(DMLIB)assets/SetupMenuBar.png
 	$(DATA2INC_BIN) -q -C -n engineSetupMenuBar -t Uint8 $< $@
 
 
-$(OBJPATH)dmsimple.o: $(DMLIB)dmsimple.c $(DMLIB)dmengine.h \
-	$(DMLIB)setupmenubar.h $(DMLIB)setupfont.h \
-	$(DMLIB)setupimage.h $(DMLIB)dmsimple.c
+$(OBJPATH)dmsimple.o: $(DMLIBSRC)dmsimple.c $(DMLIBSRC)dmengine.h \
+	$(DMLIBSRC)setupmenubar.h $(DMLIBSRC)setupfont.h \
+	$(DMLIBSRC)setupimage.h $(DMLIBSRC)dmsimple.c
 	@echo " CC $+"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
@@ -457,7 +459,7 @@
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
 
-$(TOOL_BINPATH)ppl$(EXEEXT): $(DMLIB)setupfont.h $(OBJPATH)ppl.o $(DMLIB_A) 
+$(TOOL_BINPATH)ppl$(EXEEXT): $(DMLIBSRC)setupfont.h $(OBJPATH)ppl.o $(DMLIB_A) 
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)