From 9c7fc9fddc90ceaddc1c79d4bfc911976164b4d8 Mon Sep 17 00:00:00 2001
From: z3APA3A <3APA3A@3proxy.ru>
Date: Tue, 24 Nov 2020 19:00:49 +0300
Subject: [PATCH] correct clean

---
 Makefile.inc     |  7 ++-----
 Makefile.msvc    |  4 ++--
 Makefile.watcom  | 41 +++++++++++++++++++++++++++++++++++------
 src/Makefile.inc |  2 --
 4 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 5448bdb..928aecd 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -3,14 +3,11 @@
 #
 
 all:
-	$(TYPECOMMAND) $(MAKEFILE) > src/Makefile.var
+	@$(TYPECOMMAND) $(MAKEFILE) > src/Makefile.var
 	@cd src && $(MAKE)
 
 clean:
-	@$(REMOVECOMMAND) *$(OBJSUFFICS) $(COMPFILES)
-	@cd src
-	$(MAKE) clean
-	@cd ..
+	@cd src && $(REMOVECOMMAND) *$(OBJSUFFICS) $(COMPFILES) && cd ..
 	@$(AFTERCLEAN)
 	
 
diff --git a/Makefile.msvc b/Makefile.msvc
index 3cb94e0..a0b52e4 100644
--- a/Makefile.msvc
+++ b/Makefile.msvc
@@ -24,7 +24,7 @@ EXESUFFICS = .exe
 OBJSUFFICS = .obj
 DEFINEOPTION = /D 
 COMPFILES = *.pch *.idb
-REMOVECOMMAND = del 2>NUL >NUL
+REMOVECOMMAND = del
 TYPECOMMAND = type
 COMPATLIBS =
 MAKEFILE = Makefile.msvc
@@ -33,7 +33,7 @@ VERFILE = 3proxy.res $(VERFILE)
 VERSION = $(VERSION)
 VERSIONDEP = 3proxy.res $(VERSIONDEP)
 BUILDDATE = $(BUILDDATE)
-AFTERCLEAN = if exist src\*.res del src\*.res
+AFTERCLEAN = if exist src\*.res (del src\*.res) && if exist src\*.err (del src\*.err)
 
 include Makefile.inc
 
diff --git a/Makefile.watcom b/Makefile.watcom
index 1889883..4eab735 100644
--- a/Makefile.watcom
+++ b/Makefile.watcom
@@ -30,14 +30,43 @@ COMPATLIBS =
 MAKEFILE = Makefile.watcom
 PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin
 VERFILE = $(VERFILE)
+VERSION = $(VERSION)
+VERSIONDEP = 3proxy.res $(VERSIONDEP)
+BUILDDATE = $(BUILDDATE)
 
 include Makefile.inc
 
-../3proxy.res:
-	rc /fo../3proxy.res ../3proxy.rc $(VERSION) $(BUILDDATE)
-
-3proxyres.obj: ../3proxy.res
-	cvtres /out:3proxyres.obj ../3proxy.res
+3proxy.res:
+	rc 3proxy.rc
 
 allplugins:
-	call ../makeplugins.bat	
\ No newline at end of file
+	copy Makefile plugins\utf8tocp1251
+	copy Makefile.var plugins\utf8tocp1251
+	cd plugins\utf8tocp1251
+	nmake
+	del *.obj *.idb
+	cd ../../
+	copy Makefile plugins\WindowsAuthentication
+	copy Makefile.var plugins\WindowsAuthentication
+	cd plugins\WindowsAuthentication
+	nmake
+	del *.obj *.idb
+	cd ../../
+	copy Makefile plugins\TrafficPlugin
+	copy Makefile.var plugins\TrafficPlugin
+	cd plugins\TrafficPlugin
+	nmake
+	del *.obj *.idb
+	cd ../../
+	copy Makefile plugins\StringsPlugin
+	copy Makefile.var plugins\StringsPlugin
+	cd plugins\StringsPlugin
+	nmake
+	del *.obj *.idb
+	cd ../../
+	copy Makefile plugins\PCREPlugin
+	copy Makefile.var plugins\PCREPlugin
+	cd plugins\PCREPlugin
+	nmake
+	del *.obj *.idb
+	cd ../../
diff --git a/src/Makefile.inc b/src/Makefile.inc
index 16f6517..a0b1e52 100644
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -146,5 +146,3 @@ stringtable$(OBJSUFFICS):  stringtable.c
 $(BUILDDIR)3proxy$(EXESUFFICS): 3proxy$(OBJSUFFICS) mainfunc$(OBJSUFFICS) srvproxy$(OBJSUFFICS) srvpop3p$(OBJSUFFICS) srvsmtpp$(OBJSUFFICS) srvftppr$(OBJSUFFICS) srvsocks$(OBJSUFFICS) srvtcppm$(OBJSUFFICS) srvudppm$(OBJSUFFICS) sockmap$(OBJSUFFICS) sockgetchar$(OBJSUFFICS) common$(OBJSUFFICS) auth$(OBJSUFFICS) authradius$(OBJSUFFICS) conf$(OBJSUFFICS) log$(OBJSUFFICS) datatypes$(OBJSUFFICS) md4$(OBJSUFFICS) md5$(OBJSUFFICS) mycrypt$(OBJSUFFICS) base64$(OBJSUFFICS) ftp$(OBJSUFFICS) smbdes$(OBJSUFFICS) ntlm$(OBJSUFFICS) stringtable$(OBJSUFFICS) srvwebadmin$(OBJSUFFICS) srvdnspr$(OBJSUFFICS) plugins$(OBJSUFFICS) $(COMPATLIBS) $(VERSIONDEP)
 	$(LN) $(LNOUT)$(BUILDDIR)3proxy$(EXESUFFICS) $(LDFLAGS) $(VERFILE)  3proxy$(OBJSUFFICS) mainfunc$(OBJSUFFICS) auth$(OBJSUFFICS) authradius$(OBJSUFFICS) conf$(OBJSUFFICS) datatypes$(OBJSUFFICS) srvproxy$(OBJSUFFICS) srvpop3p$(OBJSUFFICS) srvsmtpp$(OBJSUFFICS) srvftppr$(OBJSUFFICS) srvsocks$(OBJSUFFICS) srvtcppm$(OBJSUFFICS) srvudppm$(OBJSUFFICS) sockmap$(OBJSUFFICS) sockgetchar$(OBJSUFFICS) common$(OBJSUFFICS) log$(OBJSUFFICS) mycrypt$(OBJSUFFICS) md5$(OBJSUFFICS) md4$(OBJSUFFICS) base64$(OBJSUFFICS) ftp$(OBJSUFFICS) smbdes$(OBJSUFFICS) ntlm$(OBJSUFFICS) stringtable$(OBJSUFFICS) srvwebadmin$(OBJSUFFICS) srvdnspr$(OBJSUFFICS) plugins$(OBJSUFFICS) $(COMPATLIBS) $(LIBS)
 
-clean:
-	@$(REMOVECOMMAND) *$(OBJSUFFICS) $(COMPFILES)