diff options
| author | Robin Watts <Robin.Watts@artifex.com> | 2011-06-24 12:11:48 +0100 |
|---|---|---|
| committer | Robin Watts <Robin.Watts@artifex.com> | 2011-06-24 12:13:26 +0100 |
| commit | 90324e2c6466978f3c01e4a5a3c27d916b9ba9fa (patch) | |
| tree | 83d711e6dd839ac91f6e398afc372c815df7e921 /common | |
| parent | 7f2d55272963b039a472adbd26bb9a111e5d31ac (diff) | |
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.
Diffstat (limited to 'common')
| -rw-r--r-- | common/msvc_top.mak | 8 | ||||
| -rw-r--r-- | common/pcdefs.mak | 4 |
2 files changed, 6 insertions, 6 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 |