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 /main | |
| 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 'main')
| -rw-r--r-- | main/pcl6_gcc.mak | 2 | ||||
| -rw-r--r-- | main/pcl6_msvc.mak | 8 |
2 files changed, 3 insertions, 7 deletions
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 |