--- a/Makefile.gen	Sat Oct 06 07:48:29 2012 +0300
+++ b/Makefile.gen	Sat Oct 06 08:00:24 2012 +0300
@@ -228,19 +228,19 @@
 $(DMLIB)jmix_c.c: $(DMLIB)jmix_c_in.c $(DMLIB)jmixtmpl_c.h $(DMLIB)jmix_post_c.h
 	(echo "#include \"jssmix.h\"" && cpp $< $(DM_CFLAGS)) | sed "s/^# .*//g" > $@
 
-$(OBJPATH)dmimage.o: $(DMLIB)dmimage.c $(DMLIB)stb_image.c
+$(OBJPATH)dmimage.o: $(DMLIB)dmimage.c $(DMLIB)stb_image.c $(DMLIB)dmimage.h
 	@echo " CC $+"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
-$(OBJPATH)dmblit.o: $(DMLIB)dmblit.c $(DMLIB)dmscaledblit.h $(DMLIB)dmunscaledblit.h $(DMLIB)dmblitfunc.h
+$(OBJPATH)dmblit.o: $(DMLIB)dmblit.c $(DMLIB)dmscaledblit.h $(DMLIB)dmunscaledblit.h $(DMLIB)dmblitfunc.h $(DMLIB)dmlib.h
 	@echo " CC $+"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
-$(OBJPATH)dmline.o: $(DMLIB)dmline.c $(DMLIB)dmdrawline.h $(DMLIB)dmlinefunc.h
+$(OBJPATH)dmline.o: $(DMLIB)dmline.c $(DMLIB)dmdrawline.h $(DMLIB)dmlinefunc.h $(DMLIB)dmlib.h
 	@echo " CC $+"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
-$(OBJPATH)dmargs.o: $(DMLIB)dmargs.c $(DMLIB)dmargs.h $(DMLIB)dmargs_int.c
+$(OBJPATH)dmargs.o: $(DMLIB)dmargs.c $(DMLIB)dmargs.h $(DMLIB)dmargs_int.c $(DMLIB)dmlib.h
 	@echo " CC $+"
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
 
@@ -257,55 +257,55 @@
 ###
 $(BINPATH)%$(EXEEXT): $(OBJPATH)%.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $+ $(DM_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
 
 $(BINPATH)vview$(EXEEXT): $(OBJPATH)vview.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $+ $(DM_LDFLAGS) -lSDL_ttf
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lSDL_ttf
 
 $(BINPATH)blittest$(EXEEXT): $(OBJPATH)blittest.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $+ $(DM_LDFLAGS) -lSDL_ttf
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lSDL_ttf
 
 $(BINPATH)efu$(EXEEXT): $(OBJPATH)efu.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $+ $(DM_LDFLAGS) -lSDL_ttf
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lSDL_ttf
 
 $(BINPATH)vptest$(EXEEXT): $(OBJPATH)vptest.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $+ $(DM_LDFLAGS) -lSDL_ttf
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lSDL_ttf
 
 $(BINPATH)%test$(EXEEXT): $(OBJPATH)%test.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $+ $(DM_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
 
 $(BINPATH)packed$(EXEEXT): $(OBJPATH)packed.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $+ $(DM_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
 
 $(BINPATH)mod2wav$(EXEEXT): $(OBJPATH)mod2wav.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $+ $(DM_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
 
 $(BINPATH)xm2jss$(EXEEXT): $(OBJPATH)xm2jss.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $+ $(DM_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
 
 $(BINPATH)viewmod$(EXEEXT): $(OBJPATH)viewmod.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $+ $(DM_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
 
 $(BINPATH)fontconv$(EXEEXT): $(OBJPATH)fontconv.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $+ $(DM_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
 
 $(BINPATH)testpl$(EXEEXT): $(OBJPATH)testpl.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $+ $(DM_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
 
 $(BINPATH)ppl$(EXEEXT): $(OBJPATH)ppl.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $+ $(DM_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
 
 
 ###