Fix 'aux' cluster breakages. Move aux into obj.

Move aux directories into the appropriate obj directories.
Makes cleaning easier, and is neater overall.

Also fix some unrelated problems with cleaning in the msvc builds.

8 files changed, 16 insertions, 38 deletions

diff --git a/common/msvc_top.mak b/common/msvc_top.mak
index f5b328492..c0ef23680 100644
--- a/common/msvc_top.mak
+++ b/common/msvc_top.mak
@@ -35,10 +35,10 @@ clean_gs:
 	nmake /f $(GLSRCDIR)\msvclib.mak \
 	GLSRCDIR=$(GLSRCDIR) GLGENDIR=$(GLGENDIR) \
 	GLOBJDIR=$(GLOBJDIR) clean
-	erase $(TARGET_XE).ilk
-	erase $(TARGET_XE).pdb
-	erase $(TARGET_XE).exp
-	erase $(TARGET_XE).lib
+	-erase $(TARGET_XE).ilk
+	-erase $(TARGET_XE).pdb
+	-erase $(TARGET_XE).exp
+	-erase $(TARGET_XE).lib
 
 # Define names of utility programs
 AUX=$(AUXDIR)$(D)
diff --git a/common/pcdefs.mak b/common/pcdefs.mak
index 0f82b7539..a5ef9dc7e 100644
--- a/common/pcdefs.mak
+++ b/common/pcdefs.mak
@@ -16,5 +16,5 @@ _I=
 XE=.exe
 
 CP_=copy /B
-RM_=erase
-RMN_=call $(COMMONDIR)\rm.bat
+RM_=-erase
+RMN_=-call $(COMMONDIR)\rm.bat
diff --git a/gs/base/all-arch.mak b/gs/base/all-arch.mak
index e4edffea3..5e2a4e4b2 100644
--- a/gs/base/all-arch.mak
+++ b/gs/base/all-arch.mak
@@ -157,8 +157,8 @@ DD			= $(GLD)
 GLD			= $(GLGENDIR)/
 GLGENDIR		= ./obj
 GLOBJ			= ./obj/
-AUXDIR                  = ./aux
-AUX                     = ./aux/
+AUXDIR                  = $(GLGENDIR)/aux
+AUX                     = $(AUX)/
 PSD			= $(PSGENDIR)/
 PSGENDIR		= ./obj
 
@@ -277,7 +277,7 @@ clean mostlyclean clobber distclean maintainer-clean:
 
 init:
 	-if test ! -d obj ; then mkdir obj ; fi
-	-if test ! -d obj ; then mkdir aux ; fi
+	-if test ! -d obj/aux ; then mkdir obj/aux ; fi
 
 install:	install-binary install-fontmap install-pdfsec
 
diff --git a/gs/psi/msvc.mak b/gs/psi/msvc.mak
index 04e2cd8b3..c79579372 100644
--- a/gs/psi/msvc.mak
+++ b/gs/psi/msvc.mak
@@ -58,26 +58,8 @@ DEFAULT_OBJ_DIR=.\obj
 !endif
 !endif
 
-!if "$(DEBUG)"=="1"
-!ifdef WIN64
-AUXDIR=.\debugaux64
-!else
-AUXDIR=.\debugaux
-!endif
-!else
-!if "$(DEBUGSYM)"=="1"
-!ifdef WIN64
-AUXDIR=.\profaux64
-!else
-AUXDIR=.\profaux
-!endif
-!else
-!ifdef WIN64
-AUXDIR=.\aux64
-!else
-AUXDIR=.\aux32
-!endif
-!endif
+!ifndef AUXDIR
+AUXDIR=$(DEFAULT_OBJ_DIR)\aux_
 !endif
 
 # Note that 32-bit and 64-bit binaries reside in a common directory
diff --git a/gs/psi/os2.mak b/gs/psi/os2.mak
index ff10bac84..d555cba31 100644
--- a/gs/psi/os2.mak
+++ b/gs/psi/os2.mak
@@ -31,7 +31,7 @@ BINDIR=bin
 GLSRCDIR=base
 GLGENDIR=obj
 GLOBJDIR=obj
-AUXDIR=aux
+AUXDIR=$(GLGENDIR)/aux_
 PSSRCDIR=psi
 PSLIBDIR=lib
 PSRESDIR=Resource
diff --git a/gs/toolbin/localcluster/clusterpush.pl b/gs/toolbin/localcluster/clusterpush.pl
index 824d2f7b9..dbb0c8f2f 100755
--- a/gs/toolbin/localcluster/clusterpush.pl
+++ b/gs/toolbin/localcluster/clusterpush.pl
@@ -134,7 +134,7 @@ my $cmd="rsync -avxcz ".
 " --exclude .deps --exclude .libs --exclude autom4te.cache".
 " --exclude bin --exclude obj --exclude debugobj --exclude pgobj".
 " --exclude sobin --exclude soobj".
-" --exclude ufst --exclude ufst-obj".
+" --exclude ufst --exclude ufst-obj --exclude ufst-debugobj".
 " --exclude config.log".
 " --exclude .ppm --exclude .pkm --exclude .pgm --exclude .pbm".
 " -e \"$ssh\" ".
diff --git a/main/pcl6_gcc.mak b/main/pcl6_gcc.mak
index e2d45ac58..0b70da047 100644
--- a/main/pcl6_gcc.mak
+++ b/main/pcl6_gcc.mak
@@ -30,7 +30,7 @@ XCFLAGS?=
 
 # The build process will put all of its output in this directory
 GENDIR?=./obj
-AUXDIR?=./aux
+AUXDIR?=$(GENDIR)/aux
 PGGENDIR?=./pgobj
 
 # The sources are taken from these directories:
diff --git a/main/pcl6_msvc.mak b/main/pcl6_msvc.mak
index 669c24895..dcec4ac34 100644
--- a/main/pcl6_msvc.mak
+++ b/main/pcl6_msvc.mak
@@ -34,11 +34,7 @@ GENDIR=.\obj
 !endif
 
 !ifndef AUXDIR
-!if "$(DEBUG)"=="1"
-AUXDIR=.\debugaux
-!else
-AUXDIR=.\relaux
-!endif
+AUXDIR=$(GENDIR)\aux_
 !endif
 
 # The sources are taken from these directories:
@@ -411,7 +407,7 @@ DEVICE_DEVS=$(DD)\display.dev\
  $(DD)\tiffscaled.dev $(DD)\tiffscaled8.dev $(DD)\tiffscaled24.dev\
  $(DD)\png16m.dev $(DD)\pngmono.dev $(DD)\pngmonod.dev $(DD)\jpeg.dev \
  $(DD)\pdfwrite.dev $(DD)\pswrite.dev $(DD)\ps2write.dev \
- $(DD)\wtscmyk.dev $(DD)\wtsimdi.dev 
+ $(DD)\wtscmyk.dev $(DD)\wtsimdi.dev
 !endif
 
 # GS options