update todo list with new stuff

[proj16/16.git] / makefile

diff --git a/makefile b/makefile
index c0f1ecb..4a47b12 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -55,7 +55,7 @@ DOSLIBMAKEALL=./buildall.sh build all
 to_os_path=/=\
 REMOVECOMMAND=del
 COPYCOMMAND=copy /y
-MOVECOMMAND=move
+MOVECOMMAND=move /y
 DIRSEP=\
 OBJ=obj
 DUMP=type
@@ -235,6 +235,7 @@ DOSLIBTESTEXEC = &
        opltest.exe
 SPRIUTILEXEC = &
        pcx2vrl &
+       png2vrl &
        pcxsscut &
        vrl2vrs &
        vrsdump &
@@ -495,7 +496,6 @@ clean: .symbolic
        @if not exist $(DOSLIBDIR)/buildall.sh wmake -s -h initlibs
        @wmake -s -h initscript
        @for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f
-       @wmake -s -h exe2e
 !ifdef __LINUX__
        @if exist *.LIB $(REMOVECOMMAND) *.LIB
        @. src/util/bcexmm.sh
@@ -503,6 +503,7 @@ clean: .symbolic
        @if exist *.OBJ $(REMOVECOMMAND) *.OBJ
        #@for %f in ($(SPRIUTILEXEC)) do @if exist %f $(REMOVECOMMAND) %f
        @if not exist vrl2vrs wmake -s -h pcx2vrl
+       ####++++@if not exist png2vrl wmake -s -h png2vrl
        @if not exist dro2imf wmake -s -h drotoimf
        @if not exist raw2vgm wmake -s -h vgmtools
 !else
@@ -578,19 +579,25 @@ initscript: .symbolic
 
 
 comp: .symbolic
-       @if exist *.exe @upx -9 *.exe#$(EXEC)
+       @wmake -s -h exe2e
+       @*upx -9 *.exe#$(EXEC)
        @wmake -s -h e2exe
 
 comq: .symbolic
-       @if exist *.exe @upx -9 $(UPXQ) *.exe#$(EXEC)
+       @wmake -s -h exe2e
+       @*upx -9 $(UPXQ) *.exe#$(EXEC)
        @wmake -s -h e2exe
 
 exe2e: .symbolic
-       @if exist *.exe $(MOVECOMMAND) *.exe *.e
-       #@for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f
+       @for %f in ($(ALLEXEC)) do @if exist %f $(MOVECOMMAND) %f $(SRCLIB)
+!ifdef __LINUX__
+       @if exist *.EXE ./make-lowercase *.EXE
+!endif
+       @if exist *.exe $(MOVECOMMAND) *.exe $(SRC)
+       @if exist $(SRCLIB)/*.exe $(MOVECOMMAND) $(SRCLIB)/*.exe .
 
 e2exe: .symbolic
-       @if exist *.e $(MOVECOMMAND) *.e *.exe
+       @if exist $(SRC)/*.exe $(MOVECOMMAND) $(SRC)/*.exe .
 
 www: .symbolic
        @if exist 16.exe @wmake -s -h wwwdo
@@ -612,7 +619,7 @@ wwwdo: .symbolic
 
 wwwext: .symbolic
        @wmake -s -h wwwext2
-       @wmake -s -h wwwext1
+       #@wmake -s -h wwwext1
 
 wwwext1: .symbolic
        ####----@ssh -p $(HOSTPORT) $(HOSTUSER)@$(HOSTADDR) 'rm -f $(HOSTDIR)/16/*exe*'