even more cleanup

9 files changed, 54 insertions, 56 deletions

diff --git a/build/build-x64.bat b/build/build-x64.bat
index d4378121..4121cc8e 100644
--- a/build/build-x64.bat
+++ b/build/build-x64.bat
@@ -14,7 +14,7 @@ cd ..
 nmake /nologo /f makefile.mak
 cd ..\plugins
 nmake /nologo /f makefile.mak clean
-nmake /f makefile.mak
+nmake /nologo /f makefile.mak
 cd ..\build
 set PATH=%OPATH%
 call release-x64.bat
diff --git a/build/compile-po-files.bat b/build/compile-po-files.bat
index 68e9b729..d9fd3ee5 100644
--- a/build/compile-po-files.bat
+++ b/build/compile-po-files.bat
@@ -2,7 +2,7 @@
 
 echo.Compiling translations . . .
 cd ..\po
-rmdir /Q /S locale
+rmdir /q /s locale
 mkdir locale
 
 mkdir locale\am\LC_MESSAGES
diff --git a/build/release-x64.bat b/build/release-x64.bat
index dcff6892..fc410486 100644
--- a/build/release-x64.bat
+++ b/build/release-x64.bat
@@ -12,7 +12,6 @@ copy %GTK_BIN%\libgmodule-2.0-0.dll %XCHAT_DEST%\libgmodule-2.0-0.dll.x64
 copy %GTK_BIN%\libgobject-2.0-0.dll %XCHAT_DEST%\libgobject-2.0-0.dll.x64
 copy %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST%\libgthread-2.0-0.dll.x64
 copy %GTK_BIN%\libpng14-14.dll %XCHAT_DEST%\libpng14-14.dll.x64
-::copy %GTK_BIN%\zlib1.dll %XCHAT_DEST%\zlib1.dll.x64
 copy %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST%\libgdk-win32-2.0-0.dll.x64
 copy %GTK_BIN%\libcairo-2.dll %XCHAT_DEST%\libcairo-2.dll.x64
 copy %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST%\libfontconfig-1.dll.x64
@@ -24,9 +23,9 @@ copy %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST%\libpangoft2-1.0-0.dll.x64
 copy %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST%\libpangowin32-1.0-0.dll.x64
 copy %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST%\libatk-1.0-0.dll.x64
 copy %GTK_BIN%\libintl-8.dll %XCHAT_DEST%\libintl-8.dll.x64
-::copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll.x64
+copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll.x64
 copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libwimp.dll.x64
-::copy %GTK_BIN%\..\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\libgail.dll.x64
+copy %GTK_BIN%\..\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\libgail.dll.x64
 copy %SSL_BIN%\libeay32.dll %XCHAT_DEST%\libeay32.dll.x64
 copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%\ssleay32.dll.x64
 copy %SSL_BIN%\zlib1.dll %XCHAT_DEST%\zlib1.dll.x64
diff --git a/build/release-x86.bat b/build/release-x86.bat
index da32d3dc..46aa44a8 100644
--- a/build/release-x86.bat
+++ b/build/release-x86.bat
@@ -5,44 +5,43 @@ set LUA_BIN=c:\mozilla-build\build\lua-wdk-5.1.4-2-x86\bin
 set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-uni
 rmdir /q /s %XCHAT_DEST%
 mkdir %XCHAT_DEST%
-xcopy /q ..\src\fe-gtk\xchat.exe %XCHAT_DEST%
-xcopy /q %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST%
-xcopy /q %GTK_BIN%\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%
-xcopy /q %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST%
-xcopy /q %GTK_BIN%\libglib-2.0-0.dll %XCHAT_DEST%
-xcopy /q %GTK_BIN%\libgmodule-2.0-0.dll %XCHAT_DEST%
-xcopy /q %GTK_BIN%\libgobject-2.0-0.dll %XCHAT_DEST%
-xcopy /q %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST%
-xcopy /q %GTK_BIN%\libpng14-14.dll %XCHAT_DEST%
-::xcopy /q %GTK_BIN%\zlib1.dll %XCHAT_DEST%
-xcopy /q %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST%
-xcopy /q %GTK_BIN%\libcairo-2.dll %XCHAT_DEST%
-xcopy /q %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST%
-xcopy /q %GTK_BIN%\libexpat-1.dll %XCHAT_DEST%
-xcopy /q %GTK_BIN%\freetype6.dll %XCHAT_DEST%
-xcopy /q %GTK_BIN%\libpango-1.0-0.dll %XCHAT_DEST%
-xcopy /q %GTK_BIN%\libpangocairo-1.0-0.dll %XCHAT_DEST%
-xcopy /q %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST%
-xcopy /q %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST%
-xcopy /q %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST%
-xcopy /q %GTK_BIN%\intl.dll %XCHAT_DEST%
-::xcopy /q /s /i %GTK_BIN%\..\lib\gtk-2.0 %XCHAT_DEST%\lib\gtk-2.0
-::rmdir /q /s %XCHAT_DEST%\lib\gtk-2.0\include
-xcopy /q /s /i %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\
+copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%
+copy %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST%
+copy %GTK_BIN%\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%
+copy %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST%
+copy %GTK_BIN%\libglib-2.0-0.dll %XCHAT_DEST%
+copy %GTK_BIN%\libgmodule-2.0-0.dll %XCHAT_DEST%
+copy %GTK_BIN%\libgobject-2.0-0.dll %XCHAT_DEST%
+copy %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST%
+copy %GTK_BIN%\libpng14-14.dll %XCHAT_DEST%
+copy %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST%
+copy %GTK_BIN%\libcairo-2.dll %XCHAT_DEST%
+copy %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST%
+copy %GTK_BIN%\libexpat-1.dll %XCHAT_DEST%
+copy %GTK_BIN%\freetype6.dll %XCHAT_DEST%
+copy %GTK_BIN%\libpango-1.0-0.dll %XCHAT_DEST%
+copy %GTK_BIN%\libpangocairo-1.0-0.dll %XCHAT_DEST%
+copy %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST%
+copy %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST%
+copy %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST%
+copy %GTK_BIN%\intl.dll %XCHAT_DEST%
+copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines
+copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines
+copy %GTK_BIN%\..\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules
 xcopy /q /s /i etc %XCHAT_DEST%\etc
-xcopy /q ..\COPYING %XCHAT_DEST%
-xcopy /q %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST%
-xcopy /q %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST%
-xcopy /q %SSL_BIN%\libeay32.dll %XCHAT_DEST%
-xcopy /q %SSL_BIN%\ssleay32.dll %XCHAT_DEST%
-xcopy /q %SSL_BIN%\zlib1.dll %XCHAT_DEST%
-xcopy /q /s /i ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\
-xcopy /q /s /i ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\
-xcopy /q /s /i ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins\
-xcopy /q /s /i ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins\
-xcopy /q /s /i ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins\
-xcopy /q /s /i ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\
-xcopy /q %LUA_BIN%\lua51.dll %XCHAT_DEST%
+copy ..\COPYING %XCHAT_DEST%
+copy %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST%
+copy %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST%
+copy %SSL_BIN%\libeay32.dll %XCHAT_DEST%
+copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%
+copy %SSL_BIN%\zlib1.dll %XCHAT_DEST%
+copy ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins
+copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins
+copy ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins
+copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins
+copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins
+copy ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins
+copy %LUA_BIN%\lua51.dll %XCHAT_DEST%
 xcopy /q /s /i ..\po\locale %XCHAT_DEST%\locale
 xcopy /q /s /i %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale
 echo 2> portable-mode
diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss
index 076b9df2..ad9f76df 100644
--- a/build/xchat-wdk.iss
+++ b/build/xchat-wdk.iss
@@ -136,14 +136,14 @@ Source: "zlib1.dll.x64"; DestDir: "{app}"; DestName: "zlib1.dll"; Components: li
 

 

 

-;Source: "lib\gtk-2.0\2.10.0\engines\libpixmap.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: libs; Tasks: x86

-;Source: "lib\gtk-2.0\2.10.0\engines\libpixmap.dll.x64"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; DestName: "libpixmap.dll"; Components: libs; Tasks: x64

+Source: "lib\gtk-2.0\2.10.0\engines\libpixmap.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: libs; Tasks: x86

+Source: "lib\gtk-2.0\2.10.0\engines\libpixmap.dll.x64"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; DestName: "libpixmap.dll"; Components: libs; Tasks: x64

 

 Source: "lib\gtk-2.0\2.10.0\engines\libwimp.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: libs; Tasks: x86

 Source: "lib\gtk-2.0\2.10.0\engines\libwimp.dll.x64"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; DestName: "libwimp.dll"; Components: libs; Tasks: x64

 

-;Source: "lib\gtk-2.0\modules\libgail.dll"; DestDir: "{app}\lib\gtk-2.0\modules"; Components: libs; Tasks: x86

-;Source: "lib\gtk-2.0\modules\libgail.dll.x64"; DestDir: "{app}\lib\gtk-2.0\modules"; DestName: "libgail.dll"; Components: libs; Tasks: x64

+Source: "lib\gtk-2.0\modules\libgail.dll"; DestDir: "{app}\lib\gtk-2.0\modules"; Components: libs; Tasks: x86

+Source: "lib\gtk-2.0\modules\libgail.dll.x64"; DestDir: "{app}\lib\gtk-2.0\modules"; DestName: "libgail.dll"; Components: libs; Tasks: x64

 

 

 

diff --git a/src/common/makefile.mak b/src/common/makefile.mak
index 12ac05cd..edd2b905 100644
--- a/src/common/makefile.mak
+++ b/src/common/makefile.mak
@@ -9,5 +9,5 @@ xchatcommon.lib: $(COMMON_OBJECTS)
 	$(CC) $(CFLAGS) $(GLIB) $<
 
 clean:
-	del *.obj
-	del xchatcommon.lib
+	@del *.obj
+	@del xchatcommon.lib
diff --git a/src/fe-gtk/makefile.mak b/src/fe-gtk/makefile.mak
index 6ec86d3a..e3d1f972 100644
--- a/src/fe-gtk/makefile.mak
+++ b/src/fe-gtk/makefile.mak
@@ -30,8 +30,8 @@ xchat-icon.obj: xchat.res
 	cvtres /nologo $(MACHINE_FLAG) /OUT:xchat-icon.obj xchat.res
 
 clean:
-	del *.obj
-	del fe-gtk\mmx_cmod.o
-	del $(PROG)
-	del xchat.rc
-	del xchat.RES
+	@del *.obj
+	@del mmx_cmod.o
+	@del $(PROG)
+	@del xchat.rc
+	@del xchat.res
diff --git a/src/makefile.mak b/src/makefile.mak
index cae74cd4..93def686 100644
--- a/src/makefile.mak
+++ b/src/makefile.mak
@@ -1,7 +1,7 @@
 all:
-	cd common
+	@cd common
 	@-$(MAKE) /nologo /s /f makefile.mak $@
-	cd ..\fe-gtk
+	@cd ..\fe-gtk
 	@-$(MAKE) /nologo /s /f makefile.mak $@
 
 clean:
diff --git a/src/pixmaps/makefile.mak b/src/pixmaps/makefile.mak
index 4c7702d1..f9535dbe 100644
--- a/src/pixmaps/makefile.mak
+++ b/src/pixmaps/makefile.mak
@@ -15,4 +15,4 @@ all:
 	@$(CONV) --build-list $(LIST) > inline_pngs.h
 
 clean:
-	del *.h
+	@del *.h