Merge remote-tracking branch 'upstream/master'

[16.git] / makefile

diff --git a/makefile b/makefile
index af0fa557811f3eec1400bcff246403e5d9735e6e..e33d63e464534e2c8b3906231aa43171f0e5241d 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -78,7 +78,7 @@ VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(OBJ)
 
-GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ)
+GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ) $(DOSLIBLIBS)
 
 DOSLIBLIBS=$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu$(DIRSEP)dos86h$(DIRSEP)cpu.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vga.lib
 
@@ -410,6 +410,7 @@ modex.$(OBJ): $(MODEXLIB_)modex.asm
 #
 clean: .symbolic
        @$(REMOVECOMMAND) $(EXEC)
+       @$(REMOVECOMMAND) /var/www/$(EXEC)*
        @$(REMOVECOMMAND) *.$(OBJ)
        @$(REMOVECOMMAND) 16.lib
        @$(REMOVECOMMAND) gfx.lib