makefile fixed from ym mistake from yesterday. i made improvements to the automated...

[16.git] / makefile

diff --git a/makefile b/makefile
index 4c7dee9fc1441084b2fae9c48bd0abc004130a26..5b9c1c810e0f2fa081eac5a30ba06867ba6c6411 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -375,11 +375,14 @@ comq: .symbolic
        @*upx -9 $(UPXQ) $(EXEC)
 
 www: .symbolic
-       @ssh -p 26 sparky4@4ch.mooo.com 'rm -f /var/www/16/*exe*'
-       #@$(REMOVECOMMAND) -f /var/www/$(EXEC)*
-       @$(REMOVECOMMAND) -f /var/www/*.exe.zip*
-       #@$(COPYCOMMAND) ./$(EXEC) $(DIRSEP)var$(DIRSEP)www$(DIRSEP)
+       @for %f in (/var/www/$(EXEC)) do @if exist /var/www/%f $(REMOVECOMMAND) /var/www/%f
+       @$(REMOVECOMMAND) /var/www/*.exe.zip*
+       @for %f in ($(EXEC)) do @if exist %f @$(COPYCOMMAND) %f /var/www/
        @./src/util/z.sh $(EXEC) $(EXEC)
+       ####@wmake -h wwwext
+
+wwwext: .symbolic
+       @ssh -p 26 sparky4@4ch.mooo.com 'rm -f /var/www/16/*exe*'
        @scp -r -P 26 *.exe 4ch.mooo.com:/var/www/16/
        @scp -r -P 26 x4get.bat 4ch.mooo.com:/var/www/16/
        @scp -r -P 26 /var/www/*.exe.zip.* 4ch.mooo.com:/var/www/16/
@@ -402,7 +405,6 @@ mkdl: .symbolic
 cldl: .symbolic
        @cd $(DOSLIB:$(to_os_path))
        @$(DOSLIBMAKEALL) $(DOSLIB_MEMMODE) clean
-       @if exist ext/readme $(REMOVECOMMAND) -rf ext/readme
        @cd $(BUILD_ROOT)
 
 uplibs: .symbolic
@@ -426,8 +428,7 @@ initlibs: .symbolic
        @$(COPYCOMMAND) git_con.fig .git/config
        @$(COPYCOMMAND) git_modu.les .gitmodules
        @$(COPYCOMMAND) git_igno.re .gitignore
-       @wmake -h cldl
-       @wmake -h jmdl
+       @wmake -h getlib
        @cd 16
        @git clone https://github.com/FlatRockSoft/CatacombApocalypse.git
        @git clone https://github.com/id-Software/wolf3d.git
@@ -436,13 +437,9 @@ initlibs: .symbolic
        @cd $(BUILD_ROOT)
        @$(COPYCOMMAND) $(DOSLIB)/make-lowercase .
 
-dlcl: .symbolic
+getlib: .symbolic
        @cd $(SRCLIB:$(to_os_path))
        @git clone https://github.com/joncampbell123/doslib.git
-       @cd $(BUILD_ROOT)
-
-jmcl: .symbolic
-       @cd $(SRCLIB:$(to_os_path))
        @git clone https://github.com/zserge/jsmn.git
        @cd $(BUILD_ROOT)