ChangeLogTag: Tue May 3 14:25:12 2005 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 23 insertions, 45 deletions

diff --git a/include/makeinclude/platform_aix_g++.GNU b/include/makeinclude/platform_aix_g++.GNU
index 07fc871197f..d4c1037bda1 100644
--- a/include/makeinclude/platform_aix_g++.GNU
+++ b/include/makeinclude/platform_aix_g++.GNU
@@ -7,30 +7,14 @@
 # Contributed by Ian Wright <I.Wright@elsevier.co.uk>
 # Updated for AIX 4.3 and gcc 3 by Steve Huston  <shuston@riverace.com>
 
-ifeq (,$(debug))
-  debug = 1
-endif
-ifeq (,$(distrib))
-  distrib = 0
-endif
-ifeq (,$(exceptions))
-  exceptions = 1
-endif
-ifeq (,$(optimize))
-  optimize = 1
-endif
-ifeq (,$(rtti))
-  rtti = 1
-endif
-ifeq (,$(threads))
-  threads = 1
-endif
-ifeq (,$(buildbits))
-  buildbits = native
-endif
-ifeq (,$(with_ld))
-  with_ld = aix
-endif
+debug ?= 1
+distrib ?= 0
+exceptions ?= 1
+optimize ?= 1
+rtti ?= 1
+threads ?= 1
+buildbits ?= native
+with_ld ?= aix
 
 # Yes, believe it or not...
 # The way to make a shared lib on AIX is to make a shared object file and
diff --git a/include/makeinclude/platform_aix_ibm.GNU b/include/makeinclude/platform_aix_ibm.GNU
index cfce83d686e..a91b8f94f99 100644
--- a/include/makeinclude/platform_aix_ibm.GNU
+++ b/include/makeinclude/platform_aix_ibm.GNU
@@ -6,18 +6,14 @@
 # Note that as of ACE 6.0, the only supported compiler from IBM will
 # be Visual Age C++ 5 (batch mode only) and up.
 
-ifeq (,$(debug))
-  debug = 1
-endif
-ifeq (,$(distrib))
-  distrib = 0
-endif
-ifeq (,$(exceptions))
-  exceptions = 1
-endif
-ifeq (,$(optimize))
-  optimize = 0
-endif
+debug ?= 1
+distrib ?= 0
+exceptions ?= 1
+optimize ?= 0
+rtti ?= 1
+threads ?= 1
+buildbits ?= 32
+
 ifeq (,$(inline))
 ifeq (1,$(debug))
   inline = 0
@@ -25,15 +21,6 @@ else
   inline = 1
 endif
 endif
-ifeq (,$(rtti))
-  rtti = 1
-endif
-ifeq (,$(threads))
-  threads = 1
-endif
-ifeq (,$(buildbits))
-  buildbits = 32
-endif
 
 # First, find out which compiler we're building with. The settings we
 # use for compiling, as well as how to build shared libraries, depend on
@@ -144,6 +131,13 @@ else    # Visual Age 5 and 6
   endif
 endif
 
+# The Visual Age preprocessor is not usable with the TAO_IDL compiler.
+# At the moment an idl file just contains includes of other idl files
+# the Visual Age preprocessor doesn't report that file in the list of
+# files that is used. The only way we can workaround this is using the
+# gcc preprocessor
+TAO_IDL_PREPROCESSOR = gcc
+
 ifeq ($(exceptions),0)
   CCFLAGS     += -qnoeh
 endif