summaryrefslogtreecommitdiff
path: root/include/makeinclude
diff options
context:
space:
mode:
Diffstat (limited to 'include/makeinclude')
-rw-r--r--include/makeinclude/ace_flags.bor30
-rw-r--r--include/makeinclude/build_core_exe.bor9
-rw-r--r--include/makeinclude/build_core_library.bor9
-rw-r--r--include/makeinclude/build_dll.bor52
-rw-r--r--include/makeinclude/build_example.bor12
-rw-r--r--include/makeinclude/build_exe.bor54
-rw-r--r--include/makeinclude/build_lib.bor39
-rw-r--r--include/makeinclude/build_library.bor10
-rw-r--r--include/makeinclude/compiler.bor126
-rw-r--r--include/makeinclude/decorator.bor48
-rw-r--r--include/makeinclude/macros.GNU22
-rw-r--r--include/makeinclude/make_flags.bor17
-rw-r--r--include/makeinclude/outputdir.bor58
-rw-r--r--include/makeinclude/platform_aix.GNU3
-rw-r--r--include/makeinclude/platform_aix4.2.GNU3
-rw-r--r--include/makeinclude/platform_aix4_cset++.GNU90
-rw-r--r--include/makeinclude/platform_aix4_g++.GNU63
-rw-r--r--include/makeinclude/platform_aix_g++.GNU31
-rw-r--r--include/makeinclude/platform_chorus.GNU75
-rw-r--r--include/makeinclude/platform_chorus_ghs.GNU77
-rw-r--r--include/makeinclude/platform_cray.GNU50
-rw-r--r--include/makeinclude/platform_dgux4_epc.GNU23
-rw-r--r--include/makeinclude/platform_dgux4_ghs.GNU27
-rw-r--r--include/makeinclude/platform_freebsd.GNU33
-rw-r--r--include/makeinclude/platform_freebsd_pthread.GNU8
-rw-r--r--include/makeinclude/platform_hpux.GNU28
-rw-r--r--include/makeinclude/platform_hpux_aCC.GNU129
-rw-r--r--include/makeinclude/platform_hpux_gcc.GNU62
-rw-r--r--include/makeinclude/platform_hpux_orbix.GNU30
-rw-r--r--include/makeinclude/platform_irix5.2.GNU21
-rw-r--r--include/makeinclude/platform_irix5.3_g++.GNU21
-rw-r--r--include/makeinclude/platform_irix5.3_sgic++.GNU26
-rw-r--r--include/makeinclude/platform_irix6.x_common.GNU13
-rw-r--r--include/makeinclude/platform_irix6.x_g++.GNU30
-rw-r--r--include/makeinclude/platform_irix6.x_kcc.GNU35
-rw-r--r--include/makeinclude/platform_irix6.x_sgic++.GNU64
-rw-r--r--include/makeinclude/platform_linux.GNU36
-rw-r--r--include/makeinclude/platform_linux_kcc.GNU39
-rw-r--r--include/makeinclude/platform_linux_lxpthread.GNU84
-rw-r--r--include/makeinclude/platform_linux_lxpthreads.GNU84
-rw-r--r--include/makeinclude/platform_linux_pthread.GNU31
-rw-r--r--include/makeinclude/platform_lynxos.GNU95
-rw-r--r--include/makeinclude/platform_m88k.GNU30
-rw-r--r--include/makeinclude/platform_mvs.GNU34
-rw-r--r--include/makeinclude/platform_netbsd.GNU28
-rw-r--r--include/makeinclude/platform_osf1_3.2.GNU27
-rw-r--r--include/makeinclude/platform_osf1_4.0.GNU73
-rw-r--r--include/makeinclude/platform_osf1_4.0_g++.GNU25
-rw-r--r--include/makeinclude/platform_osf1_4.0_kcc.GNU37
-rw-r--r--include/makeinclude/platform_osf1_4.0_rcc.GNU25
-rw-r--r--include/makeinclude/platform_psos_diab.GNU189
-rw-r--r--include/makeinclude/platform_psos_diab_ppc.GNU200
-rw-r--r--include/makeinclude/platform_psos_tm.GNU47
-rw-r--r--include/makeinclude/platform_psosim_g++.GNU57
-rw-r--r--include/makeinclude/platform_qnx_neutrino.GNU39
-rw-r--r--include/makeinclude/platform_sco-nothread.GNU22
-rw-r--r--include/makeinclude/platform_sco5.0.0-CC-fsu-pthread.GNU36
-rw-r--r--include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU46
-rw-r--r--include/makeinclude/platform_sco5.0.0-mit-pthread.GNU35
-rw-r--r--include/makeinclude/platform_sco5.0.0-nothread.GNU33
-rw-r--r--include/makeinclude/platform_sunos4_g++.GNU26
-rw-r--r--include/makeinclude/platform_sunos4_lucid.GNU21
-rw-r--r--include/makeinclude/platform_sunos4_sunc++3.x.GNU27
-rw-r--r--include/makeinclude/platform_sunos4_sunc++4.x.GNU24
-rw-r--r--include/makeinclude/platform_sunos4_sunc++4.x_orbix.GNU25
-rw-r--r--include/makeinclude/platform_sunos5.6_sparc_sunc++_4.2.GNU3
-rw-r--r--include/makeinclude/platform_sunos5_centerline.GNU22
-rw-r--r--include/makeinclude/platform_sunos5_centerline_orbix.GNU23
-rw-r--r--include/makeinclude/platform_sunos5_egcs.GNU13
-rw-r--r--include/makeinclude/platform_sunos5_g++.GNU49
-rw-r--r--include/makeinclude/platform_sunos5_ghs.GNU38
-rw-r--r--include/makeinclude/platform_sunos5_kcc.GNU74
-rw-r--r--include/makeinclude/platform_sunos5_sunc++.GNU174
-rw-r--r--include/makeinclude/platform_sunos5_sunc++_orbix.GNU7
-rw-r--r--include/makeinclude/platform_tandem.GNU93
-rw-r--r--include/makeinclude/platform_tru64_cxx.GNU48
-rw-r--r--include/makeinclude/platform_tru64_g++.GNU30
-rw-r--r--include/makeinclude/platform_unixware_g++.GNU24
-rw-r--r--include/makeinclude/platform_vxworks5.x_g++.GNU188
-rw-r--r--include/makeinclude/platform_vxworks5.x_ghs.GNU92
-rw-r--r--include/makeinclude/rules.bin.GNU27
-rw-r--r--include/makeinclude/rules.common.GNU17
-rw-r--r--include/makeinclude/rules.lib.GNU147
-rw-r--r--include/makeinclude/rules.local.GNU227
-rw-r--r--include/makeinclude/rules.nested.GNU14
-rw-r--r--include/makeinclude/rules.nolocal.GNU8
-rw-r--r--include/makeinclude/rules.nonested.GNU8
-rw-r--r--include/makeinclude/wrapper_macros.GNU502
88 files changed, 0 insertions, 4731 deletions
diff --git a/include/makeinclude/ace_flags.bor b/include/makeinclude/ace_flags.bor
deleted file mode 100644
index 1a5f061fe48..00000000000
--- a/include/makeinclude/ace_flags.bor
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Flags specific for compiling ACE library and applications
-# with Borland C++Builder
-#
-
-#
-# Compiler flags
-#
-!ifdef STATIC
-ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=0
-TAO_BUILD_CFLAGS =
-TAO_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_HAS_DLL=0
-ORBSVCS_BUILD_CFLAGS =
-ORBSVCS_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_ORBSVCS_HAS_DLL=0
-!else
-ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=1
-TAO_BUILD_CFLAGS = -DTAO_BUILD_DLL
-TAO_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_HAS_DLL=1
-ORBSVCS_BUILD_CFLAGS = -DTAO_ORBSVCS_BUILD_DLL=1
-ORBSVCS_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_ORBSVCS_HAS_DLL=1
-!endif
-
-#
-# Libraries
-#
-ACE_LIB = $(CORE_BINDIR)\ace$(LIB_DECORATOR).lib
-NETSVCS_LIB = $(CORE_BINDIR)\netsvcs$(LIB_DECORATOR).lib
-TAO_LIB = $(CORE_BINDIR)\tao$(LIB_DECORATOR).lib
-ORBSVCS_LIB = $(CORE_BINDIR)\orbsvcs$(LIB_DECORATOR).lib
-
diff --git a/include/makeinclude/build_core_exe.bor b/include/makeinclude/build_core_exe.bor
deleted file mode 100644
index 2fa7fdbac92..00000000000
--- a/include/makeinclude/build_core_exe.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Makefile for building a core executable. A core executable
-# is one that would be part of an ACE/TAO distribution. That
-# is, you would pick it up and take it to another computer.
-#
-
-BINDIR = $(CORE_BINDIR)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/include/makeinclude/build_core_library.bor b/include/makeinclude/build_core_library.bor
deleted file mode 100644
index c1513abb0c3..00000000000
--- a/include/makeinclude/build_core_library.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Makefile for building a core library. A core library
-# is one that would be part of an ACE/TAO distribution. That
-# is, you would pick it up and take it to another computer.
-#
-
-BINDIR = $(CORE_BINDIR)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_library.bor>
diff --git a/include/makeinclude/build_dll.bor b/include/makeinclude/build_dll.bor
deleted file mode 100644
index 29fc58487d5..00000000000
--- a/include/makeinclude/build_dll.bor
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Rules for linking a dll
-#
-# Inputs:
-# ~~~~~~~
-# NAME - undecorated name of target
-# CFLAGS - extra compiler flags for building target
-# CPPDIR - list of directories containing source files
-# OBJFILES - list of (non-system) object files
-# LIBFILES - list of (non-system) libraries
-# PASCAL - if defined means link dll against pascal run-time library
-# DEBUG - if defined means building with debug information
-#
-
-!include <$(ACE_ROOT)\include\makeinclude\decorator.bor>
-!include <$(ACE_ROOT)\include\makeinclude\outputdir.bor>
-!include <$(ACE_ROOT)\include\makeinclude\compiler.bor>
-
-TARGET = $(BINDIR)\$(NAME)$(LIB_DECORATOR).dll
-
-$(TARGET): $(OBJFILES) $(RESOURCE)
- @$(MAKE_BINDIR)
- $(LD) @&&!
- $(COMMON_LFLAGS) $(DLL_LFLAGS) $(LFLAGS) +
- $(DLL_STARTUP_OBJ) $(OBJFILES), +
- $(TARGET),, +
- $(COMMON_LIBS) $(LIBFILES),, +
- $(RESOURCE)
-!
-
-!ifdef CPPDIR
-.path.cpp = $(CPPDIR)
-!endif
-
-!ifdef RESDIR
-.path.rc = $(RESDIR)
-!else
-.path.rc = .
-!endif
-
-.path.obj = $(OBJDIR)
-
-.cpp.obj:
- @$(MAKE_OBJDIR)
- $(CC) $(COMMON_CFLAGS) $(DLL_CFLAGS) $(CFLAGS) -c -n$(@D) $<
-
-.rc.res:
- @$(MAKE_OBJDIR)
- $(RC) -fo$@ $<
-
-.autodepend
-
diff --git a/include/makeinclude/build_example.bor b/include/makeinclude/build_example.bor
deleted file mode 100644
index f13206e186d..00000000000
--- a/include/makeinclude/build_example.bor
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Makefile for building the example executables
-#
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(ORBSVCS_CFLAGS)
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB) $(ORBSVCS_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
diff --git a/include/makeinclude/build_exe.bor b/include/makeinclude/build_exe.bor
deleted file mode 100644
index c209fbe5cf5..00000000000
--- a/include/makeinclude/build_exe.bor
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Rules for building an executable
-#
-# Inputs:
-# ~~~~~~~
-# NAME - undecorated name of target
-# CFLAGS - extra compiler flags for building target
-# CPPDIR - list of directories containing source files
-# OBJFILES - list of (non-system) object files
-# LIBFILES - list of (non-system) libraries
-# STATIC - if defined means link exe with static libraries
-# PASCAL - if defined means link dll against pascal run-time library
-# DEBUG - if defined means building with debug information
-#
-
-!include <$(ACE_ROOT)\include\makeinclude\decorator.bor>
-!include <$(ACE_ROOT)\include\makeinclude\outputdir.bor>
-!include <$(ACE_ROOT)\include\makeinclude\compiler.bor>
-
-TARGET = $(BINDIR)\$(NAME).exe
-
-$(TARGET): $(OBJFILES) $(RESOURCE)
- @$(MAKE_BINDIR)
- $(LD) @&&!
- $(COMMON_LFLAGS) $(EXE_LFLAGS) $(LFLAGS) +
- $(EXE_STARTUP_OBJ) $(OBJFILES), +
- $(TARGET),, +
- $(COMMON_LIBS) $(LIBFILES),, +
- $(RESOURCE)
-!
-
-!ifdef CPPDIR
-.path.cpp = $(CPPDIR)
-!endif
-
-!ifdef RESDIR
-.path.rc = $(RESDIR)
-!else
-.path.rc = .
-!endif
-
-.path.obj = $(OBJDIR)
-
-.cpp.obj:
- @$(MAKE_OBJDIR)
- $(CC) $(COMMON_CFLAGS) $(EXE_CFLAGS) $(CFLAGS) -c -n$(@D) $<
-
-.rc.res:
- @$(MAKE_OBJDIR)
- $(RC) -fo$@ $<
-
-.autodepend
-
-
diff --git a/include/makeinclude/build_lib.bor b/include/makeinclude/build_lib.bor
deleted file mode 100644
index 23b232eb21c..00000000000
--- a/include/makeinclude/build_lib.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Rules for building a static library
-#
-# Inputs:
-# ~~~~~~~
-# NAME - undecorated name of target
-# CFLAGS - extra compiler flags for building target
-# CPPDIR - list of directories containing source files
-# OBJFILES - list of (non-system) object files
-# LIBFILES - list of (non-system) libraries
-# PASCAL - if defined means link dll against pascal run-time library
-# DEBUG - if defined means building with debug information
-#
-
-!include <$(ACE_ROOT)\include\makeinclude\decorator.bor>
-!include <$(ACE_ROOT)\include\makeinclude\outputdir.bor>
-!include <$(ACE_ROOT)\include\makeinclude\compiler.bor>
-
-TARGET = $(BINDIR)\$(NAME)$(LIB_DECORATOR).lib
-
-$(TARGET): $(OBJFILES)
- @$(MAKE_BINDIR)
- $(AR) $(LIB_LFLAGS) $(TARGET) @&&!
- +-$(**: = &^
- +-)
-!
-
-!ifdef CPPDIR
-.path.cpp = $(CPPDIR)
-!endif
-
-.path.obj = $(OBJDIR)
-
-.cpp.obj:
- @$(MAKE_OBJDIR)
- $(CC) $(COMMON_CFLAGS) $(LIB_CFLAGS) $(CFLAGS) -c -n$(@D) $<
-
-.autodepend
-
diff --git a/include/makeinclude/build_library.bor b/include/makeinclude/build_library.bor
deleted file mode 100644
index 4fca252a364..00000000000
--- a/include/makeinclude/build_library.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile rules for building a static or dynamic library
-#
-
-!ifdef STATIC
-!include <$(ACE_ROOT)\include\makeinclude\build_lib.bor>
-!else
-!include <$(ACE_ROOT)\include\makeinclude\build_dll.bor>
-!endif
-
diff --git a/include/makeinclude/compiler.bor b/include/makeinclude/compiler.bor
deleted file mode 100644
index 24cae748a23..00000000000
--- a/include/makeinclude/compiler.bor
+++ /dev/null
@@ -1,126 +0,0 @@
-#
-# Defines specific to a particular version of the compiler
-#
-# Inputs:
-# ~~~~~~~
-# STATIC - if defined means creating a static library or executable
-# PASCAL - if defined means link dll against pascal run-time library
-# DEBUG - if defined means building with debug information
-#
-# Outputs:
-# ~~~~~~~~
-# CC - name of compiler
-# LD - name of linker
-# AR - name of librarian
-# RC - name of resource compiler
-# COMMON_CFLAGS - compiler flags for all targets
-# COMMON_LFLAGS - linker flags for all targets
-# COMMON_LIBS - linker library files for all targets
-# DLL_CFLAGS - compiler flags specific to DLL targets
-# DLL_LFLAGS - linker flags specific to DLL targets
-# DLL_STARTUP_OBJ - start-up object files for DLL targets
-# EXE_CFLAGS - compiler flags specific to EXE targets
-# EXE_LFLAGS - linker flags specific to EXE targets
-# EXE_STARTUP_OBJ - start-up object files for EXE targets
-# LIB_CFLAGS - compiler flags specific to static lib targets
-# LIB_LFLAGS - flags specific to static lib targets (passed to
-# librarian)
-#
-
-
-!include <$(ACE_ROOT)\include\makeinclude\ace_flags.bor>
-
-#
-# BCB4 Settings (all we have for now)
-#
-
-CC = bcc32
-LD = ilink32
-AR = tlib
-RC = brcc32
-
-#
-# Common flags
-#
-
-!ifdef DEBUG
-DEBUG_CFLAGS = -v -y -Od -r- -vi- -k
-DEBUG_LFLAGS = -v
-!else
-DEBUG_CFLAGS = -O2 -DNDEBUG
-DEBUG_LFLAGS =
-!endif
-
-!ifdef STATIC
-STATIC_CFLAGS =
-STATIC_LFLAGS =
-!else
-STATIC_CFLAGS = -tWR
-STATIC_LFLAGS =
-!endif
-
-THREAD_CFLAGS = -D_MT -tWM
-WARNINGS_CFLAGS = -w-rvl -w-rch -w-par -w-ccc -w-obs -w-aus -w-pia
-DEFINES_CFLAGS = -DWIN32;_NO_VCL
-QUIET_CFLAGS = -q
-MISC_CFLAGS = -a8
-
-COMMON_CFLAGS = $(QUIET_CFLAGS) $(DEBUG_CFLAGS) $(THREAD_CFLAGS) \
- $(STATIC_CFLAGS) $(WARNINGS_CFLAGS) $(DEFINES_CFLAGS) \
- $(MISC_CFLAGS)
-
-COMMON_LFLAGS = $(DEBUG_LFLAGS) $(STATIC_LFLAGS) -x -w-dup -Gn
-
-#
-# DLL specific flags
-#
-
-DLL_CFLAGS = -tWD
-DLL_LFLAGS = -Tpd -Gi
-!ifdef PASCAL
-DLL_STARTUP_OBJ = c0d32.obj sysinit.obj
-!else
-DLL_STARTUP_OBJ = c0d32.obj
-!endif
-
-#
-# EXE specific flags
-#
-
-EXE_CFLAGS =
-EXE_LFLAGS = -Tpe
-!ifdef PASCAL
-EXE_STARTUP_OBJ = c0x32.obj sysinit.obj
-!else
-EXE_STARTUP_OBJ = c0x32.obj
-!endif
-
-#
-# Static lib specific flags
-#
-
-LIB_CFLAGS =
-!ifdef DEBUG
-LIB_LFLAGS = /C /P2048
-!else
-LIB_LFLAGS = /C /P512
-!endif
-
-#
-# Libraries to be linked
-#
-
-!ifdef STATIC
-!ifdef PASCAL
-COMMON_LIBS = import32.lib vcl.lib vcl40.lib cp32mt.lib ws2_32.lib
-!else
-COMMON_LIBS = import32.lib cw32mt.lib ws2_32.lib
-!endif
-!else
-!ifdef PASCAL
-COMMON_LIBS = import32.lib vcl.lib vcl40.bpi cp32mti.lib ws2_32.lib
-!else
-COMMON_LIBS = import32.lib cw32mti.lib ws2_32.lib
-!endif
-!endif
-
diff --git a/include/makeinclude/decorator.bor b/include/makeinclude/decorator.bor
deleted file mode 100644
index 0b20bcbdeb5..00000000000
--- a/include/makeinclude/decorator.bor
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Creates a suffix for decorating output file names
-#
-# Inputs:
-# ~~~~~~~
-# DEBUG - defined if building a debug library/executable
-# STATIC - defined if building a static library
-# PASCAL - defined if linking against cp32*
-#
-# Outputs:
-# ~~~~~~~~
-# LIB_DECORATOR - suffix to be added to library output file name
-# EXE_DECORATOR - suffix to be added to executable output file name
-#
-
-DECO_PREFIX=
-
-# If you want decoration for Borland, set this to something like "B"
-# otherwise, make it blank
-BORLAND_DECO=b
-
-!ifdef BORLAND_DECO
-DECO_PREFIX=_
-!endif
-
-!ifdef PASCAL
-DECO_PREFIX=_
-PASCAL_DECO=p
-!endif
-
-!ifdef STATIC
-DECO_PREFIX=_
-STATIC_DECO=s
-!endif
-
-!ifdef DEBUG
-DECO_PREFIX=_
-DEBUG_DECO=d
-!endif
-
-LIB_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(PASCAL_DECO)$(STATIC_DECO)$(DEBUG_DECO)
-
-!ifdef NO_EXE_DECORATION
-EXE_DECORATOR=
-!else
-EXE_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(PASCAL_DECO)$(STATIC_DECO)$(DEBUG_DECO)
-!endif
-
diff --git a/include/makeinclude/macros.GNU b/include/makeinclude/macros.GNU
deleted file mode 100644
index 17877c326bf..00000000000
--- a/include/makeinclude/macros.GNU
+++ /dev/null
@@ -1,22 +0,0 @@
-#----------------------------------------------------------------------------
-# $Id$
-#
-# Local and nested target definitions
-#----------------------------------------------------------------------------
-
-TARGETS_LOCAL = \
- all.local \
- debug.local \
- profile.local \
- optimize.local \
- install.local \
- deinstall.local \
- clean.local \
- realclean.local \
- clobber.local \
- depend.local \
- rcs_info.local
-
-TARGETS_NESTED = \
- $(TARGETS_LOCAL:.local=.nested)
-
diff --git a/include/makeinclude/make_flags.bor b/include/makeinclude/make_flags.bor
deleted file mode 100644
index e6fe899eb9e..00000000000
--- a/include/makeinclude/make_flags.bor
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Makefile flags for recursive invocations of make
-#
-
-!ifdef DEBUG
-DEBUG_FLAG = -DDEBUG
-!endif
-
-!ifdef STATIC
-STATIC_FLAG = -DSTATIC
-!endif
-
-!ifdef PASCAL
-PASCAL_FLAG = -DPASCAL
-!endif
-
-MAKE_FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG)
diff --git a/include/makeinclude/outputdir.bor b/include/makeinclude/outputdir.bor
deleted file mode 100644
index fa9e1d49898..00000000000
--- a/include/makeinclude/outputdir.bor
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Creates output object and binary file directories
-#
-# Inputs:
-# ~~~~~~~
-# NAME - undecorated name of target
-# DEBUG - defined if building a debug library/executable
-# STATIC - defined if building a static library
-#
-# Outputs:
-# ~~~~~~~~
-# BINDIR - name of directory where binaries are placed
-# MAKE_BINDIR - command to be used for creating BINDIR
-# OBJDIR - name of directory where object fils are placed
-# MAKE_OBJDIR - command to be used for creating OBJDIR
-#
-
-!ifdef STATIC
-STATIC_DIR=Static
-!else
-STATIC_DIR=Dynamic
-!endif
-
-!ifdef DEBUG
-DEBUG_DIR=Debug
-!else
-DEBUG_DIR=Release
-!endif
-
-!ifdef PASCAL
-PASCAL_DIR=Pascal
-!else
-PASCAL_DIR=.
-!endif
-
-# By default binaries are built underneath the current build directory
-!ifndef BASE_BINDIR
-BASE_BINDIR=.
-!endif
-
-# By default object files are built underneath the current build directory
-!ifndef BASE_OBJDIR
-BASE_OBJDIR=.\obj
-!endif
-
-!ifndef BINDIR
-BINDIR=$(BASE_BINDIR)\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)
-!endif
-
-!ifndef CORE_BINDIR
-CORE_BINDIR=$(ACE_ROOT)\bin\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)
-!endif
-
-MAKE_BINDIR=if not exist "$(BINDIR)" mkdir "$(BINDIR)"
-
-OBJDIR=$(BASE_OBJDIR)\$(NAME)\$(STATIC_DIR)\$(DEBUG_DIR)
-
-MAKE_OBJDIR=if not exist "$(OBJDIR)" mkdir "$(OBJDIR)"
diff --git a/include/makeinclude/platform_aix.GNU b/include/makeinclude/platform_aix.GNU
deleted file mode 100644
index 675b1af991b..00000000000
--- a/include/makeinclude/platform_aix.GNU
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-
-include $(ACE_ROOT)/include/makeinclude/platform_aix4_cset++.GNU
diff --git a/include/makeinclude/platform_aix4.2.GNU b/include/makeinclude/platform_aix4.2.GNU
deleted file mode 100644
index 395f30adbcb..00000000000
--- a/include/makeinclude/platform_aix4.2.GNU
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-
-include $(ACE_ROOT)/include/makeinclude/platform_aix4_cset++.GNU \ No newline at end of file
diff --git a/include/makeinclude/platform_aix4_cset++.GNU b/include/makeinclude/platform_aix4_cset++.GNU
deleted file mode 100644
index 09a29b05657..00000000000
--- a/include/makeinclude/platform_aix4_cset++.GNU
+++ /dev/null
@@ -1,90 +0,0 @@
-# $Id$
-
-# AIX 4.x using the C Set++ compiler.
-# *not* using Orbix
-#
-# On 4.1, this file assumes that the user has installed the AIX patch
-# containing the dl*() APIs. To use these APIs, IBM has created a
-# separate product (free to AIX licensees) called shared library
-# hookable symbols (or slhs/6000). If they don't have this patch, the
-# sv* commands for compiling and linking will not be present on the
-# system.
-#
-# On 4.2, the AIX fileset bos.rte.bind_cmds must be at version 4.2.0.2 or
-# higher in order to build libACEshr.a, and at 4.2.0.4 or higher for dl*()
-# routines to work properly. Best to apply the update available at:
-# ftp://service.boulder.ibm.com/aix/fixes/v4/os/bos.rte.bind_cmds.4.2.0.4.bff
-# or a successor.
-
-ifeq (,$(debug))
- debug = 1
-endif
-ifeq (,$(distrib))
- distrib = 0
-endif
-ifeq (,$(optimize))
- optimize = 0
-endif
-
-# In case anything here or in the config depends on OS version number,
-# grab it here and pass it all to the compiler as well.
-AIX_MAJOR_VERS := $(shell uname -v)
-AIX_MINOR_VERS := $(shell uname -r)
-
-CC = xlc_r
-CXX = xlC_r
-
-# -qextchk is handy, but produces false type mismatches when linking
-# netsvcs with 3.1.4, so it's disabled. IBM reports this fixed in 3.6.4.
-CCFLAGS += $(CFLAGS) -qtempinc -qinfo
-
-# IBM C/C++ compiler 3.6.x produces a bazillion warnings about 0-valued
-# preprocessor defs. Since both 3.1 and 3.4 could be installed, don't ask
-# lslpp for one or the other. Instead, compile a file and see which compiler
-# the user has set up for use. This trick was submitted by Craig Rodrigues
-# <rodrigc@mediaone.net>, originally from the vacpp compiler newsgroup.
-# It relies on the preprocessor defining __xlC__ to the proper version
-# number of the compiler.
-XLCVERSION := $(shell echo "__xlC__" > ./testAIXCompilerVersion.cpp)
-XLCVERSION := $(shell $(CXX) -E ./testAIXCompilerVersion.cpp | tail -1')
-ACE_AIX_CLEAN := $(shell $(RM) ./testAIXCompilerVersion.cpp)
-ifeq ($(XLCVERSION),0x0306)
- CCFLAGS += -qflag=e:e
-else
- CCFLAGS += -qflag=w:w
-endif
-CPPFLAGS += -qlanglvl=ansi -DACE_AIX_MAJOR_VERS=$(AIX_MAJOR_VERS) -DACE_AIX_MINOR_VERS=$(AIX_MINOR_VERS)
-
-# -qinitauto seems useful, but when built with -qinitauto=5F, the
-# Process_Strategy_Test went CPU bound in ostream, so I removed it (S. Huston)
-DCFLAGS += -g -qcheck=nobounds:div:null
-
-DLD = makeC++SharedLib_r
-LD = $(CXX)
-
-ifeq ($(shared_libs),1)
-ACELIB = -lACEshr
-SHLIBA = $(SHLIB:lib%.so=lib%shr.a)
-endif
-
-ifeq ($(AIX_MINOR_VERS),1)
-LLIBS = -lsvld -ltli_r $(ACELIB)
-LIBS += $(filter-out $(SHLIBA:lib%.a=-l%), $(LLIBS))
-else
-LIBS += -ltli_r -ldl
-endif
-
-ARFLAGS = ruv
-AR = ar
-LDFLAGS += -bI:/lib/pse.exp
-# Default OCCFLAGS builds common code for all RS/6000 architectures but
-# this can be set to optimize for your particular computer. The commented
-# out example optimizes for RS/6000 43P.
-# OCCFLAGS is not used by default. To used it, set optimize=1
-# either in this file or on the command line.
-#OCCFLAGS += -qarch=ppc -qtune=604
-OCCFLAGS += -qarch=com
-RANLIB = ranlib
-SOFLAGS = -p 0
-TEMPINCDIR = tempinc
-SOBUILD =
diff --git a/include/makeinclude/platform_aix4_g++.GNU b/include/makeinclude/platform_aix4_g++.GNU
deleted file mode 100644
index 9da6ad1d96e..00000000000
--- a/include/makeinclude/platform_aix4_g++.GNU
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id$
-#
-# Platform macros for building on AIX 4.x with g++. This has been tested on
-# AIX 4.3 with egcs 1.1.2.
-#
-# Original contributed by Ian Wright <I.Wright@elsevier.co.uk>. Updated for
-# AIX 4 and egcs by Steve Huston <shuston@riverace.com>.
-
-
-ifeq (,$(debug))
- debug = 1
-endif
-ifeq (,$(distrib))
- distrib = 0
-endif
-ifeq (,$(optimize))
- optimize = 0
-endif
-ifeq (,$(threads))
- threads = 1
-endif
-
-# In case anything here or in the config depends on OS version number,
-# grab it here and pass it all to the compiler as well.
-AIX_MAJOR_VERS := $(shell uname -v)
-AIX_MINOR_VERS := $(shell uname -r)
-
-CC = gcc
-CXX = g++
-CFLAGS += -W -Wall -pipe -mcpu=common -DACE_AIX_MAJOR_VERS=$(AIX_MAJOR_VERS) -DACE_AIX_MINOR_VERS=$(AIX_MINOR_VERS)
-ifeq ($(threads),1)
-CFLAGS += -mthreads
-endif
-CCFLAGS += $(CFLAGS) -fno-implicit-templates
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-LDFLAGS += -Wl,-bI:/lib/pse.exp
-# Linking TAO_IDL runs out of TOC space unless -bbigtoc is given to ld.
-# Don't do it for everything because it decreases run-time performance.
-ifeq ($(notdir $(shell pwd)), TAO_IDL)
-LDFLAGS += -Wl,-bbigtoc
-endif
-OCFLAGS = -O2
-OCCFLAGS = $(OCFLAGS)
-ifeq ($(threads),1)
-SOFLAGS += -mthreads
-endif
-SOFLAGS += -shared -Wl,-bexpall # -Wl,-bloadmap:lib.map
-LIBS += -ltli_r -ldl
-ARFLAGS = cruv
-RANLIB = ranlib
-
-# On AIX, shared libraries are not generally left in .so form to link against.
-# To do so requires the run-time linker and that is an unnecessary evil.
-# So build the .so as usual, but then put in an archive library to link
-# against. The archive lib is the one installed for run-time use also, though
-# if you want to use ACE's dynamic loading features, you'll also need the
-# .so file.
-ifeq ($(shared_libs),1)
-ACELIB = -lACEshr
-SHLIBA = $(SHLIB:lib%.so=lib%shr.a)
-endif
diff --git a/include/makeinclude/platform_aix_g++.GNU b/include/makeinclude/platform_aix_g++.GNU
deleted file mode 100644
index e3762f17957..00000000000
--- a/include/makeinclude/platform_aix_g++.GNU
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id$
-#
-# Platform macros for building on AIX with g++. This has been tested on
-# AIX 4.1.4 and gcc 2.7.2.3.
-#
-# A note - later versions of gcc(>2.7.2.3, I don't know which) have a -mthreads
-# flag which does the same job more elegantly.
-# I haven't managed to get the shared library to work.
-# I know having tli_r and tli is a bad idea, but it won't link otherwise.
-#
-# Contributed by Ian Wright <I.Wright@elsevier.co.uk>
-
-debug = 1
-static_libs_only = 1
-
-CC = gcc
-CXX = gcc
-CFLAGS += -W -Wall -nostdlib -mcpu=common
-CCFLAGS += $(CFLAGS) -fno-implicit-templates
-#only needed for one of the tests and causes compiler errors in building libACE
-#CCFLAGS += -fhandle-exceptions
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-OCFLAGS = -O2
-OCCFLAGS = $(OCFLAGS)
-LIBS += /lib/crt0_r.o -L/usr/lib/threads -lsvld -lC_r -lpthreads
--lc_r -ltli_r -lg++ -lstdc++ -lm -lg -ltli -lgcc
-PIC = -fPIC
-ARFLAGS = cruv
-RANLIB = ranlib
diff --git a/include/makeinclude/platform_chorus.GNU b/include/makeinclude/platform_chorus.GNU
deleted file mode 100644
index d0c2a428fa2..00000000000
--- a/include/makeinclude/platform_chorus.GNU
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id$
-
-# Chorus 3.1b with GNU g++ 2.7.2
-
-CHORUS = 1
-CROSS-COMPILE = 1
-
-debug = 1
-exceptions =
-optimize = 1
-shared_libs =
-static_libs = 1
-
-#
-# The following file includes definitions such as $(CC), $(XDIR), etc.
-#
-include $(MERGEDIR)/dtool/htgt-cf.rf
-CLASSIXDIR=$(MERGEDIR)
-#
-# Tool PATH
-#
-TOOLDIR = $(XDIR)/bin/
-INC_DIR = $(CLASSIXDIR)/include
-BIN_DIR =
-LIB_DIR = $(CLASSIXDIR)/lib
-#CC = gcc
-#CXX = g++
-CXX = $(CC)
-CFLAGS += -w
-CCFLAGS += $(CFLAGS) -fno-implicit-templates \
- -fno-strict-prototypes \
- -Usun \
- -fno-builtin \
- -fconserve-space \
- -fcheck-new \
- -nostdinc \
- -pipe \
- -fno-rtti \
- -D_POSIX_THREADS \
- -D_POSIX_THREAD_SAFE_FUNCTIONS
-
-#DCFLAGS += -gstabs+
-INCLDIRS += -I$(INC_DIR)/posix \
- -I$(INC_DIR)/stdc \
- -I$(INC_DIR)/chorus/ \
- -I$(INC_DIR)/chorus/iom \
- -I$(INC_DIR)/CC
-DLD =
-LD = $(XDIR)/bin/ld
-LDFLAGS += -r $(CLASSIXDIR)/lib/CC/libC.a $(CLASSIXDIR)/lib/classix/libcx.u.a
-MATHLIB = -L$(CLASSIXDIR)/lib/libm -lm
-
-LINK.cc.override = $(LD) -u _main -u _premain
-LINK.cc=override
-
-CHORUSLINK=true
-
-# $(CLASSIXDIR)/dtool/mkctors helloCxx_u.xp.o > helloCxx_u.ct.s
-# $(CXX) -c helloCxx_u.ct.s
-# $(RM) helloCxx_u.ct.s
-# $(LD) $(LDOPTIONS) -e _start -o helloCxx_u \
-# $(CLASSIXDIR)/lib/crt/crth.u.o $(CLASSIXDIR)/lib/crt/crt0.o $(CLASSIXDIR)/lib/crt/crti.o helloCxx_u.xp.o helloCxx_u.ct.o $(CLASSIXDIR)/lib/crt/crtn.o \
-# -dn -T $(CLASSIXDIR)/src/act/slots/act_u.ld
-# $(RM) helloCxx_u.xp.o
-# $(RM) helloCxx_u.ct.o
-
-
-OCFLAGS += -O
-PIC = -fPIC
-
-AR = $(TOOLDIR)ar
-ARFLAGS = srv
-
-RANLIB = $(TOOLDIR)ranlib
-PRELIB = @true
diff --git a/include/makeinclude/platform_chorus_ghs.GNU b/include/makeinclude/platform_chorus_ghs.GNU
deleted file mode 100644
index 44651bee879..00000000000
--- a/include/makeinclude/platform_chorus_ghs.GNU
+++ /dev/null
@@ -1,77 +0,0 @@
-# $Id$
-#
-# Chorus with Green Hills
-
-# Locations of Green Hills installation, MVME installation, etc. The
-# ifndef protection allows setting via environment variables.
-ifndef GHS_DIR
- GHS_DIR=/project/doc/mvme/green68k/GreenHills/releases/chorus-m68k
-endif # GHS_DIR
-
-ifndef COOL_DIR
- COOL_DIR=/project/doc/mvme/miniCOOL/minicool.r4.3/classix-r3-flm-mvme177-gh
-endif # COOL_DIR
-
-ifndef MVME_DIR
- MVME_DIR=/project/doc/mvme/mvme177
-endif # MVME_DIR
-
-ifndef MVME_INCL
- MVME_INCL = $(MVME_DIR)/include
-endif # MVME_INCL
-
-ifndef MVME_LIB
- MVME_LIB = $(MVME_DIR)/lib
-endif # MVME_LIB
-
-CHORUS = 1
-CROSS-COMPILE = 1
-
-debug = 1
-ifndef exceptions
- exceptions =
-endif # exceptions
-optimize = 1
-shared_libs =
-static_libs = 1
-
-PATH +=:$(GHS_DIR)
-
-CC = cxch68
-CXX = $(CC)
-CFLAGS = -groot=$(MVME_DIR)/ -alttools=$(GHS_DIR)/gnuch68 -68040 -fprecise \
- -I$(MVME_INCL)/posix \
- -I$(MVME_INCL)/stdc \
- -I$(MVME_INCL)/chorus \
- -I$(MVME_INCL)/CC
-CCFLAGS += $(CFLAGS) --mkctors --multibyte_chars --no_rtti --wchar_t_keyword \
- -tnone
-DCFLAGS += -g -G
-DLD = $(CXX)
-LD = $(CXX)
-LDFLAGS = --no_auto_instantiation -u __main -u __premain -u _abort -r \
- $(COOL_DIR)/lib/libOrb.a \
- $(MVME_DIR)/lib/CC/libC.a \
- $(MVME_DIR)/lib/classix/libcx.s.a
-OCFLAGS += -OL -OM
-AR = $(GHS_DIR)/gnuch68/ar
-ARFLAGS = rv
-RANLIB = @true
-
-ifeq ($(debug),)
- CRTH = $(MVME_DIR)/lib/crt/crth.s.o
-else
- CRTH = $(MVME_DIR)/lib/crt/crth_d.s.o
-endif # debug
-
-ifdef exceptions
- CCFLAGS += --exceptions
-endif # exceptions
-
-POSTLINK = ; $(CC) -groot=$(MVME_DIR)/ -alttools=$(GHS_DIR)/gnuch68 -68040 \
- -nostartfiles -nostdlib -e __start -o $@.final \
- $(CRTH) $(MVME_DIR)/lib/crt/crt0.o \
- $(MVME_DIR)/lib/crt/crti.o $@ \
- $(MVME_DIR)/lib/crt/crtn.o \
- -locatedprogram -r; \
- mv -f $@.final $@; chmod +x $@; $(RM) /tmp/gh_*.[os]
diff --git a/include/makeinclude/platform_cray.GNU b/include/makeinclude/platform_cray.GNU
deleted file mode 100644
index a36b6fd3c27..00000000000
--- a/include/makeinclude/platform_cray.GNU
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id$
-
-# Platform macros for SGI/Cray UNICOS (vector) & UNICOS/mk (mpp) -
-# UNICOS 9.0.2.8
-# UNICOS 10.0.0.5
-# UNICOS/mk 2.0.4.57
-# Cray C++ Version 3.2.0.1
-# Cray Standard C Version 6.2.0.1
-#
-# Contributed by Doug Anderson <dla@home.com>
-
-debug = 1
-exceptions = 1
-static_libs_only = 1
-quantify =
-purify =
-
-# Cray's autoinstantiation seems to be broken, resulting in
-# C++ prelinker: error: instantiation loop
-# So, we're using ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-CC = cc
-LDLIB += -L$(ACE_ROOT)/ace
-CXX = CC
-#CFLAGS +=
-CCFLAGS += -h noautoinstantiate
-DCFLAGS += -g
-DCCFLAGS += $(DCFLAGS)
-OCFLAGS += -O2
-OCCFLAGS += $(OCFLAGS)
-
-ifndef exceptions
- CCFLAGS += -h noexceptions
-else
- CCFLAGS += -h exceptions
-endif # ! exceptions
-
-DLD = $(CXX)
-LD = $(CXX)
-LIBS = -lpthread
-PIC =
-AR = ar
-ARFLAGS = ruv
-RANLIB = /bin/true
-
-# This is necessary to get libraries to contain template info, but only
-# necessary when using autoinstantiation
-# PRELIB = @echo ""; \
-# echo "int main() { return 0; }" >dummy.cpp; \
-# echo "$(CXX) $(CCFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LIBS) -o dummy dummy.cpp $?";\
-# $(CXX) $(CCFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LIBS) -o dummy dummy.cpp $?;
diff --git a/include/makeinclude/platform_dgux4_epc.GNU b/include/makeinclude/platform_dgux4_epc.GNU
deleted file mode 100644
index 7af2281d13a..00000000000
--- a/include/makeinclude/platform_dgux4_epc.GNU
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id$
-
-# SunOS 5.x (Solaris 2.x) with SunC++ 4.x
-# *not* using Orbix
-
-debug = 1
-
-CC = gcc
-CXX = ec++
-## CCFLAGS += -relax -tproff
-CCFLAGS += $(CFLAGS) -relax -v -eh
-DCFLAGS += -g
-DLD = $(CXX)
-LIBS += -lgen -lsocket -ldl -lnsl -lc
-PIC = -KPIC
-AR = ar
-ARFLAGS = -ruv
-RANLIB = echo
-SOFLAGS = -G $(CPPFLAGS)
-#SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
-# $(SOLINK.cc) -o $@ -h $@ $(LDFLAGS) $(VSHDIR)$*.o
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
diff --git a/include/makeinclude/platform_dgux4_ghs.GNU b/include/makeinclude/platform_dgux4_ghs.GNU
deleted file mode 100644
index 05c5b3ad787..00000000000
--- a/include/makeinclude/platform_dgux4_ghs.GNU
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id$
-
-# DG/UX 4.x using Green Hills Multi's C++ compiler.
-
-debug = 1
-#shared_libs_only = 0
-#static_libs_only = 1
-#static_libs = 1
-
-CC = cc
-CXX = ghcx
-CCFLAGS += $(CFLAGS) -elf -template=noauto # -ansicxx
-# There was a link-time failure if -g (debugging) was turned on, and Green
-# Hills was not able to try to fix it, so debugging is via ACE_OS::printf :-(
-DCFLAGS += # -g
-DLD = $(CXX) -shared
-LD = $(CXX)
-LIBS += -lthread -lrte -lgen -lsocket -ldl -lnsl # -lc
-PIC = -pic
-AR = $(CXX) -archive -o
-ARFLAGS =
-RANLIB = echo
-#SOFLAGS = -G $(CPPFLAGS)
-#SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
-# $(SOLINK.cc) -o $@ -h $@ $(LDFLAGS) $(VSHDIR)$*.o
-#SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
-# $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
diff --git a/include/makeinclude/platform_freebsd.GNU b/include/makeinclude/platform_freebsd.GNU
deleted file mode 100644
index c1bfbd40fad..00000000000
--- a/include/makeinclude/platform_freebsd.GNU
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-
-# platform_freebsd.GNU
-
-VERSION := $(shell uname -r | sed -e "s/`uname -r | sed -e 's/.//'`//")
-ifneq ($(VERSION),3)
-versioned_so = 1
-endif
-
-optimize = 1
-
-debug = 1
-
-CC = gcc
-CXX = g++
-CFLAGS += -W -Wall -Wpointer-arith -pipe
-CCFLAGS += $(CFLAGS) -fno-implicit-templates
-DCFLAGS += -g
-ifeq ($(VERSION),3)
- LDFLAGS += -Wl,-rpath $(ACE_ROOT)/ace
-endif
-DLD = $(CXX)
-LD = $(CXX)
-LIBS += -lstdc++
-OCFLAGS += -O2
-PIC = -fpic
-AR = ar
-ARFLAGS = ruv
-RANLIB = ranlib
-
-SOFLAGS = $(CPPFLAGS) -shared
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-PRELIB = @echo
diff --git a/include/makeinclude/platform_freebsd_pthread.GNU b/include/makeinclude/platform_freebsd_pthread.GNU
deleted file mode 100644
index a6cfdd13203..00000000000
--- a/include/makeinclude/platform_freebsd_pthread.GNU
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-
-# platform_freebsd_pthread.GNU
-
-include $(ACE_ROOT)/include/makeinclude/platform_freebsd.GNU
-
-LDFLAGS += -pthread
-CFLAGS += -D_THREAD_SAFE
diff --git a/include/makeinclude/platform_hpux.GNU b/include/makeinclude/platform_hpux.GNU
deleted file mode 100644
index 2388aaf5be9..00000000000
--- a/include/makeinclude/platform_hpux.GNU
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-
-debug = 1
-
-# First, extract the OS version number.
-HPVERS_WORDS := $(subst ., ,$(shell uname -r))
-HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS)))
-#
-
-CC = /bin/cc
-CXX = /usr/bin/CC -pta -ti,/bin/true -tr,/bin/true
-CFLAGS = -Aa -z +a1
-CCFLAGS = $(CFLAGS) -D_REENTRANT -DACE_LACKS_PRAGMA_ONCE -DHPUX_VERS=$(HPUX_VERS)
-DCFLAGS += -g
-DLD = /usr/bin/CC
-LD = /usr/bin/CC
-PIC = +Z
-ARFLAGS = ruv
-RANLIB = echo
-LDFLAGS = -L$(ACE_ROOT)/ace -Wl,+s
-LIBS += -lxti
-SOFLAGS = -b
-SOEXT = sl
-SOBUILD = @echo ""; \
- echo "$(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<"; \
- $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- echo "$(SOLINK.cc) -o $@ $(VSHDIR)$*.o"; \
- $(SOLINK.cc) -o $@ $(VSHDIR)$*.o
diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU
deleted file mode 100644
index 3814a3e074d..00000000000
--- a/include/makeinclude/platform_hpux_aCC.GNU
+++ /dev/null
@@ -1,129 +0,0 @@
-# $Id$
-#
-# This is for the HP-UX 10.x and 11.x using the aC++ compiler.
-#
-# For 10.x, most of the difference for threaded vs. non-threaded is
-# contained in ace/config-hpux-10.x.h. However, to build without threads,
-# you should run the make with "threads=0" since the default is to build
-# with threads.
-#
-# HP-UX 11 supports both 32-bit and 64-bit builds, regardless of which
-# architecture the build is done on. This file is set up to build native
-# to the machine it's running on. To cross-build for another platform, add
-# "buildbits=32" to make a 32-bit build, and "buildbits=64" to do a 64-bit
-# build. Note that if you explicitly specify a 64-bit build, the option
-# -Wl,+vnocompatwarnings is added to shut up the "At least one PA 2.0 object
-# file detected..." messages.
-
-ifeq (,$(buildbits))
- buildbits = 0
-endif
-ifeq (,$(debug))
- debug = 1
-endif
-ifeq (,$(distrib))
- distrib = 0
-endif
-ifeq (,$(optimize))
- optimize = 0
-endif
-ifeq (,$(threads))
- threads = 1
-endif
-
-# First, extract the OS version number.
-HPVERS_WORDS := $(subst ., ,$(shell uname -r))
-HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS)))
-#
-CC = /bin/cc
-CXX = /opt/aCC/bin/aCC
-#
-# Set the appropriate preprocessor defs for threading based on OS version.
-# If the user has requested building without threads, then don't set any
-# for 10.20, but for 11.00, the default is to use threads, so explicitly
-# turn them off if the user requested build without threads.
-#
-ifeq ($(threads),1)
-ifeq ($(word 2,$(HPVERS_WORDS)), 11)
-THR_DEFS = -DACE_HAS_THREADS -D_POSIX_C_SOURCE=199506L
-else
-THR_DEFS = -DACE_HAS_THREADS -D_REENTRANT
-endif
-else
-ifeq ($(word 2,$(HPVERS_WORDS)), 11)
-THR_DEFS = -DACE_HAS_THREADS=0
-endif
-endif
-
-# Suppress warning 302 ((...) parameter list is a non-portable feature)
-CCFLAGS += $(CFLAGS) $(THR_DEFS) -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE +W302
-# Additionally, on HP-UX 10.20, suppress 495 to shut up the warnings from
-# the system header files. 667 is also suppressed, but the compiler still
-# tells you there was a future error, but at least you can pick out any real
-# errors by quickly scanning the output. 829 is suppressed because the
-# system headers have offending string literals assigned to char *.
-ifeq ($(word 2,$(HPVERS_WORDS)), 10)
-CCFLAGS += +W495,667,829
-endif
-DCFLAGS += -g
-DLD = $(CXX) $(CCFLAGS)
-LD = $(CXX)
-OCCFLAGS = -O
-PIC = +Z
-
-AR = $(COMPILE.cc) +inst_close $^; /bin/ar
-ARFLAGS = ruv
-RANLIB = echo
-LDFLAGS = -Wl,+s -z
-SOFLAGS = -b
-
-ifeq ($(distrib),1)
-
-ifeq ($(word 2,$(HPVERS_WORDS)), 10)
-SOFLAGS += -Wl,-x -Wl,+h/usr/lib/$(@F)
-else
-ifeq ($(buildbits),32)
-SOFLAGS += -Wl,-x -Wl,+h/usr/lib/$(@F)
-endif
-ifeq ($(buildbits),64)
-SOFLAGS += -Wl,-x -Wl,+h/usr/lib/pa20_64/$(@F)
-endif
-endif
-
-endif
-
-SOEXT = sl
-
-ifeq ($(buildbits),32)
-CCFLAGS += +DA1.1 +DS1.1
-else
-ifeq ($(buildbits),64)
-CCFLAGS += +DA2.0 +DS2.0
-LDFLAGS += -Wl,+vnocompatwarnings
-else
-CCFLAGS += +DAportable
-endif
-endif
-
-#
-# Grab the appropriate libraries based on the version of HP-UX we're building
-# on and whether or not thread support is being used.
-#
-ifeq ($(word 2,$(HPVERS_WORDS)), 11)
-
-#11.x:
-ifeq ($(threads),1)
-LIBS += -lxti -lpthread -lrt -ldld
-else
-LIBS += -lxti -lrt -ldld
-endif
-
-else
-
-# 10.x:
-LIBS += -lxti -ldld
-ifeq ($(threads),1)
-LIBS += -lcma
-endif
-
-endif
diff --git a/include/makeinclude/platform_hpux_gcc.GNU b/include/makeinclude/platform_hpux_gcc.GNU
deleted file mode 100644
index 14f0c8f941b..00000000000
--- a/include/makeinclude/platform_hpux_gcc.GNU
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id$
-#
-
-debug = 1
-optimize = 1
-threads = 1
-
-# First, extract the OS version number.
-HPVERS_WORDS := $(subst ., ,$(shell uname -r))
-HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS)))
-#
-CC = gcc
-CXX = g++
-CFLAGS += -w
-#
-# Set the appropriate preprocessor defs for threading based on OS version.
-# If the user has requested building without threads, then don't set any.
-#
-ifeq ($(threads),1)
-ifeq ($(word 2,$(HPVERS_WORDS)), 11)
-THR_DEFS = -DACE_HAS_THREADS -D_POSIX_C_SOURCE=199506L
-else
-THR_DEFS = -DACE_HAS_THREADS -D_REENTRANT
-endif
-endif
-
-CCFLAGS += $(CFLAGS) -fno-implicit-templates -DHPUX_VERS=$(HPUX_VERS) $(THR_DEFS)
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-OCFLAGS += -O2
-PIC = -fPIC
-ARFLAGS = ruv
-RANLIB = echo
-LDFLAGS = -L. -L$(ACE_ROOT)/ace -Wl,+s
-SOFLAGS = $(CPPFLAGS) -shared -nostdlib $(PIC)
-SOEXT = sl
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.$(SOEXT) $<
-SHLIBBUILD = $(SOLINK.cc) -o $@ $(VSHOBJS1)
-PRELIB = @true
-#
-# Grab the appropriate libraries based on the version of HP-UX we're building
-# on and whether or not thread support is being used.
-#
-ifeq ($(word 2,$(HPVERS_WORDS)), 11)
-
-#11.x:
-ifeq ($(threads),1)
-LIBS += -lxti -lpthread -lrt -ldld
-else
-LIBS += -lxti -lrt -ldld
-endif
-
-else
-
-# 10.x:
-LIBS += -lxti -ldld
-ifeq ($(threads),1)
-LIBS += -lcma
-endif
-
-endif
diff --git a/include/makeinclude/platform_hpux_orbix.GNU b/include/makeinclude/platform_hpux_orbix.GNU
deleted file mode 100644
index fa05720bf14..00000000000
--- a/include/makeinclude/platform_hpux_orbix.GNU
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id$
-
-# Assume the existence of Orbix with HP/UX...
-
-debug = 1
-
-CC = /bin/cc
-CXX = /usr/bin/CC
-CFLAGS = -Aa -z +z
-CCFLAGS = $(CFLAGS) -pta -ptb
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-INCLDIRS = -I$(ORBIX_ROOT)/include
-PIC =
-ARFLAGS = ruv
-RANLIB = echo
-LDFLAGS = -L$(ORBIX_ROOT)/lib -L$(ACE_ROOT)/ace -Wl,+s
-SOFLAGS = -b
-SOBUILD = @echo ""; \
- echo "$(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<"; \
- $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- $(RM) -rf $(VSHDIR)pt$*; mkdir $(VSHDIR)pt$*; \
- echo "int main() { return 0; }" >dummy.C; \
- echo "$(CXX) $(CCFLAGS) $(PIC) $(CPPFLAGS) $(LDFLAGS) -ptr$(VSHDIR)pt$* -ptr./ptrepository dummy.C $<";\
- YYZ="`$(CXX) $(CCFLAGS) $(PIC) $(CPPFLAGS) $(LDFLAGS) -ptr$(VSHDIR)pt$* -ptr./ptrepository dummy.C $<`"; \
- $(RM) -rf a.out dummy.*; \
- YYZ="`echo $(VSHDIR)pt$*/*.o`"; \
- echo "$(SOLINK.cc) -o $@ ./$(VSHDIR)$*.o $(YYZ)"; \
- $(SOLINK.cc) -o $@ ./$(VSHDIR)$*.o $(YYZ)
diff --git a/include/makeinclude/platform_irix5.2.GNU b/include/makeinclude/platform_irix5.2.GNU
deleted file mode 100644
index 57a80d16440..00000000000
--- a/include/makeinclude/platform_irix5.2.GNU
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id$
-
-# Irix 5.2 with gcc 2.6.1
-
-debug = 1
-optimize = 1
-
-MAKE = gmake
-CC = gcc
-CXX = g++
-CCFLAGS += $(CFLAGS) -fno-implicit-templates
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-LDFLAGS +=
-LIBS += -ldl
-OCFLAGS += -O2
-PIC = -fpic
-RANLIB = echo
-SOFLAGS =
-SOBUILD =
diff --git a/include/makeinclude/platform_irix5.3_g++.GNU b/include/makeinclude/platform_irix5.3_g++.GNU
deleted file mode 100644
index 2353ab4170d..00000000000
--- a/include/makeinclude/platform_irix5.3_g++.GNU
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id$
-
-# Irix 5.3 with GNU C++
-
-debug = 1
-optimize = 1
-
-CC = gcc
-CXX = g++
-CCFLAGS += $(CFLAGS) -fno-implicit-templates
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-LDFLAGS += -L$(ACE_ROOT)/ace
-OCFLAGS += -O2
-PIC = -fpic
-RANLIB = echo
-SOFLAGS = -shared $(CPPFLAGS)
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
-
diff --git a/include/makeinclude/platform_irix5.3_sgic++.GNU b/include/makeinclude/platform_irix5.3_sgic++.GNU
deleted file mode 100644
index 41b1e831b3e..00000000000
--- a/include/makeinclude/platform_irix5.3_sgic++.GNU
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id$
-
-# Irix 5.3 with SGI C++
-
-# This suppresses common compiler warnings which appear in the
-# ACE code but should not matter. The warnings can be turned on
-# again by removing the -woff clause in the CPPFLAGS definition.
-
-debug = 1
-
-CC = cc
-CXX = CC
-CCFLAGS += $(CFLAGS)
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-CPPFLAGS += -ptused -prelink +pp -woff 3203,3209,3161,3262,3665
-LDFLAGS += -rpath "$(ACE_ROOT)/ace"
-LIBS =
-PIC = -KPIC
-AR = ar
-ARFLAGS = r
-RANLIB = echo
-SOFLAGS = -shared $(CPPFLAGS) -all
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
diff --git a/include/makeinclude/platform_irix6.x_common.GNU b/include/makeinclude/platform_irix6.x_common.GNU
deleted file mode 100644
index b27ff8331bb..00000000000
--- a/include/makeinclude/platform_irix6.x_common.GNU
+++ /dev/null
@@ -1,13 +0,0 @@
-# $Id$
-
-xt_reactor = 1
-
-PLATFORM_XT_CPPFLAGS=
-PLATFORM_XT_LIBS=-lXm -lXt -lX11
-PLATFORM_XT_LDFLAGS=
-
-ifndef ACE_IRIX_VERS
-ACE_IRIX_VERS := $(subst .,,$(shell uname -r))
-endif # ACE_IRIX_VERS
-
-CPPFLAGS += -DACE_IRIX_VERS=$(ACE_IRIX_VERS)
diff --git a/include/makeinclude/platform_irix6.x_g++.GNU b/include/makeinclude/platform_irix6.x_g++.GNU
deleted file mode 100644
index 0541ebf6ad2..00000000000
--- a/include/makeinclude/platform_irix6.x_g++.GNU
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id$
-
-# Irix 6.X with GNU C++
-
-include $(ACE_ROOT)/include/makeinclude/platform_irix6.x_common.GNU
-
-ifeq (,$(debug))
- debug = 1
-endif
-ifeq (,$(optimize))
- optimize = 1
-endif
-
-CC = gcc
-CXX = g++
-CFLAGS += $(DCFLAGS)
-CCFLAGS += $(CFLAGS) -fno-implicit-templates
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-LDFLAGS += -L$(ACE_ROOT)/ace -Wl,-dont_warn_unused
-LIBS += -lpthread
-OCFLAGS += -O2
-PIC = -fpic
-# AR = ar
-ARFLAGS = rv
-RANLIB = @true
-SOFLAGS = -shared $(CPPFLAGS)
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- $(SOLINK.cc) $(LDFLAGS) -o $@ $(VSHDIR)$*.o
diff --git a/include/makeinclude/platform_irix6.x_kcc.GNU b/include/makeinclude/platform_irix6.x_kcc.GNU
deleted file mode 100644
index 3d5311feea3..00000000000
--- a/include/makeinclude/platform_irix6.x_kcc.GNU
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-
-# Irix 6.x with KCC 3.3f
-
-include $(ACE_ROOT)/include/makeinclude/platform_irix6.x_common.GNU
-
-# WARNING_FLAGS +=
-# 111: statement is unreachable. There's a whole bunch of these
-# in the ace code.
-WARNING_FLAGS += --diag_suppress 111
-
-debug = 1
-optimize = 1
-
-CC = KCC
-CXX = KCC
-CFLAGS += -32
-CCFLAGS += $(CFLAGS) -DNULL=0 $(WARNING_FLAGS)
-ifeq ($(optimize),1)
-DCFLAGS += -g --backend -g3
-else
-DCFLAGS += +K0 -g
-endif
-DLD = $(CXX)
-LD = $(CXX)
-LDFLAGS += -32 -L$(ACE_ROOT)/ace -L.
-LIBS += -lpthread
-OCFLAGS += +K3 -O2
-PIC =
-AR = KCC
-ARFLAGS = -o
-RANLIB = @true
-SOFLAGS = $(CPPFLAGS) -L$(ACE_ROOT)/ace $(ACELIB)
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-PRELIB = @true
diff --git a/include/makeinclude/platform_irix6.x_sgic++.GNU b/include/makeinclude/platform_irix6.x_sgic++.GNU
deleted file mode 100644
index bdc9b10fbee..00000000000
--- a/include/makeinclude/platform_irix6.x_sgic++.GNU
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id$
-
-# Irix 6.[234] with SGI C++
-# In order to get the -n32 flag enabled please set the SGI_ABI
-# environment variable to -n32. This causes a new compiler to be
-# invoked.
-
-ifeq (,$(debug))
- debug = 1
-endif
-ifeq (,$(optimize))
- optimize = 1
-endif
-
-include $(ACE_ROOT)/include/makeinclude/platform_irix6.x_common.GNU
-
-# Instead of setting the ABI here we rely on the the macro SGI_ABI.
-CC = cc
-CXX = CC
-DLD = $(CXX)
-LD = $(CXX)
-
-# Basic flags
-
-# In Irix 6.2 w/o the thread patches this macro should have no effect.
-CPPFLAGS += -D_SGI_MP_SOURCE
-OCCFLAGS += -O -OPT:Olimit=0
-DCCFLAGS += -g
-
-# Enable exceptions even in the o32 bit ABI.
-CCFLAGS += -exceptions
-
-# Instantiate no templates automatically, do not run prelinker. There
-# are other choices available, but those have not been used in a while.
-CCFLAGS += -ptnone -no_prelink
-# Instantiate everything; without this, apps/Gateway/Gateway/gatewayd might
-# not build due to missing template instantiations. NOTE: it seems
-# this setting no longer works for ACE.
-#CCFLAGS += -ptall
-# Instantiate used templates, plus prelinking instantiation
-#CCFLAGS += -ptused -prelink
-# Instantiate used templates, but do not run prelinker
-#CCFLAGS += -ptused
-
-LDFLAGS += -rpath "$(ACE_ROOT)/ace"
-LDFLAGS += -Wl,-woff,15
-LDFLAGS += -Wl,-woff,84
-LDFLAGS += -Wl,-woff,85
-LDFLAGS += -Wl,-woff,133
-
-# You need to remove this if you are using 6.2 without the Pthread
-# patches or if you want to compile without threads support.
-LIBS += -lpthread
-
-PIC = -KPIC
-AR = ar
-ARFLAGS = r
-RANLIB = echo
-SOFLAGS = -shared $(CCFLAGS) $(CPPFLAGS) -all -multigot
-SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
- /bin/ln $(VSHDIR)$*.o $@
-
-# The math library
-MATHLIB=-lm
diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU
deleted file mode 100644
index 5c59e55f48e..00000000000
--- a/include/makeinclude/platform_linux.GNU
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-
-# According to Bryon G. Rigg <bgrigg@opus.bcbnet.com>, this file
-# should allow ACE to be built on Linux.
-
-debug = 1
-optimize = 1
-
-CC = gcc
-CXX = g++
-CFLAGS += -W -Wall -Wpointer-arith -pipe
-CCFLAGS += $(CFLAGS) -fno-implicit-templates
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-LIBS += -ldl
-OCFLAGS += -O3
-PIC = -fPIC
-AR = ar
-ARFLAGS = rsuv
-RANLIB = @true
-SOFLAGS = $(CPPFLAGS) -shared
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-PRELIB = @true
-
-#### GNU gas has a string limit of 4096 characters. On Alphas,
-#### builds will fail due to running over that limit. There are
-#### at least two workarounds:
-#### 1) Change the limit to 8192 characters and rebuild gas. See
-#### ACE-INSTALL.html for more information.
-#### 2) Don't use -g when compiling those files.
-#### If you're building on an Alpha and you haven't hacked and
-#### rebuilt gas, you might need to uncomment the following.
-#### ifeq ($(debug),1)
-#### SUPPRESS_DASH_G = 1
-#### endif # debug
diff --git a/include/makeinclude/platform_linux_kcc.GNU b/include/makeinclude/platform_linux_kcc.GNU
deleted file mode 100644
index 0b9c912e3b9..00000000000
--- a/include/makeinclude/platform_linux_kcc.GNU
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id$
-
-# According to Ben Eng <ben@jetpen.com>, this file
-# should allow ACE to be built on Linux using KAI C++ 3.3a.
-#
-# NOTE: evaluation copies of KCC might include libraries that
-# were compiled with exception handling enabled. To enable link
-# compatibility with those libraries, you must build ACE with
-# exception handling enabled, as well. To do that, either set
-# the exceptions macro below to 1, or build with:
-# make exceptions=1
-
-debug = 0
-exceptions =
-optimize = 1
-
-CC = /opt/KCC/KCC_BASE/bin/KCC
-CXX = $(CC)
-CFLAGS += -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT \
- -D_GNU_SOURCE
-CCFLAGS += $(CFLAGS) -DNULL=0
-DCFLAGS += +K0 -g
-DLD = $(CC)
-LD = $(CC)
-LIBS += -ldl -lpthread -lm
-
-ifndef exceptions
- EXCEPTION = --no_exceptions
-endif # ! exceptions
-
-OCFLAGS += +K3 -O --one_instantiation_per_object $(EXCEPTION)
-PIC = -fPIC
-AR = $(CC)
-ARFLAGS = $(EXCEPTION) -o
-RANLIB = @true
-SOFLAGS = $(CPPFLAGS) $(EXCEPTION)
-SOBUILD = $(COMPILE.cc) $(PIC) $(EXCEPTION) -o $(VSHDIR)$*.o $<
-PRELIB = @true
-PRELIB_USES_OBJ_ONLY = 1
diff --git a/include/makeinclude/platform_linux_lxpthread.GNU b/include/makeinclude/platform_linux_lxpthread.GNU
deleted file mode 100644
index 553b1ecc0cf..00000000000
--- a/include/makeinclude/platform_linux_lxpthread.GNU
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id$
-
-# For pthreads support on Linux, you need
-# -D_POSIX_THREADS
-# -D_POSIX_THREAD_SAFE_FUNCTIONS
-# in the CXX command line. Also, add -lpthreads to the LIBS.
-# libpthreads.so comes with the sources of Linux libc-5.3.*, you need
-# to compile it yourself (no binaries included) --
-# Jan Rychter <jwr@icm.edu.pl>
-
-ifeq (,$(debug))
- debug = 1
-endif
-ifeq (,$(optimize))
- optimize = 1
-endif
- xt_reactor = 0
-
-PLATFORM_XT_CPPFLAGS=
-PLATFORM_XT_LIBS=-lXt
-PLATFORM_XT_LDFLAGS=
-
-fl_reactor = 0
-
-PLATFORM_FL_CPPFLAGS=
-PLATFORM_FL_LIBS=-lfltk
-PLATFORM_FL_LDFLAGS=
-
-PLATFORM_X11_CPPFLAGS=
-PLATFORM_X11_LIBS=-lX11
-PLATFORM_X11_LDFLAGS=-L/usr/X11R6/lib
-
-PLATFORM_GL_CPPFLAGS=
-PLATFORM_GL_LIBS=-lMesaGL
-PLATFORM_GL_LDFLAGS=
-
-PLATFORM_AIO_SUPPORT := \
- $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS)
-
-ifeq ($(NO_IMPLICIT_TEMPLATES),)
- NO_IMPLICIT_TEMPLATES = -fno-implicit-templates
-endif
-
-CC = gcc
-CXX = g++
-CFLAGS += -W -Wall -pipe \
- -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT \
- $(PLATFORM_AIO_SUPPORT)
-CCFLAGS += $(CFLAGS) $(NO_IMPLICIT_TEMPLATES)
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-LIBS += -ldl -lpthread
-ifeq (-DACE_HAS_AIO_CALLS,$(PLATFORM_AIO_SUPPORT))
- LIBS += -lrt
-endif
-OCFLAGS += -O3
-PIC = -fPIC
-AR = ar
-ARFLAGS = rsuv
-RANLIB = @true
-SOFLAGS = $(CPPFLAGS) -shared
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
-# Added line below to support "Executable Shared Object" files (as
-# needed by the service configurator).
-# Marius Kjeldahl <mariusk@sn.no, marius@funcom.com>
-ESOBUILD = $(COMPILEESO.cc) $(PIC) -shared -o $(VSHDIR)$*.so $<
-ifndef PRELIB
- PRELIB = @true
-endif # ! PRELIB
-
-
-#### GNU gas has a string limit of 4096 characters. On Alphas,
-#### builds will fail due to running over that limit. There are
-#### at least two workarounds:
-#### 1) Change the limit to 8192 characters and rebuild gas. See
-#### ACE-INSTALL.html for more information.
-#### 2) Don't use -g when compiling those files.
-#### If you're building on an Alpha and you haven't hacked and
-#### rebuilt gas, you might need to uncomment the following.
-#### ifeq ($(debug),1)
-#### SUPPRESS_DASH_G = 1
-#### endif # debug
diff --git a/include/makeinclude/platform_linux_lxpthreads.GNU b/include/makeinclude/platform_linux_lxpthreads.GNU
deleted file mode 100644
index 553b1ecc0cf..00000000000
--- a/include/makeinclude/platform_linux_lxpthreads.GNU
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id$
-
-# For pthreads support on Linux, you need
-# -D_POSIX_THREADS
-# -D_POSIX_THREAD_SAFE_FUNCTIONS
-# in the CXX command line. Also, add -lpthreads to the LIBS.
-# libpthreads.so comes with the sources of Linux libc-5.3.*, you need
-# to compile it yourself (no binaries included) --
-# Jan Rychter <jwr@icm.edu.pl>
-
-ifeq (,$(debug))
- debug = 1
-endif
-ifeq (,$(optimize))
- optimize = 1
-endif
- xt_reactor = 0
-
-PLATFORM_XT_CPPFLAGS=
-PLATFORM_XT_LIBS=-lXt
-PLATFORM_XT_LDFLAGS=
-
-fl_reactor = 0
-
-PLATFORM_FL_CPPFLAGS=
-PLATFORM_FL_LIBS=-lfltk
-PLATFORM_FL_LDFLAGS=
-
-PLATFORM_X11_CPPFLAGS=
-PLATFORM_X11_LIBS=-lX11
-PLATFORM_X11_LDFLAGS=-L/usr/X11R6/lib
-
-PLATFORM_GL_CPPFLAGS=
-PLATFORM_GL_LIBS=-lMesaGL
-PLATFORM_GL_LDFLAGS=
-
-PLATFORM_AIO_SUPPORT := \
- $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS)
-
-ifeq ($(NO_IMPLICIT_TEMPLATES),)
- NO_IMPLICIT_TEMPLATES = -fno-implicit-templates
-endif
-
-CC = gcc
-CXX = g++
-CFLAGS += -W -Wall -pipe \
- -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT \
- $(PLATFORM_AIO_SUPPORT)
-CCFLAGS += $(CFLAGS) $(NO_IMPLICIT_TEMPLATES)
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-LIBS += -ldl -lpthread
-ifeq (-DACE_HAS_AIO_CALLS,$(PLATFORM_AIO_SUPPORT))
- LIBS += -lrt
-endif
-OCFLAGS += -O3
-PIC = -fPIC
-AR = ar
-ARFLAGS = rsuv
-RANLIB = @true
-SOFLAGS = $(CPPFLAGS) -shared
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
-# Added line below to support "Executable Shared Object" files (as
-# needed by the service configurator).
-# Marius Kjeldahl <mariusk@sn.no, marius@funcom.com>
-ESOBUILD = $(COMPILEESO.cc) $(PIC) -shared -o $(VSHDIR)$*.so $<
-ifndef PRELIB
- PRELIB = @true
-endif # ! PRELIB
-
-
-#### GNU gas has a string limit of 4096 characters. On Alphas,
-#### builds will fail due to running over that limit. There are
-#### at least two workarounds:
-#### 1) Change the limit to 8192 characters and rebuild gas. See
-#### ACE-INSTALL.html for more information.
-#### 2) Don't use -g when compiling those files.
-#### If you're building on an Alpha and you haven't hacked and
-#### rebuilt gas, you might need to uncomment the following.
-#### ifeq ($(debug),1)
-#### SUPPRESS_DASH_G = 1
-#### endif # debug
diff --git a/include/makeinclude/platform_linux_pthread.GNU b/include/makeinclude/platform_linux_pthread.GNU
deleted file mode 100644
index 5ea573914b4..00000000000
--- a/include/makeinclude/platform_linux_pthread.GNU
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id$
-
-# For pthreads support on Linux, you need
-# -D_MIT_POSIX_THREADS
-# -D_POSIX_THREADS
-# -D_POSIX_THREAD_SAFE_FUNCTIONS
-# in the CXX command line. Also, add -lpthreads to the LIBS.
-# libpthreads.so comes with the sources of Linux libc-5.3.*, you need
-# to compile it yourself (no binaries included) --
-# Jan Rychter <jwr@icm.edu.pl>
-
-debug = 1
-optimize = 1
-
-CC = gcc
-CXX = g++
-CFLAGS += -w -fno-strict-prototypes \
- -D_MIT_POSIX_THREADS -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS
-CCFLAGS += $(CFLAGS) -fno-implicit-templates
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-LIBS += -lpthreads
-OCFLAGS += -O2
-PIC = -fPIC
-AR = ar
-ARFLAGS = rsuv
-RANLIB = @true
-SOFLAGS = $(CPPFLAGS) -shared
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-PRELIB = @true
diff --git a/include/makeinclude/platform_lynxos.GNU b/include/makeinclude/platform_lynxos.GNU
deleted file mode 100644
index 4fbdb41ea01..00000000000
--- a/include/makeinclude/platform_lynxos.GNU
+++ /dev/null
@@ -1,95 +0,0 @@
-# $Id$
-#
-# LynxOS with g++. Defaults to LynxOS Version 3.0.0. For Version 2.5.0,
-# for example, add "VERSION=2.5.0" to your make invocation.
-
-#### NOTE: It's best to create a file that includes this one, instead
-#### of symlinking it. That way, you can easily override the default
-#### configuration. For example, to configure for a PowerPC target, I
-#### use a include/makeinclude/platform_macros.GNU that contains the
-#### following lines (without comment markers):
-####
-#### LYNXTARGET = ppc
-#### include $(ACE_ROOT)/include/makeinclude/platform_lynxos.GNU
-####
-#### Similarly, the default VERSION and HOST_OS settings (see below)
-#### can be overridden for your particular platform.
-
-
-debug = 1
-shared_libs =
-static_libs = 1
-#### optimize is defined below because it is version-dependent.
-
-ifneq ($(shell uname -s),LynxOS)
- CROSS-COMPILE = 1
-
- #### The following may need to be customized for your host or target type.
- #### Or, you can source the appropriate (for your shell) Lynx SETUP file
- #### before running "make".
-
- ifeq (,$(VERSION))
- VERSION=3.0.0
- endif # VERSION
-
- ifeq (,$(LYNXTARGET))
- LYNXTARGET = x86
- endif # LYNXTARGET
-
- ifeq (,$(HOST_OS))
- ifeq (2.5.0,$(VERSION))
- HOST_OS = sunos
- else
- ifeq ($(LYNXTARGET),x86)
- HOST_OS = sunos-coff
- else
- ifeq ($(LYNXTARGET),ppc)
- HOST_OS = sunos-xcoff
- endif # ppc
- endif # x86
- endif # VERSION
- endif # HOST_OS
-
- ifeq (,$(findstring /usr/lynx/$(VERSION)/$(LYNXTARGET),$(PATH)))
- PATH:=\
-/usr/lynx/$(VERSION)/$(LYNXTARGET)/cdk/$(HOST_OS)-$(LYNXTARGET)/bin:/usr/lynx/$(VERSION)/$(LYNXTARGET)/cdk/$(HOST_OS)-$(LYNXTARGET)/usr/bin:$(PATH)
- endif # PATH
-endif # ! LynxOS
-
-ifeq (2.5.0,$(VERSION))
- # NOTE: On LynxOS Version 2.5.0, optimization causes these warnings:
- # warning: internal compiler error: debugging info corrupted
- optimize = 0
-else
- optimize = 1
-
- #### Even though the g++ version is 2.7-97r1, it supports nested
- #### classes, so it can build the TAO tests.
- ACE_HAS_GNUG_PRE_2_8 = 0
-endif # VERSION
-
-CC = gcc
-CXX = g++
-CFLAGS += -mthreads -pipe -ansi -Wpointer-arith
-#### -Winline complains a lot with -O2.
-#### CFLAGS += -Winline
-#### LynxOS 3.0.0's g++ has a lot of warnings about non-virtual base class
-#### destructors with -Wall.
-ifeq (2.5.0,$(VERSION))
- CFLAGS += -Wall
-endif # VERSION
-CCFLAGS += $(CFLAGS) -fno-implicit-templates
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-LIBS += -lnetinet -lnsl
-OCFLAGS += -O2
-AR = ar
-ARFLAGS = ruv
-RANLIB = @true
-PRELIB = @true
-
-# To save much disk space, strip all executables. Comment the
-# following line out if you want to debug. Or, added "POSTLINK="
-# to your make invocation.
-POSTLINK = ; strip $@
diff --git a/include/makeinclude/platform_m88k.GNU b/include/makeinclude/platform_m88k.GNU
deleted file mode 100644
index 382c6e2adc2..00000000000
--- a/include/makeinclude/platform_m88k.GNU
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id$
-
-# SunOS 5.x (Solaris 2.x) with SunC++ 4.x
-# *not* using Orbix
-
-debug = 1
-optimize = 1
-
-CC = gcc
-CXX = g++
-CFLAGS += -w
-CCFLAGS += $(CFLAGS) -D__m88k__ -fno-implicit-templates -fno-strict-prototypes
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-INCLDIRS += -I$(ACE_ROOT) -I.
-INCLDIRS += -I/devel/rmm/v1.0/local/src/threads/include
-LDFLAGS += -L $(ACE_ROOT)/ace -L ./
-LDFLAGS += -L/devel/rmm/v1.0/local/src/threads/lib
-LIBS += -lsocket -ldl -lnsl -lgen -lstdc++ -lg++
-LIBS += -lgthreads -lgmalloc
-OCFLAGS += -O2
-PIC = -fpic
-AR = ar
-ARFLAGS = ruv
-RANLIB = /bin/true
-SOFLAGS = -G $(CPPFLAGS)
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- $(SOLINK.cc) -o $@ -h $@ $(LDFLAGS) $(VSHDIR)$*.o
-PRELIB = @true
diff --git a/include/makeinclude/platform_mvs.GNU b/include/makeinclude/platform_mvs.GNU
deleted file mode 100644
index 69215470627..00000000000
--- a/include/makeinclude/platform_mvs.GNU
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id$
-
-# For MVS OpenEdition platform
-
-debug = 0
-
-CXX = cxx
-DCFLAGS += -g
-DCCFLAGS += -g
-CPPFLAGS += -+
-DEFFLAGS = -D_ALL_SOURCE -DNDEBUG
-CC = $(CXX)
-LD = $(CXX)
-DLD = $(CXX)
-AR = ar
-ARFLAGS = ruv
-RANLIB = echo
-#LDFLAGS = -W l,p,map
-
-# MVCMD needed because cxx does not use the -o option to place objects
-MVCMD = @test ! -s $(@F) || mv $(@F) $(@D)/$(@F)
-
-# Used to build static executables
-ACELIB_STATIC = -lACE
-
-# Used to build shared executables (much smaller in size)
-ACELIB_DLL = $(ACE_ROOT)/ace/libACE.x
-
-# set accordingly to build either static or shared executables
-ACELIB = $(ACELIB_DLL)
-
-SOFLAGS = -W l,dll
-PIC = -W c,exportall
-static_libs = 1
diff --git a/include/makeinclude/platform_netbsd.GNU b/include/makeinclude/platform_netbsd.GNU
deleted file mode 100644
index d9e08b01139..00000000000
--- a/include/makeinclude/platform_netbsd.GNU
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-
-# platform_netbsd.GNU
-
-# ***** Notice: This file is still under testing. *****
-# To be used on netbsd platform without pthread support.
-
-debug = 1
-optimize = 1
-versioned_so = 1
-
-CC = gcc
-CXX = g++
-CFLAGS += -w -fno-strict-prototypes
-CCFLAGS += $(CFLAGS) -fno-implicit-templates
-DCFLAGS += -g
-DLD = ld
-LD = $(CXX)
-LIBS += -lstdc++ #-lcompat -lresolv
-##OCFLAGS += -O2
-PIC = -fpic -DPIC
-AR = ar
-ARFLAGS = ruv
-RANLIB = ranlib
-
-SOFLAGS = -Bshareable -x /usr/lib/c++rt0.o
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-PRELIB = @echo
diff --git a/include/makeinclude/platform_osf1_3.2.GNU b/include/makeinclude/platform_osf1_3.2.GNU
deleted file mode 100644
index d2da4954e75..00000000000
--- a/include/makeinclude/platform_osf1_3.2.GNU
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id$
-
-# This platform macros file is intended to work with Digital UNIX 3.2
-# (OSF/1 3.2g) with CXX 5.7 or later.
-
-debug = 1
-
-CC = cxx
-CXX = $(CC)
-CFLAGS += -threads
-#### CCFLAGS += -x cxx
-CCFLAGS += $(CFLAGS) -w0
-DCFLAGS += -g -O0
-#### DLD = ld -shared -expect_unresolved '*'
-DLD = ld
-LD = $(CXX)
-#### LIBS += -lpthreads -lmach -lsys5 -lxti -ltli -lcxx -lexc -lc -lrt
-LIBS += -qltli_r -ltli -qlrt_r -lrt -qlcxxstd_r -lcxxstd -qlcxx_r \
- -lcxx -qlots_r -lots -lpthreads -lmach -lexc -lc_r -lc
-#### PIC = -pic
-ARFLAGS = cruv
-RANLIB = /usr/bin/true
-#### SOFLAGS = -shared
-SOFLAGS = -L/usr/lib/cmplrs/cxx -rpath /usr/lib/cmplrs/cxx \
- -L$(ACE_ROOT)/ace -L./ -g2 -O0 -shared
-SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
- ln $(VSHDIR)$*.o $@
diff --git a/include/makeinclude/platform_osf1_4.0.GNU b/include/makeinclude/platform_osf1_4.0.GNU
deleted file mode 100644
index f83ca5db6cf..00000000000
--- a/include/makeinclude/platform_osf1_4.0.GNU
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id$
-
-# This platform macros file is intended to work with
-# Digital UNIX 4.0 (OSF/1 4.0), using the cxx compiler..
-
-debug = 1
-exceptions = 1
-rtti = 1
-
-CC = cxx
-CXX = $(CC)
-#### Note: -pthread uses POSIX threads. If you want to use DCE threads
-#### instead, change "-pthread" to "-threads".
-CFLAGS += -pthread
-
-#### These flags can only be used with cxx Version 6.0 and later.
-#### They are enabled by default; they can be disabled by settting
-#### CXX_VER to CXX_5 either on the make command line, or by
-#### or by setting the CXX_VER environment variable to CXX_5.
-ifneq ($(CXX_VER),CXX_5)
- WARNING_FLAGS += -w0
- ifneq (,$(VERBOSE_WARNING))
- WARNING_FLAGS += -msg_display_number -msg_display_tag
- endif # VERBOSE_WARNING
-
- ifneq (,$(optimize))
- #### See ace/config-osf1-4.0.h for the meaning of this warning.
- #### It's not necessary on DU 5.0.
- WARNING_FLAGS += -msg_disable 1016
- endif # optimize
-
- ifndef ACE_DU_VERSION
- # In case this file wasn't included by platform_osf1_cxx.GNU:
- # 9: nested comment not allowed. But there's one in /usr/include/pdsc.h!
- WARNING_FLAGS += -msg_disable 9
- endif # ACE_DU_VERSION
-endif # 6.0 or later
-
-CCFLAGS += $(CFLAGS) $(WARNING_FLAGS)
-ifeq ($(rtti),)
- CCFLAGS += -nortti
-endif # rtti
-DCFLAGS += -g -O0
-DLD = $(CXX)
-LD = $(CXX)
-LIBS += $(CFLAGS) -ltli -lrt
-MATHLIB = -lm
-OCFLAGS += -O4
-PIC =
-ARFLAGS = cruvZ
-# When libraries are archived, a hash index is automatically created
-# so there is no need for ranlib
-RANLIB = @true
-#### The -hidden [...] -non_hidden business avoids multiply defined
-#### symbols between the shared library and libcxxstd.a. It's the
-#### workaround recommended in PTR 43-4-204.
-SOFLAGS = -hidden /usr/lib/cmplrs/cxx/libcxxstd.a -non_hidden \
- -shared -use_ld_input $(ACELIB)
-SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
- ln $(VSHDIR)$*.o $@
-
-ifndef exceptions
- #### Disable the default exception handling of cxx >= 6.0.
- #### This is untested. exceptions=1 is the default, so it's not used
- #### by default.
- ifndef CXX_VERSION
- CXX_VERSION := $(shell $(CXX) -V)
- endif # ! CXX_VERSION
-
- ifeq (6.,$(findstring 6.,$(CXX_VERSION)))
- CCFLAGS += -nocleanup
- endif # 6.x
-endif # ! exceptions
diff --git a/include/makeinclude/platform_osf1_4.0_g++.GNU b/include/makeinclude/platform_osf1_4.0_g++.GNU
deleted file mode 100644
index e05a62a38d1..00000000000
--- a/include/makeinclude/platform_osf1_4.0_g++.GNU
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id$
-
-# This platform macros file is intended to work with Digital UNIX 4.0
-# (OSF/1 4.0) and GCC in version 2.7.2.1 (or newer).
-
-debug = 1
-optimize = 1
-
-CC = gcc
-CXX = g++
-CFLAGS += -D_REENTRANT
-CCFLAGS += $(CFLAGS) -fno-implicit-templates -fno-strict-prototypes
-DCFLAGS += -g
-LD = $(CXX)
-DLD = $(CXX)
-LIBS += -lpthread -lmach -lexc -ltli -lrt
-OCFLAGS += -O2
-PIC = -fpic
-ARFLAGS = cruvZ
-# When libraries are archived, a hash index is automatically created so there
-# is no need for ranlib
-RANLIB = /usr/bin/true
-SOFLAGS = -shared $(CPPFLAGS) $(ACELIB)
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-PRELIB = @true
diff --git a/include/makeinclude/platform_osf1_4.0_kcc.GNU b/include/makeinclude/platform_osf1_4.0_kcc.GNU
deleted file mode 100644
index 0b921097354..00000000000
--- a/include/makeinclude/platform_osf1_4.0_kcc.GNU
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id$
-
-# This platform macros file is intended to work with Digital UNIX 4.0
-# (OSF/1 4.0) and KAI C++ 3.3f.
-
-debug = 1
-optimize = 1
-
-# WARNING_FLAGS +=
-# 9: nested comment not allowed. But there's one in /usr/include/pdsc.h!
-# and /usr/include/net/if_types.h
-# 111: statement is unreachable. There's a whole bunch of these
-# in the ace code.
-WARNING_FLAGS += --diag_suppress 9,111
-
-CC = KCC
-CXX = $(CC)
-CFLAGS += -D_REENTRANT
-CCFLAGS += $(CFLAGS) -DNULL=0 $(WARNING_FLAGS)
-ifeq ($(optimize),1)
-DCFLAGS += -g3
-else
-DCFLAGS += +K0 -g
-endif
-LD = $(CC)
-DLD = $(CC)
-LIBS += -lpthread -lmach -lexc -ltli -lrt -lm
-OCFLAGS += +K3 -O
-PIC =
-AR = $(CC)
-ARFLAGS = -o
-# When libraries are archived, a hash index is automatically created so there
-# is no need for ranlib
-RANLIB = /usr/bin/true
-SOFLAGS = $(CPPFLAGS) -L$(ACE_ROOT)/ace $(ACELIB) -lc
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-PRELIB = @true
diff --git a/include/makeinclude/platform_osf1_4.0_rcc.GNU b/include/makeinclude/platform_osf1_4.0_rcc.GNU
deleted file mode 100644
index f188fe2d682..00000000000
--- a/include/makeinclude/platform_osf1_4.0_rcc.GNU
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id$
-
-# This platform macros file is intended to work with Rational C++ (2.4.1) on
-# Digital UNIX 4.0 (OSF/1 4.0).
-
-debug = 1
-exceptions = 1
-
-CC = rcc
-CXX = RCC
-CFLAGS += -D_REENTRANT
-CCFLAGS += $(CFLAGS) -nosienna
-DCFLAGS += -g -O0
-DLD = $(CXX)
-LD = $(CXX)
-LIBS += -lpthread -lc_r -ltli -lrt
-OCFLAGS += -O4
-PIC = -pic
-ARFLAGS = cruvZ
-# When libraries are archived, a hash index is automatically created
-# so there is no need for ranlib
-RANLIB = /usr/bin/true
-SOFLAGS = -shared # -use_ld_input $(ACELIB)
-SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
- ln $(VSHDIR)$*.o $@
diff --git a/include/makeinclude/platform_psos_diab.GNU b/include/makeinclude/platform_psos_diab.GNU
deleted file mode 100644
index d250c30ad6d..00000000000
--- a/include/makeinclude/platform_psos_diab.GNU
+++ /dev/null
@@ -1,189 +0,0 @@
-# $Id$
-# pSOS with Diab Data C++ 4.1a Compiler
-
-# ================================================================
-# pSOS sTUFF
-# ================================================================
-
-PSS_LIBC_DIR = $(PSS_ROOT)/sys/libc
-PSS_SYS_DIR = $(PSS_ROOT)/sys/os
-
-PSOS_LIBS = -L $(PSS_LIBC_DIR) -lprepc -lcxxsp \
- -L $(PSS_SYS_DIR) -lsysxx -lsys
-
-PSS_BSP_LIB = -L $(PSS_BSP) -lbsp
-
-# DIAB_LIBS = -L $(DIABLIB)/MC60FS/psos -lpsos
-
-# DIAB_LIBS = -L $(DIABLIB)/MC60FS -li -lchar -lg -limpl -lram -ld \
-# -L $(DIABLIB)/MC60FS -lcfp -lm -limpfp -lcomplex -lios \
-# -L $(DIABLIB)/MC60FS/psos -lpsos \
-# -L $(PSS_ROOT)/sys/libc -lprepc
-
-# DIAB_LIBS = -L $(DIABLIB)/MC60FS -limpfp \
-# -L $(DIABLIB)/MC60F -limpl \
-# -L $(DIABLIB)/MC60F/psos -lpsos
-
-
-#DIAB_LIBS = -L $(DIABLIB)/MC60F/psos -lc \
-# -L $(PSS_ROOT)/sys/libc -lprepc
-# -L $(DIABLIB)/MC60F -lchar -lg -limpl -lram -ld \
-# -L $(DIABLIB)/MC60FS -lcfp -lm -limpfp -lcomplex -lios -li
-
-PSOSINCL = -I$(PSS_ROOT)/include -I$(PSS_BSP)
-# PSOSINCL = -Y I,$(PSS_ROOT)/include -I$(PSS_BSP)
-
-# hacks to resolve incompatibilities between the compiler and OS headers
-DIAB_PSOS_HACKS = -D__Itypes -D_TIME_T_DEFINED -D_WCHAR_T_DEFINED -D__wchar_t
-# DIAB_PSOS_HACKS = -D__Itypes -D_WCHAR_T_DEFINED -D__wchar_t
-
-# ================================================================
-# Compilation Settings and Flags
-# ================================================================
-
-# turn on debugging
-debug = 1
-
-# turn on optimization
-optimize = 1
-
-# turn off shared libraries
-shared_libs =
-
-# turn on static libraries
-static_libs = 1
-
-
-# C Compiler
-CC = dcc -tMC68060FS:psos
-# -WDCDCONFIG=psos.conf
-
-# C Debug Compiler Flags
-# -D<name>[=<value>] defines symbol to preprocessor
-# -U<name> undefine preprocessor symbol
-# -I<path> adds a directory path to the include file search path
-# -V[V] display the current version number of D-C++ (this could be
-# useful for crafting a single pSOS config.h file)
-# -W is used to pass arguments to specific tools (compiler, linker, etc),
-# to change which tool is used, etc
-# -o renames the output (we need to do this to avoid colliding with .i files)
-# -X<name | number>[=<value>]gives detailed control of the compiler
-# -Xlint turns on a bunch of useful warning messages
-# -Xno-old-style disables the use of old style C function declarations
-# and narrows the compiler error messages
-# -Xmnem-emb accepts only Motorola Embedded Mnemonics (assembler directive)
-# -Xkeywords=0x04 defines the inline keyword to be valid
-# -Xkill-opt=0x400 turns off the split optimization. Per Jim Terman
-# at DDI, this fixes a known problem
-# -Y changes the default search path for include files and libraries
-# -t<CPU><object format><floating point support>[:<environment>] is used to
-# describe the target board. The object format is F for ELF, E for COFF,
-# or N for GNU/VxWorks. The floating point support is H for hardware
-# support, S for software support, or N for no floating point support
-CFLAGS += -D__DIAB -D__DIAB_42a -Xkill-opt=0x400 -Xno-old-style -Xlint $(PSOSINCL)
-
-# C Compiler Debug Flags (passed iff debug == 1)
-# -# prints subprograms with arguments as they are executed
-# -## prints subprograms with arguments without executing them
-# -### prints subprograms with arguments (in quotes) without executing them
-# -g embeds debug info but turns off a bunch of optimizations, including inlining
-# -g1 embeds debug info but not line numbers, and preserves inlining
-# -v runs the compiler in verbose mode
-# -w suppresses warnings
-# -H prints path names of all include files to stderr
-# -E stops compilation after preprocessing and sends
-# results to stdout
-# -P same as -E except it sends it to the source file specified by the -o flag
-# (IMPORTANT: for ACE, some *other* file name must be specified, as the
-# default behavior for -P without the -o option will overwrite *our*
-# .i (inline) file)
-# -X<name | number>[=<value>]gives detailed control of the compiler
-# -Xlint turns on a bunch of useful warning messages
-# -Xstop-on-warning treats warnings like errors and stops compilation
-# -Xinit-locals[=<mask>] initializes memory pattern for local variables
-# -Xno-optimized-debug turns off optimizations for debugging
-DCFLAGS += -g -w -Ws
-#DCFLAGS += -g -w -Ws -P -o precomp.out
-#DCFLAGS += -g -w -Ws -H
-
-# C Compiler Optimization Flags (passed iff optimize == 1)
-# -O
-# -XO
-# OCFLAGS += -XO
-
-# C++ Compiler
-CXX = dplus -tMC68060FS:psos
-### This (without the above -t option cannot resolve DOBJECT, etc.)
-# CXX = dplus
-
-# C++ Compiler Flags
-# -o renames the output (we need to do this to avoid colliding with .i files)
-# -W is used to pass arguments to specific tools (compiler, linker, etc),
-# to change which tool is used, etc
-# -X<name | number>[=<value>]gives detailed control of the compiler
-# -Xexception enables exception handling
-# -Xno-implicit-templates produces smaller code, but requires explicit
-# template instantiation (see pp 91 of D-C++ user guide)
-# -Xcomdat (per Jim Terman) is the "preferred" way of instantiating templates as of 4.1a (but, there are problems there with Synch_T.cpp and Synch_T.h)
-
-#CCFLAGS += $(CFLAGS) $(DIAB_PSOS_HACKS) -Xno-implicit-templates
-#CCFLAGS += $(CFLAGS) $(DIAB_PSOS_HACKS) -Xno-implicit-templates=3
-#CCFLAGS += $(CFLAGS) $(DIAB_PSOS_HACKS) -Xno-implicit-templates=2
-#CCFLAGS += $(CFLAGS) $(DIAB_PSOS_HACKS) -Xcomdat
-CCFLAGS += $(CFLAGS) $(DIAB_PSOS_HACKS)
-
-# C++ Compiler Debug Flags (passed iff debug == 1)
-DCCFLAGS += $(DCFLAGS)
-
-# Dynamic Linker
-# DLD = dld
-DLD = dplus -tMC68060FS:psos -Wm$(PSS_BSP)/ram.lnk
-
-# Static Linker
-# LD = dld
-LD = dplus -tMC68060FS:psos -Wm$(PSS_BSP)/ram.lnk
-
-# Static Linker Flags
-# -L<path> adds a directory path to the linker search path
-# -l<name> adds a library name to the list the linker uses
-# -f<val> fills in holes in an output section with the given 16 bit pattern
-# -m generates a link map of the input and output sections on stdout
-# -m2 generates a more detailed link map of the input and output sections on stdout
-# -r performs incremental link
-# -r2 add relocation tables, treat unresolved symbols as errors
-# -r3 add relocation tables, treat unresolved symbols as warnings
-# -Xcheck-overlap checks for overlap of output sections and sections that wrap around
-# 32 bit address boundary
-# -Xdont-die forces the linker to continue after errors
-# -Xexpl-instantiations causes linker to write source lines of explicit template
-# instantiations to stdout
-#LDFLAGS += -Xdont-die -Xexpl-instantiations
-#LDFLAGS += -Xdont-die
-#LDFLAGS += -Xdont-die
-#LDFLAGS += -Xdont-die -Xexpl-instantiations
-
-# Additional libraries used by the linker
-LIBS += $(PSOS_LIBS) $(PSS_BSP_LIB)
-#LIBS += $(PSOS_LIBS) $(PSS_BSP_LIB) $(DIAB_LIBS)
-
-# position independent code flag (do we need this ?)
-# PIC = -fpic
-
-# Archive Utility
-AR = dar
-
-# Archive Utility Flags
-# -d[lv] delete the named files from the archive
-# -m[abiv] move the named files
-# -r[abciluv] replace the named files in the archive
-ARFLAGS = -r
-
-RANLIB = echo
-
-# Shared Object Library Stuff (do we need this ?)
-# SOFLAGS = -G $(CPPFLAGS)
-# SOBUILD - compile into .so directly
-# SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-
-# Unidentified Stuff
-# PRELIB = @true
diff --git a/include/makeinclude/platform_psos_diab_ppc.GNU b/include/makeinclude/platform_psos_diab_ppc.GNU
deleted file mode 100644
index 5bfe2b61993..00000000000
--- a/include/makeinclude/platform_psos_diab_ppc.GNU
+++ /dev/null
@@ -1,200 +0,0 @@
-# $Id$
-# pSOS with Diab Data C++ 4.1a Compiler
-
-# ================================================================
-# pSOS sTUFF
-# ================================================================
-
-PSS_LIBC_DIR = $(PSS_ROOT)/sys/libc
-PSS_SYS_DIR = $(PSS_ROOT)/sys/os
-
-# PSOS_LIBS = -L $(PSS_LIBC_DIR) -lprepcH -lcxxsp \
-# -L $(PSS_SYS_DIR) -lsysxx -lsys
-
-PSOS_LIBS = -L $(PSS_LIBC_DIR) -lprepcH -lcxxsp \
- -L $(PSS_SYS_DIR) -lsys
-
-PSS_BSP_LIB = -L $(PSS_BSP) -lbsp
-
-# DIAB_LIBS = -L $(DIABLIB)/MC60FS/psos -lpsos
-
-# DIAB_LIBS = -L $(DIABLIB)/MC60FS -li -lchar -lg -limpl -lram -ld \
-# -L $(DIABLIB)/MC60FS -lcfp -lm -limpfp -lcomplex -lios \
-# -L $(DIABLIB)/MC60FS/psos -lpsos \
-# -L $(PSS_ROOT)/sys/libc -lprepc
-
-# DIAB_LIBS = -L $(DIABLIB)/MC60FS -limpfp \
-# -L $(DIABLIB)/MC60F -limpl \
-# -L $(DIABLIB)/MC60F/psos -lpsos
-
-
-#DIAB_LIBS = -L $(DIABLIB)/MC60F/psos -lc \
-# -L $(PSS_ROOT)/sys/libc -lprepc
-# -L $(DIABLIB)/MC60F -lchar -lg -limpl -lram -ld \
-# -L $(DIABLIB)/MC60FS -lcfp -lm -limpfp -lcomplex -lios -li
-
-PSOSINCL = -I$(PSS_ROOT)/include -I$(PSS_BSP)
-# PSOSINCL = -Y I,$(PSS_ROOT)/include -I$(PSS_BSP)
-
-# hacks to resolve incompatibilities between the compiler and OS headers
-DIAB_PSOS_HACKS = -D__Itypes -D_WCHAR_T_DEFINED -D__wchar_t
-
-# ================================================================
-# Compilation Settings and Flags
-# ================================================================
-
-# turn on debugging
-debug = 1
-
-# turn on optimization
-optimize = 1
-
-# turn off shared libraries
-shared_libs =
-
-# turn on static libraries
-static_libs = 1
-
-
-# C Compiler
-CC = dcc -tPPC860ES:psos
-# -WDCDCONFIG=psos.conf
-
-# C Debug Compiler Flags
-# -D<name>[=<value>] defines symbol to preprocessor
-# -U<name> undefine preprocessor symbol
-# -I<path> adds a directory path to the include file search path
-# -V[V] display the current version number of D-C++ (this could be
-# useful for crafting a single pSOS config.h file)
-# -W is used to pass arguments to specific tools (compiler, linker, etc),
-# to change which tool is used, etc
-# -o renames the output (we need to do this to avoid colliding with .i files)
-# -X<name | number>[=<value>]gives detailed control of the compiler
-# -Xlint turns on a bunch of useful warning messages
-# -Xno-old-style disables the use of old style C function declarations
-# and narrows the compiler error messages
-# -Xmnem-emb accepts only Motorola Embedded Mnemonics (assembler directive)
-# -Xkeywords=0x04 defines the inline keyword to be valid
-# -Xkill-opt=0x400 turns off the split optimization. Per Jim Terman
-# at DDI, this fixes a known problem
-# -Y changes the default search path for include files and libraries
-# -t<CPU><object format><floating point support>[:<environment>] is used to
-# describe the target board. The object format is F for ELF, E for COFF,
-# or N for GNU/VxWorks. The floating point support is H for hardware
-# support, S for software support, or N for no floating point support
-CFLAGS += -D__DIAB -D__DIAB_42a -Xkill-opt=0x400 -Xno-old-style -Xlint $(PSOSINCL)
-
-# C Compiler Debug Flags (passed iff debug == 1)
-# -# prints subprograms with arguments as they are executed
-# -## prints subprograms with arguments without executing them
-# -### prints subprograms with arguments (in quotes) without executing them
-# -g embeds debug info but turns off a bunch of optimizations,
-# including inlining. It may also trigger a known bug in the Diab 4.2b
-# and earlier compilers that results in an internal compiler error
-# about ctmpl_copystm () when compiling certain ACE tests.
-# -g1 embeds debug info but not line numbers, and preserves inlining. It may
-# also trigger the same compiler bugs that -g triggers.
-# -v runs the compiler in verbose mode
-# -w suppresses warnings
-# -H prints path names of all include files to stderr
-# -E stops compilation after preprocessing and sends
-# results to stdout
-# -P same as -E except it sends it to the source file specified by the -o flag
-# (IMPORTANT: for ACE, some *other* file name must be specified, as the
-# default behavior for -P without the -o option will overwrite *our*
-# .i (inline) file)
-# -X<name | number>[=<value>]gives detailed control of the compiler
-# -Xlint turns on a bunch of useful warning messages
-# -Xstop-on-warning treats warnings like errors and stops compilation
-# -Xinit-locals[=<mask>] initializes memory pattern for local variables
-# -Xno-optimized-debug turns off optimizations for debugging
-DCFLAGS += -g -w -Ws
-
-# These cause internal compiler errors for some ACE tests, because of the
-# debug information embedded by the -g and -g1 switches (see above).
-#DCFLAGS += -g1 -w -Ws
-#DCFLAGS += -g -w -Ws
-#DCFLAGS += -g -w -Ws -P -o precomp.out
-#DCFLAGS += -g -w -Ws -H
-
-# C Compiler Optimization Flags (passed iff optimize == 1)
-# -O
-# -XO
-# OCFLAGS += -XO
-
-# C++ Compiler
-CXX = dplus -tPPC860ES:psos
-### This (without the above -t option cannot resolve DOBJECT, etc.)
-# CXX = dplus
-
-# C++ Compiler Flags
-# -o renames the output (we need to do this to avoid colliding with .i files)
-# -W is used to pass arguments to specific tools (compiler, linker, etc),
-# to change which tool is used, etc
-# -X<name | number>[=<value>]gives detailed control of the compiler
-# -Xexception enables exception handling
-# -Xno-implicit-templates produces smaller code, but requires explicit
-# template instantiation (see pp 91 of D-C++ user guide)
-# -Xcomdat (per Jim Terman) is the "preferred" way of instantiating templates as of 4.1a (but, there are problems there with Synch_T.cpp and Synch_T.h)
-
-#CCFLAGS += $(CFLAGS) $(DIAB_PSOS_HACKS) -Xno-implicit-templates
-#CCFLAGS += $(CFLAGS) $(DIAB_PSOS_HACKS) -Xno-implicit-templates=3
-#CCFLAGS += $(CFLAGS) $(DIAB_PSOS_HACKS) -Xno-implicit-templates=2
-#CCFLAGS += $(CFLAGS) $(DIAB_PSOS_HACKS) -Xcomdat
-CCFLAGS += $(CFLAGS) $(DIAB_PSOS_HACKS)
-
-# C++ Compiler Debug Flags (passed iff debug == 1)
-DCCFLAGS += $(DCFLAGS)
-
-# Dynamic Linker
-# DLD = dld
-DLD = dplus -tPPC860ES:psos -Wm $(PSS_BSP)/ram.dld $(PSS_BSP)/anchor.dld
-
-# Static Linker
-# LD = dld
-LD = dplus -tPPC860ES:psos -Wm $(PSS_BSP)/ram.dld $(PSS_BSP)/anchor.dld
-
-# Static Linker Flags
-# -L<path> adds a directory path to the linker search path
-# -l<name> adds a library name to the list the linker uses
-# -f<val> fills in holes in an output section with the given 16 bit pattern
-# -m generates a link map of the input and output sections on stdout
-# -m2 generates a more detailed link map of the input and output sections on stdout
-# -r performs incremental link
-# -r2 add relocation tables, treat unresolved symbols as errors
-# -r3 add relocation tables, treat unresolved symbols as warnings
-# -Xcheck-overlap checks for overlap of output sections and sections that wrap around
-# 32 bit address boundary
-# -Xdont-die forces the linker to continue after errors
-# -Xexpl-instantiations causes linker to write source lines of explicit template
-# instantiations to stdout
-#LDFLAGS += -Xdont-die -Xexpl-instantiations
-#LDFLAGS += -Xdont-die
-#LDFLAGS += -Xdont-die
-#LDFLAGS += -Xdont-die -Xexpl-instantiations
-
-# Additional libraries used by the linker
-LIBS += $(PSOS_LIBS) $(PSS_BSP_LIB)
-#LIBS += $(PSOS_LIBS) $(PSS_BSP_LIB) $(DIAB_LIBS)
-
-# position independent code flag (do we need this ?)
-# PIC = -fpic
-
-# Archive Utility
-AR = dar
-
-# Archive Utility Flags
-# -d[lv] delete the named files from the archive
-# -m[abiv] move the named files
-# -r[abciluv] replace the named files in the archive
-ARFLAGS = -r
-
-RANLIB = echo
-
-# Shared Object Library Stuff (do we need this ?)
-# SOFLAGS = -G $(CPPFLAGS)
-# SOBUILD - compile into .so directly
-# SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-
-# Unidentified Stuff
-# PRELIB = @true
diff --git a/include/makeinclude/platform_psos_tm.GNU b/include/makeinclude/platform_psos_tm.GNU
deleted file mode 100644
index 42a00c54ec1..00000000000
--- a/include/makeinclude/platform_psos_tm.GNU
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id$
-# pSOS with Trimedia compiler
-
-####
-#### Notes:
-####
-#### 1) This file assumes that the PSS_ROOT environment variable is set.
-####
-
-TCS = /net/neptune/neptune/n3/jin
-#TCS = /net/video/video/v0/dtv_stage1/TCS/SunOS
-HOST = tmsim
-ENDIAN = el
-
-PSS_ROOT = $(TCS)/OS/pSOS/pSOSystem
-PSS_SYS_DIR = $(PSS_ROOT)/sys/os
-PSS_SYS_LIBS = $(PSS_SYS_DIR)/psos_tm_$(ENDIAN).o
-
-PSOS_SYSTEM = $(TCS)/OS/pSOS/pSOSystem
-PSOS_DEFS = -DSC_PSOS=YES -DSC_PSOSM=NO -DSC_PNA=NO -D__sparc
-CC = $(TCS)/bin/tmcc -$(ENDIAN) -host $(HOST) $(PSOS_DEFS)
-CXX = $(TCS)/bin/tmCC -$(ENDIAN) -host $(HOST) $(PSOS_DEFS)
-CINCS = -I. -I$(PSOS_SYSTEM)/include
-#-I$(TCS)/include/$(HOST)
-CFLAGS = $(CINCS)
-CCFLAGS = $(CINCS)
-
-AR = $(TCS)/bin/tmar
-ARFLAGS = rcv
-LD = $(TCS)/bin/tmld
-LDFLAGS = -bremoveunusedcode -bcompact -bfoldcode -ldev_g
-
-RANLIB = echo
-
-# -w suppresses warnings
-# -H tells you which header files are being included
-# (switch between these)
-#DCFLAGS += -g
-#DCFLAGS += -g -H
-#DCFLAGS += -g -H -w
-#DCFLAGS += -g -w
-
-LIBS += $(PSS_SYS_LIBS)
-
-#INCLDIRS += -I$(PSS_ROOT)/include -I$(PSS_BSP) -I$(ACE_ROOT)/ace
-
-
diff --git a/include/makeinclude/platform_psosim_g++.GNU b/include/makeinclude/platform_psosim_g++.GNU
deleted file mode 100644
index 3918f3c4122..00000000000
--- a/include/makeinclude/platform_psosim_g++.GNU
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id$
-# PSOSim with GNU g++ 2.7.2
-
-####
-#### Notes:
-####
-#### 1) This file assumes that the PSS_ROOT environment variable is set.
-####
-#### 2) There is a separate Makefile in $(PSS_CFG_DIR) that must be used
-#### to create $(PSS_CFG_DIR)/acepsos.a
-####
-####
-
-CPU_FAMILY = psosim
-CPU = psosim
-CPU_TOOLS = psosim
-BOARD = psosim
-
-PSS_CFG_DIR = $(ACE_ROOT)/psosim
-PSS_SYS_DIR = $(PSS_ROOT)/sys/os
-PSS_SYS_LIBS = $(PSS_SYS_DIR)/prepc.a $(PSS_SYS_DIR)/psos.a $(PSS_SYS_DIR)/pna.a
-PSS_BSP = $(PSS_ROOT)/bsps/psosim
-PSS_BSP_LIB = $(PSS_BSP)/bsp.a
-
-debug = 1
-optimize = 1
-
-CC = gcc
-CXX = g++
-CFLAGS += -W -Wall -Wpointer-arith -pipe #### -Winline
-CCFLAGS += $(CFLAGS) -fno-implicit-templates
-
-# -w suppresses warnings
-# -H tells you which header files are being included
-# (switch between these)
-#DCFLAGS += -g
-#DCFLAGS += -g -H
-#DCFLAGS += -g -H -w
-DCFLAGS += -g -w
-
-DLD = $(CXX)
-LD = $(CXX)
-LDFLAGS += # -z muldefs
-LIBS += $(PSS_SYS_LIBS) $(PSS_BSP_LIB) $(PSS_CFG_DIR)/acepsos.a -lsocket -lnsl -lm
-OCFLAGS += -O2
-#OCFLAGS += -O0
-PIC = -fpic
-AR = ar
-ARFLAGS = rsuv
-RANLIB = @true
-SOFLAGS = -G $(CPPFLAGS)
-# SOBUILD - compile into .so directly
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-PRELIB = @true
-INCLDIRS += -I$(PSS_ROOT)/include -I$(PSS_BSP) -I$(ACE_ROOT)/ace
-
-
diff --git a/include/makeinclude/platform_qnx_neutrino.GNU b/include/makeinclude/platform_qnx_neutrino.GNU
deleted file mode 100644
index 8558118b8d9..00000000000
--- a/include/makeinclude/platform_qnx_neutrino.GNU
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id$
-
-# QNX 4.25 hosted GNU g++ for Neutrino 2.0 Beta
-
-# NOTE: with g++ 2.8.0, you'll need to disable optimization in order to
-# instantiate ACE_Map_Manager (ace/Map_Manager.cpp). The easiest
-# way to do that is to set "optimize = 0", either below or on
-# your make command line.
-
-CROSS-COMPILE = 1
-
-ifeq (,$(debug))
- debug = 1
-endif # ! debug
-ifeq (,$(optimize))
- optimize = 0
-endif # ! optimize
-
-static_libs_only = 1
-
-ACE_HAS_GNUG_PRE_2_8 := 0
-
-CC = i386-nto-gcc
-CXX = i386-nto-g++
-CFLAGS += -pipe -W -Wall -Wpointer-arith -Winline
-CCFLAGS += $(CFLAGS) -fno-implicit-templates
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-LDFLAGS +=
-LIBS += -lsocket -lstdc++
-OCFLAGS += -O2
-PIC = -fPIC
-AR = i386-nto-ar
-ARFLAGS = ruv
-RANLIB = i386-nto-ranlib
-SOFLAGS = -G $(CPPFLAGS) -shared
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-PRELIB = @true
diff --git a/include/makeinclude/platform_sco-nothread.GNU b/include/makeinclude/platform_sco-nothread.GNU
deleted file mode 100644
index efbdad9bd02..00000000000
--- a/include/makeinclude/platform_sco-nothread.GNU
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id$
-
-debug = 1
-optimize = 1
-
-CC = gcc
-CXX = g++
-CFLAGS += -w
-CCFLAGS += $(CFLAGS) -fno-implicit-templates -fno-strict-prototypes
-DCFLAGS += -g #### should this be -gstabs?
-DLD = $(CXX)
-LD = $(CXX)
-LIBS = -lsocket
-OCFLAGS = -O2
-PIC =
-AR = ar
-ARFLAGS = ruv
-RANLIB = /bin/true
-
-SOFLAGS = $(CPPFLAGS)
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-PRELIB = @true
diff --git a/include/makeinclude/platform_sco5.0.0-CC-fsu-pthread.GNU b/include/makeinclude/platform_sco5.0.0-CC-fsu-pthread.GNU
deleted file mode 100644
index b516ca8228d..00000000000
--- a/include/makeinclude/platform_sco5.0.0-CC-fsu-pthread.GNU
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-
-# Requires FSU pthreads and gcc 2.7.2 Skunkware 97
-# to produce libACE.so correctly changed the specs file for gcc 2.7.2
-# for not link -lc and -lgcc and other not shared libraries
-
-debug = 1
-optimize = 1
-
-CC = cc
-# for threads
-# for no threads
-#CXX = gcc -fno-implicit-templates -w -fno-strict-prototypes
-# LDFLAGS += -L $(ACE_ROOT)/ace -L ./ ${FSU_PTHREADS_DIR}/init/init.o # -z muldefs
-# LDLIBS += -L $(ACE_ROOT)/ace -L ./ ${FSU_PTHREADS_DIR}/init/init.o -lACE # -z muldefs
-LDLIBS += -L $(ACE_ROOT)/ace # -z muldefs
-CXX = CC
-CFLAGS += -belf
-CCFLAGS += +.cpp +d -Dvolatile= -belf -Kpic -pts -I ${FSU_PTHREADS_DIR}/include
-DCFLAGS += -g
-DCCFLAGS += $(DCFLAGS)
-DLD = $(CXX)
-LD = $(CXX) /usr/lib/libc.so.1
-#LD = $(CXX)
-LIBS = -lm -L${FSU_PTHREADS_DIR}/lib -lgthreads -lnsl -lsocket -lgthreads
-OCFLAGS += -O2
-OCCFLAGS += $(OCFLAGS)
-PIC = -fPIC
-AR = ar
-ARFLAGS = ruv
-RANLIB = /bin/true
-
-SOFLAGS = $(CPPFLAGS) -melf -fPIC -G
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-# SOLINK = $(SOLINK.cc) -o $@ $(LDFLAGS) $<
-PRELIB = @true
diff --git a/include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU b/include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU
deleted file mode 100644
index 4eba0aa5e00..00000000000
--- a/include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id$
-#
-# Note 1: the above file from ACE 4.6 has been modified by Mike P. to get
-# rid of thread related stuff until we can obtain fsu-threads library.
-#
-# Note 2: You must setup FSU_PTHREADS_DIR environment var to your FSU
-# pthreads directory.
-
-# Requires gcc 2.7.2 Skunkware 97
-# to produce libACE.so correctly changed the specs file for gcc 2.7.2
-# for not link -lc and -lgcc and other not shared libraries
-
-debug = 0
-optimize = 1
-
-CC = gcc
-# for no threads
-LDLIBS += -lm -L $(ACE_ROOT)/ace
-CXX = g++
-CFLAGS += -melf -m386 -w
-CCFLAGS += -melf -m386
-ifneq ($(FSU_PTHREADS_DIR),"")
-CCFLAGS += -I$(FSU_PTHREADS_DIR)/include
-endif
-# -g option not supported for C++ on systems using the DWARF debugging format
-DCFLAGS += -g
-DCCFLAGS += $(DCFLAGS)
-DLD = $(CXX)
-LD = $(CXX) /usr/lib/libc.so.1
-ifneq ($(FSU_PTHREADS_DIR),"")
-LIBS += -L$(FSU_PTHREADS_DIR)/lib
-endif
-LIBS += -lgthreads
-LIBS += -lnsl -lsocket
-LIBS += -lgthreads
-OCFLAGS += -O2
-OCCFLAGS += $(OCFLAGS)
-PIC = -fpic
-AR = ar
-ARFLAGS = ruv
-RANLIB = /bin/true
-
-SOFLAGS =
-SOLINK = gcc $(PIC) -melf -shared
-SOBUILD = $(SOLINK) -o $(VSHDIR)$*.so $<
-PRELIB = @true
diff --git a/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU b/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU
deleted file mode 100644
index f43397bf5ed..00000000000
--- a/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-
-# Requires MIT pthreads and gcc 2.7.2 installed in /usr/progressive
-# to produce libACE.so correctly changed the specs file for gcc 2.7.2
-# for not link -lc and -lgcc and other not shared libraries
-
-debug = 1
-optimize = 1
-
-CC = gcc
-# for threads
-# for no threads
-#CXX = gcc -fno-implicit-templates -w -fno-strict-prototypes
-# LDFLAGS += -L $(ACE_ROOT)/ace -L ./ ${MIT_PTHREADS_DIR}/init/init.o # -z muldefs
-# LDLIBS += -L $(ACE_ROOT)/ace -L ./ ${MIT_PTHREADS_DIR}/init/init.o -lACE # -z muldefs
-LDLIBS += -L $(ACE_ROOT)/ace -L ./ -lACE # -z muldefs
-CXX = g++
-CFLAGS += -melf -w
-CCFLAGS += -melf -fPIC -Xpg4plus -fno-implicit-templates -I ${MIT_PTHREADS_DIR}/include -I /usr/progressive/lib/g++-include
-DCFLAGS += -gstabs
-DCCFLAGS += $(DCFLAGS)
-DLD = $(CXX)
-LD = $(CXX)
-LIBS = -L${MIT_PTHREADS_DIR} -lnsl -lpthread
-OCFLAGS += -O2
-OCCFLAGS += $(OCFLAGS)
-PIC = -fPIC
-AR = ar
-ARFLAGS = ruv
-RANLIB = /bin/true
-
-SOFLAGS = $(CPPFLAGS) -melf -fPIC -G
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-# SOLINK = $(SOLINK.cc) -o $@ $(LDFLAGS) $<
-PRELIB = @true
diff --git a/include/makeinclude/platform_sco5.0.0-nothread.GNU b/include/makeinclude/platform_sco5.0.0-nothread.GNU
deleted file mode 100644
index 6267de6e682..00000000000
--- a/include/makeinclude/platform_sco5.0.0-nothread.GNU
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-#
-# NOTE: the above file from ACE 4.6 has been modified by Mike P. to get rid of
-# thread related stuff until we can obtain fsu-threads library.
-
-# Requires gcc 2.7.2 Skunkware 97
-# to produce libACE.so correctly changed the specs file for gcc 2.7.2
-# for not link -lc and -lgcc and other not shared libraries
-
-debug = 1
-optimize = 1
-
-CC = gcc
-# for no threads
-LDLIBS += -lm -L $(ACE_ROOT)/ace
-CXX = g++
-CFLAGS += -melf -w
-CCFLAGS += -melf -fno-implicit-templates
-# -g option not supported for C++ on systems using the DWARF debugging format
-#DCFLAGS += -g
-DCCFLAGS += $(DCFLAGS)
-DLD = $(CXX)
-LD = $(CXX) /usr/lib/libc.so.1
-LIBS = -lnsl -lsocket
-OCCFLAGS += $(OCFLAGS)
-PIC = -fPIC
-AR = ar
-ARFLAGS = ruv
-RANLIB = /bin/true
-
-SOFLAGS = $(CPPFLAGS) -melf -fPIC -G
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-PRELIB = @true
diff --git a/include/makeinclude/platform_sunos4_g++.GNU b/include/makeinclude/platform_sunos4_g++.GNU
deleted file mode 100644
index 35c3f8f61b9..00000000000
--- a/include/makeinclude/platform_sunos4_g++.GNU
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id$
-
-# SunOS 4.x (Solaris 1.x) with g++ *not* using Orbix
-
-debug = 1
-optimize = 1
-
-CC = gcc
-CXX = g++
-CFLAGS += -fno-strict-prototypes
-CCFLAGS += $(CFLAGS) -fno-implicit-templates
-DCFLAGS += -g
-DLD = /bin/ld
-LD = $(CXX)
-#
-# for G++ v2.6.0
-OCFLAGS += -O2
-PIC = -fpic
-AR = ar
-ARFLAGS = ruv
-RANLIB = ranlib
-SOFLAGS = -assert pure-text
-# SOBUILD - compile into .so directly
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-# SOLINK = $(SOLINK.cc) -o $@ $(LDFLAGS) $<
-PRELIB = @true
diff --git a/include/makeinclude/platform_sunos4_lucid.GNU b/include/makeinclude/platform_sunos4_lucid.GNU
deleted file mode 100644
index a6efedcf796..00000000000
--- a/include/makeinclude/platform_sunos4_lucid.GNU
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id$
-
-# SunOS 4.x (Solaris 1.x) with Lucid
-
-debug = 1
-
-CC = lcc
-CXX = lcc
-CFLAGS = -Xa # use ANSI c complier
-CCFLAGS = -XF -Xpt- # use c++ ARM compiler with auto templates turned off
-DCFLAGS += -g
-DCCFLAGS += $(DCFLAGS)
-DLD = /bin/ld
-LD = $(CXX)
-LIBS +=
-PIC = -pic
-ARFLAGS = ruv
-RANLIB = ranlib
-SOFLAGS = -assert pure-text
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
diff --git a/include/makeinclude/platform_sunos4_sunc++3.x.GNU b/include/makeinclude/platform_sunos4_sunc++3.x.GNU
deleted file mode 100644
index a00eb562e11..00000000000
--- a/include/makeinclude/platform_sunos4_sunc++3.x.GNU
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id$
-
-# SunOS 4.x (Solaris 1.x) with SunC++ 3.x (note that this is a very old C++
-# compiler, based on cfront. In paricular, it's not the same thing as
-# SunC++ 4.x (which is also known as SPARCWorks 3.x).
-
-debug = 1
-
-CC = cc
-CXX = CC
-CCFLAGS += $(CFLAGS)
-DCFLAGS += -g
-DLD = /bin/ld
-LD = $(CXX)
-LIBS +=
-PIC = -pic
-AR = ar
-ARFLAGS = ruv
-RANLIB = ranlib
-SOFLAGS = -assert pure-text
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- $(RM) -rf $(VSHDIR)pt$*; mkdir $(VSHDIR)pt$*; \
- YYZ="`$(CXX) $(CCFLAGS) $(CPPFLAGS) \
- -ptr$(VSHDIR)pt$* -ptr./ptrepository $<`"; \
- $(RM) -rf a.out; \
- YYZ="`echo $(VSHDIR)pt$*/*.o`"; \
- $(SOLINK.cc) -o $@ ./$(VSHDIR)$*.o $(YYZ)
diff --git a/include/makeinclude/platform_sunos4_sunc++4.x.GNU b/include/makeinclude/platform_sunos4_sunc++4.x.GNU
deleted file mode 100644
index b122a76859f..00000000000
--- a/include/makeinclude/platform_sunos4_sunc++4.x.GNU
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id$
-
-# SunOS 4.x (Solaris 1.x) with SunC++ 4.x
-
-debug = 1
-
-CC = cc
-CXX = CC
-CCFLAGS += $(CFLAGS)
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-LIBS +=
-LDFLAGS += $(PIC)
-AR = CC
-ARFLAGS = -xar -o
-PIC = -PIC
-RANLIB = ranlib
-SOFLAGS = -G $(CPPFLAGS)
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- $(SOLINK.cc) $(PIC) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
-
-#### Create template repository to avoid compiler warning.
-TEMPLATE_REPOSITORY = Templates.DB
diff --git a/include/makeinclude/platform_sunos4_sunc++4.x_orbix.GNU b/include/makeinclude/platform_sunos4_sunc++4.x_orbix.GNU
deleted file mode 100644
index fec612a3113..00000000000
--- a/include/makeinclude/platform_sunos4_sunc++4.x_orbix.GNU
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id$
-
-# SunOS 4.x (Solaris 1.x) with SunC++ 4.x and Orbix.
-
-debug = 1
-
-CC = cc
-CXX = CC
-CCFLAGS += $(CFLAGS)
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-LIBS +=
-INCLDIRS = -I$(ORBIX_ROOT)/include
-AR = CC
-LDFLAGS += -L$(ORBIX_ROOT)/lib
-ARFLAGS = -xar -o
-PIC = -pic
-RANLIB = ranlib
-SOFLAGS = -G $(CPPFLAGS)
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
-
-#### Create template repository to avoid compiler warning.
-TEMPLATE_REPOSITORY = Templates.DB
diff --git a/include/makeinclude/platform_sunos5.6_sparc_sunc++_4.2.GNU b/include/makeinclude/platform_sunos5.6_sparc_sunc++_4.2.GNU
deleted file mode 100644
index a4241e53d48..00000000000
--- a/include/makeinclude/platform_sunos5.6_sparc_sunc++_4.2.GNU
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-
-include $(ACE_ROOT)/include/makeinclude/platform_sunos5_sunc++.GNU
diff --git a/include/makeinclude/platform_sunos5_centerline.GNU b/include/makeinclude/platform_sunos5_centerline.GNU
deleted file mode 100644
index 0d8cc04c666..00000000000
--- a/include/makeinclude/platform_sunos5_centerline.GNU
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id$
-
-# SunOS 5.x (Solaris 2.x) with Centerline C++
-
-debug = 1
-
-CC = cc
-CXX = CC
-CFLAGS += -mt
-CCFLAGS += $(CFLAGS)
-DCFLAGS += -g
-DLD = $(CXX) -mt
-LD = $(CXX) -mt
-LIBS += -lsocket -ldl -lnsl -lgen
-PIC = -PIC
-#AR = CC
-#ARFLAGS = -xar -o
-ARFLAGS = ruv
-RANLIB = echo
-SOFLAGS = -G $(CPPFLAGS) $(PTDIRS)
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- $(SOLINK.cc) $(PIC) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
diff --git a/include/makeinclude/platform_sunos5_centerline_orbix.GNU b/include/makeinclude/platform_sunos5_centerline_orbix.GNU
deleted file mode 100644
index 7265e806673..00000000000
--- a/include/makeinclude/platform_sunos5_centerline_orbix.GNU
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id$
-
-# SunOS 5.x (Solaris 2.x) with Centerline C++
-
-debug = 1
-
-CC = cc
-CXX = CC
-CFLAGS += -mt
-CCFLAGS += $(CFLAGS)
-DCFLAGS += -g
-DLD = $(CXX) -mt
-LD = $(CXX) -mt
-INCLDIRS = -I$(ORBIX_ROOT)/include
-LDFLAGS += -L$(ORBIX_ROOT)/lib
-LIBS += -lITsrv -lsocket -ldl -lnsl -lgen
-PIC = -PIC
-AR = CC
-ARFLAGS = -xar -o
-RANLIB = echo
-SOFLAGS = -G $(CPPFLAGS) $(PTDIRS)
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- $(SOLINK.cc) $(PIC) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
diff --git a/include/makeinclude/platform_sunos5_egcs.GNU b/include/makeinclude/platform_sunos5_egcs.GNU
deleted file mode 100644
index c4db24633d4..00000000000
--- a/include/makeinclude/platform_sunos5_egcs.GNU
+++ /dev/null
@@ -1,13 +0,0 @@
-# $Id$
-
-# SunOS 5.x (Solaris 2.x) with egcs
-# Use the g++ platform file, with any overrides following its include.
-
-include $(ACE_ROOT)/include/makeinclude/platform_sunos5_g++.GNU
-
-# This is recommeded by Cygnus in their egcs-1.0 Caveats page.
-# http://egcs.cygnus.com/caveats.html
-CFLAGS += -Wno-return-type
-
-#### Uncomment the following line to use shared libstdc++.so, etc.
-#### SOFLAGS = -shared $(CPPFLAGS)
diff --git a/include/makeinclude/platform_sunos5_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU
deleted file mode 100644
index 6193bbe8885..00000000000
--- a/include/makeinclude/platform_sunos5_g++.GNU
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-
-# SunOS 5.x (Solaris 2.x) with g++ *not* using Orbix
-
-# NOTE: with g++ 2.8.0, you'll need to disable optimization in order to
-# instantiate ACE_Map_Manager (ace/Map_Manager.cpp). The easiest
-# way to do that is to set "optimize = 0", either below or on
-# your make command line.
-
-# NOTE: On Solaris86, you'll need to use GNU as instead of /usr/ccs/bin/as,
-# if you want -gstabs+ and -pipe support.
-
-ifeq (,$(debug))
- debug = 1
-endif
-ifeq (,$(optimize))
- optimize = 1
-endif
-ifeq (,$(threads))
- threads = 1
-endif
-
-ifeq ($(threads),0)
- CFLAGS += -DACE_MT_SAFE=0
-endif # threads
-
-ifeq ($(shell /bin/uname -m),i86pc)
- #### gcc on Solaris86 doesn't use -g
- DCFLAGS += -gstabs+
-else # ! i86pc
- DCFLAGS += -g
-endif # ! i86pc
-
-CC = gcc
-CXX = g++
-CFLAGS += -W -Wall -Wpointer-arith -pipe #### -Winline
-CCFLAGS += $(CFLAGS) -fno-implicit-templates
-DLD = $(CXX)
-LD = $(CXX)
-LDFLAGS +=
-LIBS += -lsocket -ldl -lgen -lnsl -lposix4 -lthread
-OCFLAGS += -O2
-PIC = -fPIC
-AR = ar
-ARFLAGS = ruv
-RANLIB = @true
-SOFLAGS = -G $(CPPFLAGS)
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-PRELIB = @true
diff --git a/include/makeinclude/platform_sunos5_ghs.GNU b/include/makeinclude/platform_sunos5_ghs.GNU
deleted file mode 100644
index 8d285c0d54c..00000000000
--- a/include/makeinclude/platform_sunos5_ghs.GNU
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id$
-
-# SunOS 5.x (Solaris 2.x) with GreenHills compiler.
-
-debug = 1
-exceptions =
-optimize = 1
-threads = 1
-
-CC = gcx
-CXX = $(CC)
-CCFLAGS += $(CFLAGS) --no_rtti -tnone
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-LDFLAGS = --no_auto_instantiation
-LIBS += -lsocket -ldl -lgen -lnsl -lposix4
-OCFLAGS += -OL -OM
-PIC = -PIC
-RANLIB = @true
-AR = $(CC) $(LDFLAGS)
-ARFLAGS = -archive -o
-RANLIB = @true
-SOFLAGS = -shared
-
-ifeq ($(threads),1)
- #### Don't use g7 register with threading.
- CFLAGS += -Xleaveg7
- LIBS += -lthread
-else # ! threads
- CFLAGS += -DACE_MT_SAFE=0
-endif # ! threads
-
-ifdef exceptions
- CCFLAGS += --exceptions
-else # ! exceptions
- CCFLAGS += --no_exceptions
-endif # ! exceptions
diff --git a/include/makeinclude/platform_sunos5_kcc.GNU b/include/makeinclude/platform_sunos5_kcc.GNU
deleted file mode 100644
index 65c66bfd88f..00000000000
--- a/include/makeinclude/platform_sunos5_kcc.GNU
+++ /dev/null
@@ -1,74 +0,0 @@
-# $Id$ -*- Makefile -*-
-
-# SunOS 5.x (Solaris 2.x) with KAI C++ 3.3e, *not* using Orbix.
-#
-
-debug = 1
-distrib = 0
-threads = 1
-
-ifeq ($(threads),1)
- CFLAGS += --thread_safe
- LDFLAGS += --thread_safe
-endif # threads
-
-CC = KCC
-CXX = KCC
-
-DCFLAGS += -g
-DLD = $(CXX)
-
-ifneq ($exceptions,0)
- CCFLAGS += --exceptions
-endif # ! exceptions
-
-LD = $(CXX)
-
-LIBS += -lsocket -ldl -lnsl -lgen -lposix4
-
-CPPFLAGS += $(CFLAGS)
-OCFLAGS += -K2
-PIC = -KPIC
-AR = ar
-ARFLAGS = -xar -o
-RANLIB = echo
-SOFLAGS = -G $(CPPFLAGS)
-
-#### Create template repository to avoid compiler warning.
-TEMPLATE_REPOSITORY = Templates.DB
-
-ifdef BIN
- #### Builds .shobj/$*.o file, then .shobj/$*.so file. The .o files
- #### are used for building libraries and executables. But, it seems
- #### to be necessary to build the .so files (with -G) in order to get
- #### all template instantiations.
- SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- $(SOLINK.cc) -o $@ -h $@ $(LDFLAGS) $(VSHDIR)$*.o
-else
- #### Optimize builds when no executables are built in the current
- #### directory. Only a library is being created, and -G is used
- #### in that step. Therefore, all templates instantations are
- #### included in the library. This optimization saves almost 11 Mb
- #### (2.6 percent) and 27 minutes (22 percent) on the entire ACE
- #### build on a 168 MHz Sun Ultra2.
- ####
- #### Sun C++ won't allow the output from a compile to be named with
- #### a .so extension. Rather than muck with the ACE build rules and
- #### risk upsetting builds on other platforms, just ln the output
- #### after building it.
- SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
- /bin/ln $(VSHDIR)$*.o $@
-endif # BIN
-
-#### The following macro overrides enable creation of fast executables.
-#### They _don't_ support fast compilation :-)
-#### To use, add fast=1 to your "make" invocation.
-####
-#### -g is incompatible with -fast. If you need -g, you can
-#### use "-fast -O3".
-####
-ifdef fast
- CFLAGS += -fast +K3
- DCFLAGS =
- LDFLAGS += -fast +K3
-endif # fast
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
deleted file mode 100644
index 166b6a09f1e..00000000000
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ /dev/null
@@ -1,174 +0,0 @@
-# $Id$
-
-# SunOS 5.x (Solaris 2.x) with Sun C++ 4.2 and 5.x, *not* using Orbix.
-#
-# NOTE: Sun C++ 5.0 users might need to add this to their CCFLAGS:
-# -compat=4 and/or remove -instances=explicit. Please note that
-# inlining is disabled by default with Sun C++ 5.0. If you'd like
-# to try enabling it, comment out the "inline = 0" line below.
-#
-# To enable compilation of 64-bit binaries with Sun CC 5.0, a
-# platform_macros.GNU file such as this can be used:
-# fast=1
-# include $(ACE_ROOT)/include/makeinclude/platform_sunos5_sunc++.GNU
-# CCFLAGS += -xtarget=ultra2 -xarch=v9a #### CPU specific!
-# Please note that the xtarget and xarch settings are specific to
-# the target CPU.
-#
-# With slight modification, this file could be used with Sun C++ 4.1.
-# However, it's likely that you won't be able to build all of ACE
-# with Sun C++ 4.1.
-#
-# NOTE: some ACE files might generate this warning:
-# "Warning: Could not find source for " one of the following:
-# default constructor, copy constructor, destructor, or assignment
-# operator. It appears that with +w, Sun C++ 4.x issues this warning
-# whenever it has to generate one of these functions (because it wasn't
-# defined by the user). This isn't really a problem.
-# This warning appears to be fixed by Sun C++ 4.2 jumbo patch 104631-02.
-#
-# -pta instantiates all template members, which makes libraries bigger.
-# But, it's supposed to put each member into it's own .o, so executable
-# size should not be penalized. We don't use it because it's not
-# necessary with automatic template instantiation.
-
-ifeq (,$(debug))
- debug = 1
-endif
-ifeq (,$(distrib))
- distrib = 0
-endif
-ifeq (,$(threads))
- threads = 1
-endif
-
-tk_reactor = 0
-ace_with_x11 = 0
-
-PLATFORM_TK_CPPFLAGS=
-PLATFORM_TK_LIBS=-ltk -ltcl
-PLATFORM_TK_LDFLAGS=
-
-PLATFORM_X11_CPPFLAGS=
-PLATFORM_X11_LIBS =-lX11
-PLATFORM_X11_LDFLAGS=
-
-ifeq ($(threads),1)
- CFLAGS += -mt
- LDFLAGS += -mt
-endif # threads
-
-CC = cc
-CXX = CC
-
-CC_VERSION = $(shell CC -V 2>&1)
-
-ifeq (Compilers 4.2,$(findstring Compilers 4.2,$(CC_VERSION)))
- #### CC 4.2, only, supports -features=castop
- CCFLAGS += $(CFLAGS) -features=castop
-
- #### RTTI can coexist with ACE, but it doesn't use it. To enable,
- #### add rtti=1 to your make invocation. Sun C++ 4.2, only, supports
- #### this option.
- ifdef rtti
- CCFLAGS += -features=rtti
- else # ! rtti
- #### ACE_LACKS_RTTI is necessary with -features=castop, but
- #### without -features=rtti, to convert dynamic_cast to static_cast.
- CCFLAGS += -DACE_LACKS_RTTI
- endif # ! rtti
-
- #### Create template repository to avoid compiler warning.
- TEMPLATE_REPOSITORY = Templates.DB
-else # ! 4.2
-ifeq (Compilers 5,$(findstring Compilers 5,$(CC_VERSION)))
- #### CC 5.0 or later
- #### Inlining appears to cause link problems with early releases of
- #### CC 5.0.
- inline = 0
- #### Support RTTI by default. And, use explicit template instantiation
- #### because automatic instantiation appears to be broken, at least
- #### with early releases of CC 5.0. And, use old iostreams.
- CCFLAGS += $(CFLAGS) -library=iostream,no%Cstd -instances=explicit
-endif # CC 5.0 or later
-endif # ! 4.2
-
-DCFLAGS += -g
-DLD = $(CXX)
-
-
-#### Exception handling breaks on MP machines prior to Sun C++ 4.2
-#### with jumbo patch 104631-02, see ace/config-sunos5.5.h.
-#### If you are using a version of Sun C++ prior to 4,2, or haven't
-#### applied that jumbo patch to your 4.2, or don't want to pay the
-#### performance penalty of exception handling, then use the default
-#### of no exceptions. If you want to enable exception handling,
-#### add "exceptions=1" to your "make" invocation.
-ifndef exceptions
- CCFLAGS += -noex
-endif # ! exceptions
-
-LD = $(CXX)
-
-ifdef orbix
- LDFLAGS += $(PIC) -L$(ORBIX_ROOT)/corba2/lib \
- -R $(ACE_ROOT)/ace -R./ -R $(ORBIX_ROOT)/corba2/lib
-ifeq ($(mt_orbix),1)
- LIBS += -lITinimt -liiopmt -lorbixmt -lthread
-else
- LIBS += -lITini -liiop -lorbix
-endif
-
- LIBS += -lsocket -ldl -lnsl -lgen -lposix4
- CPPFLAGS += -I$(ORBIX_ROOT)/corba2/include
-else
-ifeq ($(distrib),0)
- LDFLAGS += -R $(ACE_ROOT)/ace -R./
-endif
- LIBS += -lsocket -ldl -lnsl -lgen -lposix4
-endif # orbix
-
-LDFLAGS += -xildoff
-
-OCFLAGS += -O
-PIC = -PIC
-AR = CC
-ARFLAGS = -xar -o
-RANLIB = echo
-SOFLAGS = -G $(CPPFLAGS)
-
-ifdef BIN
- #### Builds .shobj/$*.o file, then .shobj/$*.so file. The .o files
- #### are used for building libraries and executables. But, it seems
- #### to be necessary to build the .so files (with -G) in order to get
- #### all template instantiations.
- SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- $(SOLINK.cc) -o $@ -h $@ $(LDFLAGS) $(VSHDIR)$*.o
-else
- #### Optimize builds when no executables are built in the current
- #### directory. Only a library is being created, and -G is used
- #### in that step. Therefore, all templates instantations are
- #### included in the library. This optimization saves almost 11 Mb
- #### (2.6 percent) and 27 minutes (22 percent) on the entire ACE
- #### build on a 168 MHz Sun Ultra2.
- ####
- #### Sun C++ won't allow the output from a compile to be named with
- #### a .so extension. Rather than muck with the ACE build rules and
- #### risk upsetting builds on other platforms, just ln the output
- #### after building it.
- SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
- /bin/ln $(VSHDIR)$*.o $@
-endif # BIN
-
-#### The following macro overrides enable creation of fast executables.
-#### They _don't_ support fast compilation :-)
-#### To use, add fast=1 to your "make" invocation.
-####
-#### -g is incompatible with -fast. If you need -g, you can
-#### use "-fast -O3".
-####
-ifdef fast
- CFLAGS += -fast
- DCFLAGS =
- LDFLAGS += -fast
-endif # fast
diff --git a/include/makeinclude/platform_sunos5_sunc++_orbix.GNU b/include/makeinclude/platform_sunos5_sunc++_orbix.GNU
deleted file mode 100644
index 001576f06f1..00000000000
--- a/include/makeinclude/platform_sunos5_sunc++_orbix.GNU
+++ /dev/null
@@ -1,7 +0,0 @@
-# $Id$
-
-orbix=1
-mt_orbix=1
-exceptions=1
-
-include $(ACE_ROOT)/include/makeinclude/platform_sunos5_sunc++.GNU
diff --git a/include/makeinclude/platform_tandem.GNU b/include/makeinclude/platform_tandem.GNU
deleted file mode 100644
index 294525c4e82..00000000000
--- a/include/makeinclude/platform_tandem.GNU
+++ /dev/null
@@ -1,93 +0,0 @@
-# $Id$
-
-# NonStop-UX NCC 3.20
-
-debug = 1
-
-# Please see the config-NonS... file for more information about status
-# This file is built from Sunos5(os) and sgic++(compiler)
-
-CC = cc
-CXX = NCC
-DLD = $(CXX)
-LD = $(CXX)
-CPPFLAGS += -no_exceptions
-CPPFLAGS += -I/usr/include3.18
-CPPFLAGS += -D_REENTRANT
-#CPPFLAGS += -ptused -prelink
-CPPFLAGS += -pta
-#CPPFLAGS += +pp
-#CPPFLAGS += -show
-#-D_SGI_MP_SOURCE
-#3106 nested comment is not allowed
-#3203 statement is unreachable
-#3252 argument of type "X" is incompatible with parameter of type "Y"
-#3262 Parameter "X" declared and never referenced
-#3611 a value of "X" cannot be assigned to an entity of type "Y"
-#3140 macro redefined differently (param redefines NULL)
-
-CPPFLAGS += -woff 3106,3203,3262
-#CPPFLAGS += -woff 3106,3203,3262,3611,3252
-#CPPFLAGS += -woff 3106,3203,3212,3252,3262,3611
-
-# For the new 32 bit C++ compiler (-n32)
-#CPPFLAGS += -n32 -woff 1174,1209,1375,1506,1110,1552,1021,1171
-# For the old C++ compiler (-32)
-#CPPFLAGS += +pp
-LDFLAGS += -rpath "$(ACE_ROOT)/ace"
-#LDFLAGS += -Wl,-woff,85
-LIBS += -lsocket
-LIBS += -ldl
-LIBS += -lnsl
-LIBS += -lgen
-LIBS += -lthread
-PIC = -KPIC
-AR = ar
-ARFLAGS = r
-RANLIB = echo
-SOFLAGS = -shared $(CPPFLAGS) -all
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
-
-#3106 nested comment is not allowed
-#3203 statement is unreachable
-#3252 argument of type "X" is incompatible with parameter of type "Y"
-#3262 Parameter declared and never referenced
-#3611 a value of "X" cannot be assigned to an entity of type "Y"
-#WARNOFF += -woff 3106,3203,3262,3611
-#INCDIR += -I/usr/include -I/usr/include3.18
-# -I /usr/ucbinclude
-#### No threads
-#CCFLAGS += -no_exceptions -pta $(WARNOFF) $(INCDIR)
-#### Threads
-#CCFLAGS += -D_REENTRANT -no_exceptions -pta $(WARNOFF)
-
-#DLD = $(CXX)
-#LD = $(CXX)
-#LDFLAGS += -R $(ACE_ROOT)/ace
-#LIBS += -lsocket -ldl -lnsl -lgen -lthread # Threads
-#LIBS += -lsocket -ldl -lnsl -lgen # No threads
-#PIC = -PIC
-# SUNC++ 4.1 has a bug with the -xar command:
-#
-# from 'CC -readme' the following bug is reported:
-#
-# 4. Using -xar to add generated templates
-# ----------------------------------------
-#
-# When using -xar to add generated templates to an archive,
-# please be aware that this command will both update
-# existing object files in the archive, and add new ones.
-# Existing object files that may be obsolete will still
-# be present. In these cases, the safest course of action
-# would be to delete the .a file prior to the invocation of -xar.
-#
-# so here we remove the archive prior to making the new one
-#
-#AR = CC
-#ARFLAGS = -xar -o
-#RANLIB = echo
-#SOFLAGS = -G $(CPPFLAGS)
-#SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
- $(SOLINK.cc) -o $@ -h $@ $(LDFLAGS) $(VSHDIR)$*.o
-
diff --git a/include/makeinclude/platform_tru64_cxx.GNU b/include/makeinclude/platform_tru64_cxx.GNU
deleted file mode 100644
index fd31859ee28..00000000000
--- a/include/makeinclude/platform_tru64_cxx.GNU
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id$
-
-# This platform macros file is intended to work with
-# Digital UNIX using the cxx compiler.
-
-ifndef ACE_DU_VERSION
- ACE_DU_VERSION := $(shell uname -r)
-endif # ! ACE_DU_VERSION
-
-ifeq (3.,$(findstring 3.,$(ACE_DU_VERSION)))
- include $(ACE_ROOT)/include/makeinclude/platform_osf1_3.2.GNU
-
-else # ! 3.x
-ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
- include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU
-
- ifndef ACE_DU_SUBVERSION
- ACE_DU_SUBVERSION := $(shell /usr/sbin/sizer v-)
- endif # ! ACE_DU_SUBVERSION
-
- ifeq (4.0F,$(findstring 4.0F,$(ACE_DU_SUBVERSION)))
- CFLAGS += -DDIGITAL_UNIX=0x40F
- else
- ifeq (4.0E,$(findstring 4.0E,$(ACE_DU_SUBVERSION)))
- CFLAGS += -DDIGITAL_UNIX=0x40E
- else
- ifeq (4.0D,$(findstring 4.0D,$(ACE_DU_SUBVERSION)))
- CFLAGS += -DDIGITAL_UNIX=0x40D
- else
- CFLAGS += -DDIGITAL_UNIX=0x400
- endif
- endif
- endif
-
- ifneq ($(CXX_VER),CXX_5)
- # 9: nested comment not allowed. But there's one in /usr/include/pdsc.h!
- WARNING_FLAGS += -msg_disable 9
- endif # 6.0 or later
-
-else # ! 4.x
-ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION)))
- include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU
- CFLAGS += -DDIGITAL_UNIX=0x500
- SOFLAGS = -shared -use_ld_input $(ACELIB)
-
-endif # 5.x
-endif # ! 4.x
-endif # ! 3.x
diff --git a/include/makeinclude/platform_tru64_g++.GNU b/include/makeinclude/platform_tru64_g++.GNU
deleted file mode 100644
index ef5fea64d5c..00000000000
--- a/include/makeinclude/platform_tru64_g++.GNU
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id$
-
-# This platform macros file is intended to work with
-# Digital UNIX using the GNU compiler.
-
-ifndef ACE_DU_VERSION
- ACE_DU_VERSION := $(shell uname -r)
-endif # ACE_DU_VERSION
-
-ifeq (3.,$(findstring 3.,$(ACE_DU_VERSION)))
- include $(ACE_ROOT)/include/makeinclude/platform_osf1_3.2.GNU
-
-else # ! 3.x
-ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
- include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0_g++.GNU
-
- ifeq (4.0F,$(findstring 4.0F,$(shell /usr/sbin/sizer -v)))
- CFLAGS += -DDIGITAL_UNIX=0x40F
- else # ! 4.0F
- CFLAGS += -DDIGITAL_UNIX=0x400
- endif # ! 4.0F
-
-else # ! 4.x
-ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION)))
- include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0_g++.GNU
- CFLAGS += -DDIGITAL_UNIX=0x500
-
-endif # 5.x
-endif # ! 4.x
-endif # ! 3.x
diff --git a/include/makeinclude/platform_unixware_g++.GNU b/include/makeinclude/platform_unixware_g++.GNU
deleted file mode 100644
index e5e76d03a98..00000000000
--- a/include/makeinclude/platform_unixware_g++.GNU
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id$
-
-# UnixWare V2.2.1.2 with g++ version 2.7.2.2 *not* using Orbix
-
-debug = 1
-
-CC = gcc
-CXX = g++
-CFLAGS += -D__STDC__=0
-CCFLAGS += $(CFLAGS) -fno-implicit-templates
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-LIBS += -lsocket -lnsl -lgen -lthread
-PIC = -fpic
-AR = ar
-ARFLAGS = ruv
-RANLIB = /bin/true
-#SOFLAGS = -assert pure-text
-SOFLAGS = -shared
-# SOBUILD - compile into .so directly
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-# SOLINK = $(SOLINK.cc) -o $@ $(LDFLAGS) $<
-PRELIB = @true
diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU
deleted file mode 100644
index 531c3a3840b..00000000000
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ /dev/null
@@ -1,188 +0,0 @@
-# $Id$
-# VxWorks 5.2-5.3.1 with GNU g++ 2.7.2
-
-#### Notes:
-#### 1) This file requires that the WIND_BASE and WIND_HOST_TYPE environment
-#### variables be set. If the target CPU is not a PPC604, then your CPU
-#### environment variable must be set. If perl is not on your path,
-#### you'll also need to set your PERL_PATH environment variable to
-#### the full path to perl.
-#### 2) If you have problems with munch output not being compilable
-#### because it contains identifiers with ".", e.g., ".cpp", in them:
-#### add a global variable or function to that .cpp file. See
-#### ace/IOStream_T.cpp for an explanation and example.
-
-VXWORKS = 1
-CROSS-COMPILE = 1
-
-ifndef debug
- debug = 1
-endif # ! debug
-ifndef optimize
- optimize = 1
-endif # ! optimize
-ifndef rtti
- rtti =
-endif # ! rtti
-
-shared_libs =
-static_libs = 1
-
-ifeq (,$(WIND_BASE))
- default:
- @ERROR: you must set your WIND_BASE environment variable
-endif # WIND_BASE
-
-ifeq (,$(WIND_HOST_TYPE))
- default:
- @ERROR: you must set your WIND_HOST_TYPE environment variable
-endif # WIND_HOST_TYPE
-
-HOST_DIR = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
-
-ifeq (,$(findstring $(HOST_DIR)/bin,$PATH))
- #### Use := instead of += because += inserts a space.
- PATH := $(PATH):$(HOST_DIR)/bin
-endif # PATH
-
-ifeq (,$(PERL_PATH))
- PERL_PATH = perl
-endif # ! PERL_PATH
-
-
-#### BEGIN target CPU-specific settings
-
-#### This is kind of messy so that it can support multiple targets.
-#### You'll need to set CPU to a supported CPU using one of these
-#### methods (unless your CPU is a PowerPC 604):
-#### 1) create a $ACE_ROOT/include/makeinclude/platform_macros.GNU
-#### that contains something like:
-####
-#### WIND_BASE = /project/doc/pkg/wind
-#### WIND_HOST_TYPE = sun4-solaris2
-#### CPU = I80486
-####
-#### include $(ACE_ROOT)/include/makeinclude/platform_vxworks5.x_g++.GNU
-####
-#### 2) modify the code below to set CPU, or
-#### 3) set CPU on the command line, e.g., "make CPU=I80486"
-ifeq ($(CPU),)
- CPU = PPC604
-endif # default CPU
-
-ifeq ($(CPU),PPC604)
- BINXSYM_NAME = xsym
- CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=PPC604
- CCFLAGS += -fno-implicit-templates
- GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126
- TOOLENV = ppc
-else
-ifeq ($(CPU),PPC860)
- BINXSYM_NAME = xsym
- CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=PPC860 -mcpu=860
- CCFLAGS += -fno-implicit-templates
- GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126
- TOOLENV = ppc
-else
-ifeq ($(CPU),I80486)
- #### Note: -fno-implicit-templates doesn't seem to work well with g++
- #### cygnus-2.7.2-960126 for pc486 target. Some member functions don't
- #### get instantiated. Wind River knows about this problem (SPR 8483).
- BINXSYM_NAME = xsymDec
- CFLAGS += -DCPU=I80486 -m486
- TOOLENV = 386
-else
-ifeq ($(CPU),I80386)
- BINXSYM_NAME = xsymDec
- CFLAGS += -DCPU=I80386
- TOOLENV = 386
-else
- BINXSYM_NAME = xsym
- CCFLAGS += -fno-implicit-templates
-endif # I80386
-endif # I80486
-endif # PPC860
-endif # PPC604
-
-#### END target CPU-specific settings
-
-
-#### Set up Win32 vs. Unix host specific macros.
-ifeq ($(WIND_HOST_TYPE),x86-win32)
- CXX = cc$(TOOLENV)
-else # ! x86-win32
- CXX = g++$(TOOLENV)
- PIPE_OPT = -pipe
-endif # ! x86-win32
-
-ifeq ($(shared_libs),1)
- SHARED_LIBS = 1
-endif
-ifeq ($(shared_libs_only),1)
- SHARED_LIBS = 1
-endif
-
-ifeq ($(SHARED_LIBS),1)
- ACELIB = -L./
- #### There's no difference between non-shared and shared object code.
- VSHDIR = .obj/
-endif # shared_libs
-
-ifeq ($(static_libs),1)
- AR = ar$(TOOLENV)
- ARFLAGS = rv
-else # ! static_libs
- AR = echo
- ARFLAGS = "build shared lib only"
-endif # ! static_libs
-
-CC = cc$(TOOLENV)
-CFLAGS += -D_REENTRANT -ansi -fno-builtin -fno-defer-pop \
- -fvolatile -nostdinc -nostdlib $(PIPE_OPT) -W -Wall
-CCFLAGS += $(CFLAGS)
-ifeq (,$(rtti))
- #### Don't use RTTI even with egcs, because Tornado 1.0.x libraries
- #### don't support it.
- CCFLAGS += -fno-rtti -DACE_LACKS_RTTI
-endif # rtti
-DCFLAGS += -g
-DLD = $(LD)
-INCLDIRS += -I$(WIND_BASE)/target/h
-LD = $(PERL_PATH) $(ACE_ROOT)/bin/ace_ld \
- -C $(COMPILE.c) -traditional -- \
- -m munch -n nm$(TOOLENV) ld$(TOOLENV)
-LDFLAGS += -X -r
-#### WindRiver only recommends -O, not -O2, with some CPUs, including
-#### the i386 family. And -O2 causes some compilation failures.
-OCFLAGS += -O
-PIC =
-
-
-#### Tornado II uses egcs
-ifndef ACE_CC
- ACE_CC := $(shell PATH=${PATH} type $(CC) | sed -e 's/.* is //')
-endif # ! ACE_CC
-ifndef ACE_CC_VERSION
- ACE_CC_VERSION := $(shell $(ACE_CC) --version)
-endif # ! ACE_CC_VERSION
-ifeq (egcs,$(findstring egcs,$(ACE_CC_VERSION)))
- ACE_HAS_GNUG_PRE_2_8 := 0
- CFLAGS += -DACE_VXWORKS=0x540
- ifndef exceptions
- #### With exceptions, this is applied in wrapper_macros.GNU.
- CFLAGS += -Wno-uninitialized
- endif # ! exceptions
-endif # egcs
-
-
-#### ld can't handle INCLDIRS, so override LINK definitions.
-LINK.c = override
-LINK.c.override = $(LD) $(LDFLAGS) $(LDLIBS) $(LIBS)
-
-LINK.cc = override
-LINK.cc.override = $(LD)
-
-
-#### To extract the symbol table from each executable, uncomment the POSTLINK
-#### definition below.
-## POSTLINK = ; VX_CPU_FAMILY=$(TOOLENV) $(BINXSYM_NAME) < $@ > $@.sym
diff --git a/include/makeinclude/platform_vxworks5.x_ghs.GNU b/include/makeinclude/platform_vxworks5.x_ghs.GNU
deleted file mode 100644
index be646f2f62e..00000000000
--- a/include/makeinclude/platform_vxworks5.x_ghs.GNU
+++ /dev/null
@@ -1,92 +0,0 @@
-# $Id$
-#
-# VxWorks 5.2-5.3.1 with Green Hills 1.8.8 and 1.8.9
-
-#### Notes:
-#### 1) This file requires that your PATH be set to include the location
-#### of the Green Hills executables. And, it usually requires that
-#### WIND_BASE and WIND_HOST_TYPE be set.
-####
-#### 2) If your CPU is not a ppc, you'll need to set your CPU environment
-#### variable.
-####
-#### 3) You'll probably need to set your GHS environment variable to the
-#### location of your Green Hills executables.
-####
-#### 4) For x86 target, the ghsblin.o, ghsmath.o, and objghsvx/*.o
-#### object files were added to libedgnoe.a using this command:
-####
-#### $(WIND_BASE)/host/$(WIND_HOST_TYPE)/bin/ar386 rsv libedgnoe.a \
-#### ghs*.o objghsvx/*.o
-####
-#### If you don't do that, you'll have to add the individual .o files
-#### to LIBS below.
-####
-#### Here's an example platform_macros.GNU file:
-####
-#### WIND_BASE = /project/doc/pkg/wind
-#### WIND_HOST_TYPE = sun4-solaris2
-####
-#### ifeq (,$(findstring /project/doc/pkg/wind/green,$PATH))
-#### PATH +=:/project/doc/pkg/wind/green
-#### endif # PATH
-####
-#### CPU = 86
-#### GHS = /project/doc/pkg/wind/green/vx$(CPU)
-#### include $(ACE_ROOT)/include/makeinclude/platform_vxworks5.x_ghs.GNU
-
-VXWORKS = 1
-CROSS-COMPILE = 1
-
-debug = 1
-optimize = 1
-shared_libs =
-static_libs = 1
-
-
-#### CPU type
-ifndef CPU
- CPU = ppc
-endif # CPU
-
-#### Green Hills location, and target-specific definitions.
-ifeq ($(CPU),86)
- # With GHS' ax, ld386 complains that it can't read the
- # archive symbol table.
- ifndef GHS
- GHS = /project/doc/pkg/wind/green/vx$(CPU)
- endif # GHS
- AR = $(WIND_BASE)/host/$(WIND_HOST_TYPE)/bin/ar386
- ARFLAGS = rsu
-
- #### For GHS 1.8.8:
- #### LIBS += $(GHS)/libedgnoe.a
-else
-ifeq ($(CPU),ppc)
- ifndef GHS
- GHS = /appl/newgreen/vx$(CPU)603
- endif # GHS
- AR = ax
- ARFLAGS = cr
-
- #### For GHS 1.8.8:
- #### LIBS += $(GHS)/ghsbltin.o $(GHS)/ghsmath.o
-endif # ppc
-endif # CPU
-
-#### For GHS 1.8.9:
-LIBS += $(GHS)/libscnoe.a $(GHS)/libsedgnoe.a $(GHS)/liblockinit_sc.o
-
-CC = cxvx$(CPU)
-CXX = $(CC)
-CCFLAGS += $(CFLAGS) --no_rtti -tnone
-DCFLAGS += -g
-DLD = $(CXX)
-#### Set INCLDIRS, so that wrapper_macros.GNU doesn't insert -I.
-#### Otherwise, with GHS on NT host, ACE's Signal.h gets #included
-#### instead of VxWorks' signal.h by target/h/private/sigLibP.h.
-INCLDIRS = -I$(ACE_ROOT)
-LD = $(CXX)
-LDFLAGS = --no_auto_instantiation
-OCFLAGS += -OL -OM
-PIC =
diff --git a/include/makeinclude/rules.bin.GNU b/include/makeinclude/rules.bin.GNU
deleted file mode 100644
index d3d2d9f2bc9..00000000000
--- a/include/makeinclude/rules.bin.GNU
+++ /dev/null
@@ -1,27 +0,0 @@
-#----------------------------------------------------------------------------
-# $Id$
-#
-# Build binaries
-# GNU version
-# Requires GNU make
-#----------------------------------------------------------------------------
-
-ifndef OBJEXT
-OBJEXT=o
-endif
-
-VOBJS = $(subst .cpp,.$(OBJEXT),$(foreach file,$(SRC),$(VDIR)$(notdir $(file))))
-
-ifeq ($(CHORUSLINK),true)
-$(BIN): %: $(VDIR)%.o $(VOBJS)
- $(LINK.cc) -o $@.xp.o $^ -u _main -u _premain $(VLDLIBS) $(LDFLAGS)$(POSTLINK)
- $(MERGEDIR)/dtool/mkctors $@.xp.o > $@.ct.s
- $(CXX) -c $@.ct.s
- $(RM) $@.ct.s
- $(LD) $(LDOPTIONS) -e _start -o $@ $(MERGEDIR)/lib/crt/crth.u.o $(MERGEDIR)/lib/crt/crt0.o $(MERGEDIR)/lib/crt/crti.o $@.xp.o $@.ct.o $(MERGEDIR)/lib/crt/crtn.o -dn -T $(MERGEDIR)/src/act/slots/act_u.ld
- $(RM) $@.xp.o
- $(RM) $@.ct.o
-else
-$(BIN): %: $(VDIR)%.o $(VOBJS)
- $(LINK.cc) -o $@ $^ $(LDFLAGS) $(VLDLIBS) $(POSTLINK)
-endif
diff --git a/include/makeinclude/rules.common.GNU b/include/makeinclude/rules.common.GNU
deleted file mode 100644
index c2c1b2d5b33..00000000000
--- a/include/makeinclude/rules.common.GNU
+++ /dev/null
@@ -1,17 +0,0 @@
-#----------------------------------------------------------------------------
-# $Id$
-#
-# Common targets
-#----------------------------------------------------------------------------
-
-all: all.nested all.local
-debug: debug.nested debug.local
-profile: profile.nested profile.local
-install: install.nested install.local
-deinstall: deinstall.nested deinstall.local
-clean: clean.nested clean.local
-realclean: realclean.nested realclean.local
-clobber: clobber.nested clobber.local
-depend: depend.nested depend.local
-rcs_info: rcs_info.nested rcs_info.local
-
diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU
deleted file mode 100644
index 756b6efaf48..00000000000
--- a/include/makeinclude/rules.lib.GNU
+++ /dev/null
@@ -1,147 +0,0 @@
-#----------------------------------------------------------------------------
-# $Id$
-#
-# Build libraries (i.e., contain no binary executables)
-# GNU version
-# Requires GNU make
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-# The following targets arrange to build both unshared and shared libraries
-#----------------------------------------------------------------------------
-
-ifndef OBJEXT
- OBJEXT=o
-endif
-
-ifndef SOEXT
- SOEXT=so
-endif
-
-VSHLIB = $(SHLIB:%.$(SOEXT)=%$(VAR).$(SOEXT))
-ifdef SHLIBA
-VSHLIBA = $(SHLIBA:%.a=%$(VAR).a)
-endif
-
-VLOBJS = $(subst .cpp,.$(OBJEXT),$(foreach file,$(LSRC),$(VDIR)$(notdir $(file))))
-
-LSRC += $(LSRC2)
-ifdef PRELIB
-ifdef PRELIB_USES_OBJ_ONLY
- VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))
-else # ! PRELIB_USES_OBJ_ONLY
- VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))
-endif # ! PRELIB_USES_OBJ_ONLY
- VSHOBJS1 = $(VSHOBJS)
-else # ! PRELIB
- VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))
- VSHOBJS1 = \
- $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))
-endif # ! PRELIB
-
-# Comment out for now...
-# $(DEFS:%=$(INSINC)/%) \
-
-ifdef shared_libs_only
- INSTALL += \
- $(VSHLIB:%.$(SOEXT)=$(INSLIB)/%.$(SOEXT)$(ACE_LDSO_Version_Number))
-ifdef SHLIBA
- INSTALL += $(VSHLIBA:%=$(INSLIB)/%)
-endif
-else
-ifdef static_libs_only
- INSTALL += $(VLIB:%.a=$(INSLIB)/%.a)
-else
- INSTALL += $(VLIB:%.a=$(INSLIB)/%.a) \
- $(VSHLIB:%.$(SOEXT)=$(INSLIB)/%.$(SOEXT)$(ACE_LDSO_Version_Number))
-ifdef SHLIBA
- INSTALL += $(VSHLIBA:%=$(INSLIB)/%)
-endif
-endif # static_libs_only
-endif # shared_libs_only
-
-ifdef PRELIB
-# Unfortunately, gcc has to do a link of all of the objects (during which
-# it may decide to recompile some of the objects), before we can safely build
-# any libraries or shared objects. Comment this line if no shared
-# libraries or objects are used.
-#
-# I have no idea why this dependency has any effect similar to what is
-# described above, so I will comment it out. This eliminates the VERY
-# annoying messages from make such as:
-# make: Circular .shobj/interp.so <- libcorba.so dependency dropped.
-#$(VSHOBJS): $(VSHLIB)
-endif
-
-# Comment these lines out if you want to build both *.a and *.so libraries...
-#$(VSHLIB): $(VSHOBJS)
-#ifdef PRELIB
-# $(PRELIB)
-#endif
-# $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)*.o
-
-# Uncomment the remaining lines if you want to build both *.a and *.so libraries...
-VLIB = $(LIB:%.a=%$(VAR).a)
-
-$(VLIB): $(VLOBJS)
-ifdef PRELIB
- $(PRELIB)
-endif
- $(AR) $(ARFLAGS) $@ $?
-ifdef TEMPINCDIR
-# This is required to get AIX xlC to instantiate and compile the needed
-# templates.
- if test -s ./$(TEMPINCDIR)/*.C; \
- then \
- $(LINK.cc) -o dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(LIBS); \
- $(RM) dummy; \
- $(AR) $(ARFLAGS) $@ tempinc/*.o; \
- fi
-endif
- -chmod a+r $@
-ifneq (,$(RANLIB))
- -$(RANLIB) $@
-endif # RANLIB
-
-# Note that if you don't want to build shared libraries, just remove the $(VSHOBJS)
-ifdef SHLIBBUILD
-$(VSHLIB): $(VSHOBJS)
-else
-$(VSHLIB): $(VSHOBJS1)
-endif
-ifdef PRELIB
- $(PRELIB)
-endif
-ifdef TEMPINCDIR
-# This is required to get AIX xlC to instantiate and compile the needed
-# templates before building the library.
- if test -s ./$(TEMPINCDIR)/*.C; \
- then \
- $(LINK.cc) -o dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(LIBS); \
- $(RM) dummy; \
- fi
-endif
-ifdef SHLIBBUILD
- $(SHLIBBUILD)
-else
-ifdef TEMPINCDIR
- if test -s ./$(TEMPINCDIR)/*.o; \
- then \
- $(SOLINK.cc) -o $@ $(VSHOBJS1) $(TEMPINCDIR)/*.o $(LDFLAGS) $(LIBS); \
- else \
- $(SOLINK.cc) -o $@ $(VSHOBJS1) $(LDFLAGS) $(LIBS); \
- fi
-else
- $(SOLINK.cc) -o $@ $(VSHOBJS1) $(LDFLAGS) $(LIBS)
-endif
- -chmod a+rx $@
-endif
-
-ifdef SHLIBA
-$(SHLIBA): $(VSHLIB)
- $(AR) $(ARFLAGS) $@ $?
- -chmod a+rx $@
-ifneq (,$(RANLIB))
- -$(RANLIB) $@
-endif # RANLIB
-endif
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
deleted file mode 100644
index 5af8b175996..00000000000
--- a/include/makeinclude/rules.local.GNU
+++ /dev/null
@@ -1,227 +0,0 @@
-#----------------------------------------------------------------------------
-# $Id$
-#
-# Local targets
-# GNU version
-# Requires GNU make
-#----------------------------------------------------------------------------
-
-ifndef OBJDIRS
- OBJDIRS = .obj .shobj # .obj_debug .obj_profile .obj_optimize
-endif # OBJDIRS
-
-#### TEMPLATE_REPOSITORY can be set in individual platform files
-#### to create template repository directories. See
-#### platform_sunos5_sunc++.GNU for an example.
-OBJDIRS += $(TEMPLATE_REPOSITORY)
-
-all.local: build.objdirs build.local install.local
-
-#----------------------------------------------------------------------------
-# C/C++ compilation targets
-#----------------------------------------------------------------------------
-
-build.local: $(BUILD)
-
-# Set up the suffixes for C++ and IDL.
-.SUFFIXES:
-.SUFFIXES: .cpp .cc .C .idl $(SUFFIXES)
-
-ifndef TAO_ROOT
-# and here's how to compile C++ files from the IDL file.
-# only ONE of these rules will be run at make-time,
-
-# The rules are only used if TAO_ROOT is not defined to avoid
-# conflicts with a similar rule in TAO.
-
-%S.cpp: %.idl
- $(IDL) --version $(IDLFLAGS) $<
-
-%C.cpp: %.idl
- $(IDL) --version $(IDLFLAGS) $<
-
-%.hh: %.idl
- $(IDL) --version $(IDLFLAGS) $<
-endif # TAO_ROOT
-
-# C++ related targets
-
-$(VDIR)%.o: %.c
- $(COMPILE.c) -o $@ $<
- ${MVCMD}
-
-$(VDIR)%.o: %.cpp
- $(COMPILE.cc) -o $@ $<
- ${MVCMD}
-
-#$(VDIR)%.o: %.C
-# $(COMPILE.cc) -o $@ $<
-
-#$(VDIR)%.o: %.cc
-# $(COMPILE.cc) -o $@ $<
-
-# If SOLINK is defined, then the .so file is built from the .o file via
-# separate rules in the same directory. Otherwise, the .so and .o are
-# built via the same rule. SOLINK is required for the repository under
-# gcc.
-ifndef SOLINK
-# I added the "Executable Shared Object (ESO)" define to separate between
-# normal shared object files and executable shared object files (the kind
-# that the service configurator needs to be able to function).
-# 970104 Marius Kjeldahl <mariusk@sn.no, marius@funcom.com>
-ifdef (ESOBUILD)
-$(VSHDIR)%.$(SOEXT): %.cpp
- $(ESOBUILD)
-else
-$(VSHDIR)%.$(SOEXT): %.cpp
- $(SOBUILD)
-endif
-$(VSHDIR)%.o: %.cpp
- $(COMPILE.cc) $(PIC) -o $@ $<
-$(VSHDIR)%.o: %.cc
- $(COMPILE.cc) $(PIC) -o $@ $<
-$(VSHDIR)%.$(SOEXT): $(VSHDIR)%.o
- $(SOLINK)
-endif
-
-#----------------------------------------------------------------------------
-# Library generation targets
-#----------------------------------------------------------------------------
-
-.PRECIOUS: $(VLIB)
-
-#### show_statics shows static objects in locally-created object files.
-#### It assumes that the object files were built using g++.
-#### TOOLENV selects the proper nm in VxWorks host environments.
-#### TOOLDIR allows specification of the full path to nm via definition
-#### in the platform_macros.GNU file.
-show_statics:
- -@$(TOOLDIR)nm$(TOOLENV) -Co $(VSHDIR)*o | \
- egrep ' global destructors '; true
-
-#### show_uninit shows uninitialized data in locally-created object files.
-#### TOOLENV selects the proper nm in VxWorks host environments.
-show_uninit:
- -@$(TOOLDIR)nm$(TOOLENV) -Co $(VSHDIR)*o | egrep ' b '
-
-#----------------------------------------------------------------------------
-# Installation targets
-#----------------------------------------------------------------------------
-
-install.local: $(INSTALL)
-
-deinstall.local:
- $(RM) $(INSTALL) $(LIB:%.a=$(INSLIB)/%*.a) \
-$(SHLIB:%.$(SOEXT)=$(INSLIB)/%*.$(SOEXT))
-
-
-#### To disable installs, just add "INSTALL=" to your "make" invocation.
-
-ifeq (,$(LN_S))
- ifdef COMSPEC
- #### Assume we're on a WIN32 host.
- LN_S = cp -p
- else # ! WIN32
- LN_S = ln -s
- endif # ! WIN32
-endif # ! LN_S
-
-$(INSBIN)/%$(VAR) \
-$(INSINC)/ace% \
-$(INSLIB)/%$(VAR).a \
-$(INSLIB)/%$(VAR).$(SOEXT)$(ACE_LDSO_Version_Number) \
-$(INSMAN)/man1/% \
-$(INSMAN)/man2/% \
-$(INSMAN)/man3/% \
-$(INSMAN)/man4/% \
-$(INSMAN)/man5/% \
-$(INSMAN)/man6/% \
-$(INSMAN)/man7/% \
-$(INSMAN)/man8/% \
-$(INSMAN)/manl/% \
-$(INSMAN)/mann/% :
- @if test $(shell pwd) != $(@D) -o -n "$(ACE_LDSO_Version_Number)" ; then \
- if test -s $@ ; then \
- echo "$(@F) already installed" ; \
- else \
- echo "Installing $(@F) -> $(@D)" ; \
- $(RM) $(@); $(LN_S) $(shell pwd)/$(@F:%.$(SOEXT)$(ACE_LDSO_Version_Number)=%.$(SOEXT)) $(@) ; \
- fi ; \
- fi
-ifdef MVSLIB
-#special for MVS in order to use the .x files
- @if test -w $(@D) ; then \
- if test -s $(@:.$(SOEXT)=.x) ; then \
- echo "$(@F:.$(SOEXT)=.x) already installed" ; \
- else \
- echo "Installing $(@F:.$(SOEXT)=.x) -> $(@D)" ; \
- $(RM) $(@); $(LN_S) $(shell pwd)/$(@F:.$(SOEXT)=.x) $(@:.$(SOEXT)=.x) ; \
- fi \
- fi
-endif
-
-#----------------------------------------------------------------------------
-# Cleanup targets
-#----------------------------------------------------------------------------
-
-clean.local:
- -$(RM) *.o *~ *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
- -$(RM) -r $(OBJDIRS) $(TEMPINCDIR) cxx_repository ptrepository \
-Templates.DB gcctemp.c gcctemp so_locations
-
-realclean.local: clean.local
- -$(RM) $(BIN) $(BIN:%=%_debug) $(BIN:%=%_profile) $(BIN:%=%_optimize) $(LIB:%=%) $(LIB:%=%_debug) $(LIB:%=%_profile) $(LIB:%=%_optimize) $(SHLIB:%=%) $(SHLIB:%=%_debug) $(SHLIB:%=%_profile) $(SHLIB:%=%_optimize) $(SHLIBA:%=%) $(BIN2) $(BIN2:%=%_debug) $(BIN2:%=%_profile) $(BIN2:%=%_optimize) $(LIB2:%=%) $(LIB2:%=%_debug) $(LIB2:%=%_profile) $(LIB2:%=%_optimize) $(SHLIB2:%=%) $(SHLIB2:%=%_debug) $(SHLIB2:%=%_profile) $(SHLIB2:%=%_optimize) $(SHLIBA2:%=%)
-
-#----------------------------------------------------------------------------
-# Dependency generation target
-#----------------------------------------------------------------------------
-
-ifndef MAKEFILE
- MAKEFILE=Makefile
-endif # MAKEFILE
-
-ifndef TAO_ROOT
- TAO_ROOT = $(ACE_ROOT)/TAO
-endif # TAO_ROOT
-
-# If no libraries are build in the current directory (actually, if
-# rules.lib.GNU isn't included), then SOEXT might not be set.
-ifndef SOEXT
- SOEXT=so
-endif # SOEXT
-
-depend.local: $(MAKEFILE)
- @$(RM) $(MAKEFILE).old
- @cp $(MAKEFILE) $(MAKEFILE).old
- $(ACE_ROOT)/bin/g++dep -f $(MAKEFILE) $(CPPFLAGS) -DMAKEDEPEND $(LSRC) $(SRC) $(PSRC)
- @cat $(MAKEFILE) | \
- sed -e "s;$(TAO_ROOT);\$$(TAO_ROOT);g" \
- -e "s;$(ACE_ROOT);\$$(ACE_ROOT);g" \
- -e '/$$(ACE_ROOT)\/ace\/config[^\.]*\.h/d' \
- -e "s; /[-a-zA-Z0-9_./]*\.h;;g" \
- -e "s;\([-a-zA-Z0-9._]*\)\.o:;.obj/\1.o .obj/\1.$(SOEXT) $(VSHDIR)\1.o $(VSHDIR)\1.$(SOEXT):;" \
- > $(MAKEFILE).new
- @cat $(MAKEFILE).new >$(MAKEFILE)
- @$(RM) $(MAKEFILE).new
- @if cmp -s $(MAKEFILE) $(MAKEFILE).old ;\
- then echo "Makefile dependencies unchanged." ;\
- else \
- echo "Makefile dependencies updated." ;\
- fi ;\
- $(RM) $(MAKEFILE).old ;
-
-#----------------------------------------------------------------------------
-# RCS info target
-#----------------------------------------------------------------------------
-
-rcs_info.local:
- @rcs info
-
-#----------------------------------------------------------------------------
-# Variant targets and conditional macros
-#----------------------------------------------------------------------------
-
-build.objdirs: $(OBJDIRS)
-
-$(OBJDIRS):
- test -d $@ || mkdir $@
diff --git a/include/makeinclude/rules.nested.GNU b/include/makeinclude/rules.nested.GNU
deleted file mode 100644
index 16636a25a25..00000000000
--- a/include/makeinclude/rules.nested.GNU
+++ /dev/null
@@ -1,14 +0,0 @@
-#----------------------------------------------------------------------------
-# $Id$
-#
-# Nested directory targets makefile definitions
-#----------------------------------------------------------------------------
-
-$(TARGETS_NESTED):
-ifneq ($(DIRS),)
-ifeq (Windows,$(findstring Windows,$(OS)))
- @cmd /c "FOR /D %i IN ($(DIRS)) DO $(MAKE) -C %i $(@:.nested=)"
-else # ! Windows
- @for dir in $(DIRS); do $(MAKE) -C $$dir $(@:.nested=); done
-endif # ! Windows
-endif # DIRS
diff --git a/include/makeinclude/rules.nolocal.GNU b/include/makeinclude/rules.nolocal.GNU
deleted file mode 100644
index f440e3b7d5e..00000000000
--- a/include/makeinclude/rules.nolocal.GNU
+++ /dev/null
@@ -1,8 +0,0 @@
-#----------------------------------------------------------------------------
-# $Id$
-#
-# Makefile for directories with no local build targets
-#----------------------------------------------------------------------------
-
-$(TARGETS_LOCAL):
-
diff --git a/include/makeinclude/rules.nonested.GNU b/include/makeinclude/rules.nonested.GNU
deleted file mode 100644
index a144a511fc0..00000000000
--- a/include/makeinclude/rules.nonested.GNU
+++ /dev/null
@@ -1,8 +0,0 @@
-#----------------------------------------------------------------------------
-# $Id$
-#
-# Null nested targets
-#----------------------------------------------------------------------------
-
-$(TARGETS_NESTED):
-
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
deleted file mode 100644
index 41af00636de..00000000000
--- a/include/makeinclude/wrapper_macros.GNU
+++ /dev/null
@@ -1,502 +0,0 @@
-#----------------------------------------------------------------------------
-# $Id$
-#----------------------------------------------------------------------------
-#
-# ACE supports the following flags. They can be enabled either on
-# the command line, e.g., "make purify=1", or added to your
-# platform_macros.GNU. To disable the option, set the flag to null,
-# e.g., "make debug=". Some flags support setting to 0 disable,
-# e.g., "make debug=0". debug=1 is enabled in the platform files
-# that are released with ACE.
-#
-# Please note that the effects of a flag may be platform specific.
-# Also, combinations of certain flags may or may not be allowed on
-# specific platforms, e.g., debug=1 opt=1 is supported by g++ but
-# not all other C++ compilers.
-#
-# Flag Description
-# ---- -----------
-# debug Enable debugging; see DCFLAGS and DCCFLAGS.
-# exceptions Enable exception handling (not supported by all platforms).
-# minimum_corba Enable minimumCORBA support.
-# fast Enable -fast option, e.g., with Sun C++.
-# inline Enable ACE inlining. Some platforms enable inlining by
-# default, others do not.
-# optimize Enable optimization; see OCFLAGS and OCCFLAGS.
-# orbix Enable use of Orbix.
-# probe Enable ACE_Timeprobes.
-# profile Enable profiling; see PCFLAGS and PCCFLAGS.
-# purify Purify all executables. purify must be in user's PATH!
-# quantify Quantify all executables. quantify must be in user's PATH!
-# repo Use GNU template repository (g++ with repo patches and
-# egcs only).
-# rtti Enable run-time type identification. On some platforms,
-# it is enabled by default, so this is ignored.
-# shared_libs Build shared libraries. Ignored if static_libs_only is set.
-# static_libs Build static libraries. Ignored if shared_libs_only is set.
-# shared_libs_only Only build shared libraries. Ignored if no SHLIBs are
-# specified by the Makefile, as in performance-tests/Misc.
-# static_libs_only Only build static libraries.
-# threads Build with thread support.
-# xt_reactor Build the XtReactor.
-# fl_reactor Build the FlReactor.
-# tk_reactor Build the TkReactor.
-#
-# Usually, users do not need to be concerned with make targets.
-# Just enter "make" on the command line to build. A few notable
-# targets are listed below.
-#
-# Target Description
-# ------ -----------
-# show_statics Lists all static objects in object files built for
-# current directory. Only supported for g++.
-# show_uninit Lists all uninitialized in object files built for
-# current directory. Only supported for g++.
-#
-# The following describes the ACE wrapper macros:
-#
-# Variable Description
-# -------- -----------
-# ACE_HAS_GNUG_PRE_2_8 CXX includes "g++", and the g++ version is
-# prior to 2.8.0. This is automatically determined
-# below, but can be overridden in the user's
-# platform_macros.GNU or environment. Three values
-# are supported:
-# 1 for g++ < 2.8.0,
-# 0 for g++ >= 2.8.0 or egcs,
-# undefined for non-g++ compilers.
-# ARFLAGS Flags for the archive utility (ar)
-# CC C compiler command
-# CXX C++ compiler command
-# COMPILE.c Flags for compiling with C
-# COMPILE.cc Flags for compiling with C++
-# CPPFLAGS C pre-processor flags
-# CFLAGS C compilation flags
-# CCFLAGS C++ compilation flags
-# DCFLAGS C compilation flags for debugging
-# DCCFLAGS C++ compilation flags for debugging
-# DEFFLAGS C++ preprocessor flag for defining symbols
-# DLD Name of dynamic linker
-# LD Name of linker
-# IDL Name of the CORBA IDL compiler
-# INSBIN Binary (executable) installation directory
-# INSINC Include file installation directory
-# INSMAN Manpage installation directory
-# INSLIB Library installation directory
-# LDFLAGS ld linker flags
-# LINK.c Flags for linking with C
-# LINK.cc Flags for linking with C++
-# MAKEFLAGS Flags that are passed into the compilation from the commandline
-# OCFLAGS Optimizing C compilation flags
-# OCCFLAGS Optimizing C++ compilation flags
-# ORBIX_ROOT Root of IONA's Orbix CORBA implementation
-# PCFLAGS C compilation flags for profiling
-# PCCFLAGS C++ compilation flags for profiling
-# PLATFORM_XT_CPPFLAGS Platform CPP options for X11 (some require -I...)
-# PLATFORM_XT_LDFLAGS Platform LD options for X11 (some require -L...)
-# PLATFORM_XT_LIBS Platform libraries require with X11
-# PRELINK Executable to precede linking, such as quantify
-# PURELINK If set, contains purify executable as well as all options
-# PURE_CACHE_BASE_DIR
-# The base directory in which Pure products will produce
-# instrumented libraries. If you don't want that to be below
-# /tmp, set this variable in your environment or on the make
-# command line.
-# PURE_CACHE_DIR
-# The full name of the directory in which Pure produces will
-# produce instrumented libraries.
-# PTDIRS Pathnames of directories containing template code
-# RM Name of program to use to remove files
-# SOFLAGS Flags used to build a shared library
-# SOLINK.cc Link line necessary to build a share library
-# VAR Variant identifier suffix
-# VDIR Directory for object code
-# VSHDIR Directory for shared object code
-# ACE_ROOT Pathname for the root of the build tree
-#
-#----------------------------------------------------------------------------
-# Platform-dependent macro definitions
-# (link to the appropriate platform-specific config file).
-#----------------------------------------------------------------------------
-
-#### Default to building shared libraries only. Set it here to give the
-#### platform a chance to override.
-shared_libs = 1
-static_libs = 0
-
-#### Let platform just look at whether or not exceptions is defined.
-#### With the following override, it doesn't have to check for 0.
-ifeq ($(exceptions),0)
- override exceptions =
-endif # exceptions
-
-ifeq ($(fast),0)
- override fast =
-endif # fast
-
-ifeq ($(rtti),0)
- override rtti =
-endif # rtti
-
-#### Defined versioned_so = 1 if your platform requires version number
-#### be appended after so library.
-versioned_so = 0
-
-#### The system has X Windows and we want to include the XtReactor in
-#### the library
-xt_reactor = 0
-
-include $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
-
-#----------------------------------------------------------------------------
-# Platform-independent macro definitions
-#----------------------------------------------------------------------------
-
-CPPFLAGS += $(DEFFLAGS) $(INCLDIRS)
-IDL = idl
-IDLFLAGS = -A -B -s S.cpp -c C.cpp
-ifeq (,$(findstring -I$(ACE_ROOT),$(INCLDIRS)))
- INCLDIRS += -I. -I$(ACE_ROOT)
-endif
-INSBIN = $(ACE_ROOT)/bin
-INSINC = $(ACE_ROOT)/ace
-INSLIB = $(ACE_ROOT)/ace
-INSMAN = $(ACE_ROOT)/man
-ifeq (,$(findstring -L$(ACE_ROOT)/ace,$(LDFLAGS)))
- LDFLAGS += -L$(ACE_ROOT)/ace -L./
-endif
-LEX = flex
-PCFLAGS += #### set in platform_macros.GNU file, e.g., -p
-PCCFLAGS += #### set in platform_macros.GNU file, e.g., -p
-VAR =
-VDIR = .obj/
-ifndef ACELIB
- ACELIB = -lACE
-endif
-ifndef VSHDIR
- VSHDIR = .shobj/
-endif # VSHDIR
-# NOTE: VLDLIBS is defined below, in case it is overridden for static-
-# or shared-only builds.
-YACC = yacc
-
-# Define SOEXT trailing digits if platform needs it.
-ifeq ($(versioned_so),1)
- ACE_LDSO_Version_Number := $(shell echo .`perl -ne 'if (/ACE version/) \
- { s/[^0-9]+(\d+\.\d+)(\.\d+)?.+/\1/ ; print }' ${ACE_ROOT}/VERSION `)
-else
- ACE_LDSO_Version_Number =
-endif
-
-#----------------------------------------------------------------------------
-# Platform-dependent macros that require platform_macros.GNU.
-#----------------------------------------------------------------------------
-
-ifeq ($(findstring g++,$(CXX)),g++)
- ifndef ACE_HAS_GNUG_PRE_2_8
- ifeq ($(CXX),g++)
- ACE_HAS_GNUG_PRE_2_8 := \
- $(shell \
- if $(CXX) --version | egrep '^(cygnus-)?2\.[0-7]' > /dev/null; then \
- echo 1; else echo 0; fi)
- else # ! g++
- ifeq ($(CXX),eg++)
- # Assume that eg++ is egcs.
- ACE_HAS_GNUG_PRE_2_8 := 0
- else # ! plain g++ or eg++
- # CXX is something like g++386. Assume, for now, that it's an old g++.
- ACE_HAS_GNUG_PRE_2_8 := 1
- endif # ! plain g++ or eg++eg++
- endif # ! g++
- endif # ! ACE_HAS_GNUG_PRE_2_8
-endif # g++
-
-#----------------------------------------------------------------------------
-# make flags
-#----------------------------------------------------------------------------
-
-ifeq ($(optimize),0)
- override optimize =
-endif # optimize
-
-ifneq ($(optimize),)
- CFLAGS += $(OCFLAGS)
- CCFLAGS += $(OCCFLAGS)
-endif # optimize
-
-ifeq ($(debug),0)
- override debug =
-endif # debug
-
-ifeq ($(debug),)
- ifeq (,$(findstring $(CFLAGS),$(CCFLAGS)))
- CCFLAGS += -DACE_NDEBUG
- else
- CFLAGS += -DACE_NDEBUG
- endif
-else
- CFLAGS += $(DCFLAGS)
- CCFLAGS += $(DCCFLAGS)
-endif # debug
-
-ifeq ($(threads),0)
- override threads =
-endif # threads
-
-ifeq ($(xt_reactor),0)
- override xt_reactor =
-endif # xt_reactor
-
-ifneq ($(xt_reactor),)
- override ace_with_x11=1
- CPPFLAGS += -DACE_HAS_XT $(PLATFORM_XT_CPPFLAGS)
- LIBS += $(PLATFORM_XT_LIBS)
- LDFLAGS += $(PLATFORM_XT_LDFLAGS)
-endif # xt_reactor
-
-ifeq ($(fl_reactor),0)
- override fl_reactor =
-endif # fl_reactor
-
-ifneq ($(fl_reactor),)
- override ace_with_x11=1
- override ace_with_gl=1
- CPPFLAGS += -DACE_HAS_FL $(PLATFORM_FL_CPPFLAGS)
- LIBS += $(PLATFORM_FL_LIBS)
- LDFLAGS += $(PLATFORM_FL_LDFLAGS)
-endif # fl_reactor
-
-ifeq ($(tk_reactor),0)
- override tk_reactor =
-endif # tk_reactor
-
-ifneq ($(tk_reactor),)
- override ace_with_tk=1
- CPPFLAGS += -DACE_HAS_TK $(PLATFORM_TK_CPPFLAGS)
- LIBS += $(PLATFORM_TK_LIBS)
- LDFLAGS += $(PLATFORM_TK_LDFLAGS)
-endif # tk_reactor
-
-ifeq ($(ace_with_gl),0)
- override ace_with_gl =
-endif # ace_with_gl
-
-ifneq ($(ace_with_gl),)
- override ace_with_x11 = 1
- CPPFLAGS += $(PLATFORM_GL_CPPFLAGS)
- LIBS += $(PLATFORM_GL_LIBS)
- LDFLAGS += $(PLATFORM_GL_LDFLAGS)
-endif # ace_with_gl
-
-ifeq ($(ace_with_x11),0)
- override ace_with_x11 =
-endif # ace_with_x11
-
-ifneq ($(ace_with_x11),)
- CPPFLAGS += $(PLATFORM_X11_CPPFLAGS)
- LIBS += $(PLATFORM_X11_LIBS)
- LDFLAGS += $(PLATFORM_X11_LDFLAGS)
-endif # ace_with_x11
-
-
-ifdef exceptions
- CPPFLAGS += -DACE_HAS_EXCEPTIONS
- ifeq ($(ACE_HAS_GNUG_PRE_2_8),1)
- #### Enable exception handling with g++ < 2.8.0. Not recommended,
- #### but provided here for completeness.
- CCFLAGS += -fhandle-exceptions
- else # ! ACE_HAS_GNUG_PRE_2_8
- ifeq ($(ACE_HAS_GNUG_PRE_2_8),0)
- #### Disable this warning on g++ >= 2.8.0 if exceptions are enabled,
- #### it gets confused and reports too many bogus warnings.
- CFLAGS += -Wno-uninitialized
- endif # g++ > 2.8.0
- endif # ! ACE_HAS_GNUG_PRE_2_8
-else # ! exceptions
- ifeq ($(ACE_HAS_GNUG_PRE_2_8),0)
- #### Disable the default exception handling of g++ >= 2.8.0.
- CCFLAGS += -fno-exceptions
- endif # ! ACE_HAS_GNUG_PRE_2_8
-endif # ! exceptions
-
-ifeq ($(minimum_corba),1)
- CPPFLAGS += -DTAO_HAS_MINIMUM_CORBA
-endif # minimum_corba
-
-ifeq ($(profile),0)
- override profile =
-endif # profile
-
-ifneq ($(profile),)
- CFLAGS += $(PCFLAGS)
- CCFLAGS += $(PCCFLAGS)
-endif # profile
-
-ifeq ($(inline),0)
- CCFLAGS += -DACE_NO_INLINE
-else
-ifeq ($(inline),1)
- CCFLAGS += -D__ACE_INLINE__
-endif # inline eq 1
-endif # inline eq 0
-
-ifeq ($(shared_libs),0)
- override shared_libs =
-endif # shared_libs
-ifeq ($(static_libs),0)
- override static_libs =
-endif # static_libs
-
-ifeq ($(shared_libs_only),0)
- override shared_libs_only =
-endif # shared_libs_only
-ifeq ($(static_libs_only),0)
- override static_libs_only =
-endif # static_libs_only
-
-ifdef shared_libs_only
- override shared_libs = 1
- override static_libs =
-endif # shared_libs_only
-ifdef static_libs_only
- override shared_libs =
- override static_libs = 1
-endif # static_libs_only
-
-#### We need to set VBIN here, because it's used in the BUILD
-#### definitions below.
-VBIN = $(BIN:%=%$(VAR))
-
-ifdef shared_libs
- ifdef static_libs
- #### Build both shared and static libs.
- BUILD = $(VSHLIB) $(SHLIBA) $(VLIB) $(VBIN)
- else # ! static_libs
- #### Build shared libs only.
- ifeq ($(SHLIB),)
- #### Makefile only specifies static libs, so only build static libs.
- BUILD = $(VLIB) $(VBIN)
- else # ! SHLIB
- #### Don't build static libs.
- BUILD = $(VSHLIB) $(SHLIBA) $(VBIN)
- LIB =
- OBJEXT = so
- ifndef VXWORKS
- VDIR = .shobj/
- endif # ! VXWORKS
- ifeq ($(BIN),)
- #### No executables are being built, so don't create .obj/.
- OBJDIRS = .shobj
- endif # BIN
- endif # ! SHLIB
- endif # ! static_libs
-
- ifdef SHLIBA
- LDLIBS := $(LDLIBS:-l%=-l%shr)
- endif # SHLIBA
-else # ! shared_libs
- ifdef static_libs
- #### Don't build shared libs.
- BUILD = $(VLIB) $(VBIN)
- OBJDIRS = .obj
- PIC =
- SHLIB =
- SOEXT = o
- VSHDIR = .obj/
- VLDLIBS = $(LDLIBS:%.so=%.o)
- else # ! static_libs
- #### Don't build any libs.
- BUILD = $(VBIN)
- endif # ! static_libs
-endif # ! shared_libs
-
-VLDLIBS := $(LDLIBS) $(ACELIB) $(LIBS)
-
-ifeq ($(probe),0)
- override probe =
-endif # probe
-
-ifeq ($(probe),1)
- CCFLAGS += -DACE_COMPILE_TIMEPROBES
-endif # probe
-
-ifeq ($(purify),0)
- override purify =
-endif # purify
-
-PURE_CACHE_BASE_DIR = /tmp/purifycache
-PURE_CACHE_DIR = $(PURE_CACHE_BASE_DIR)-$(LOGNAME)-$(notdir $(CXX) )
-
-ifdef purify
- #### Pick up Purify directory from the users PATH.
- ACE_PURIFY_DIR := \
- $(shell type purify | sed -e 's/.* is //' -e 's%/purify$$%%')
-
- #### You might want to adjust the Purify options below.
- #### -best-effort is undocumented but supported, and seems
- #### to help avoid occasional link failure.
- #### SIGINT is used by the ACE Thread_Manager_Test.
- PURELINK += purify -best-effort -cache-dir=$(PURE_CACHE_DIR) \
- -chain-length=20 -fds-inuse-at-exit=no -ignore-signals=SIGINT \
- -inuse-at-exit -max_threads=100
- CCFLAGS += -DACE_HAS_PURIFY
- CPPFLAGS += -I$(ACE_PURIFY_DIR)
-endif # purify
-
-ifeq ($(quantify),0)
- override quantify =
-endif # quantify
-
-ifdef quantify
- #### Pick up Quantify directory from the users PATH.
- ACE_QUANTIFY_DIR := \
- $(shell type quantify | sed -e 's/.* is //' -e 's%/quantify$$%%')
-
- #### You might want to adjust the Quantify options below.
- #### -best-effort is undocumented but supported, and seems
- #### to help avoid occasional link failure.
- PRELINK += quantify -best-effort -cache-dir=$(PURE_CACHE_DIR) \
- -max_threads=100
- CCFLAGS += -DACE_HAS_QUANTIFY
- CPPFLAGS += -I$(ACE_QUANTIFY_DIR)
-
- ifeq ($(shell uname -p),sparc)
- PRELINK += -record-register-window-traps
- endif # sparc
-endif # quantify
-
-ifeq ($(repo),0)
- override repo =
-endif # repo
-
-ifdef repo
- #### Remove -fno-implicit-templates from, and add -frepo to, CCFLAGS.
- CCFLAGS := $(strip $(subst -fno-implicit-templates,,$(CCFLAGS)))
- CCFLAGS += -frepo -DACE_HAS_GNU_REPO
-endif # repo
-
-#----------------------------------------------------------------------------
-# Conditional macro definitions
-#----------------------------------------------------------------------------
-
-COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
-COMPILE.cc = $(CXX) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS) -c
-COMPILE-NO_DASH_G.cc = `echo $(COMPILE.cc) | sed 's/-g //'`
-# 960905 Marius Kjeldahl <marius@funcom.com>
-# Added the line below to be used for compiling executable shared objects
-COMPILEESO.cc = $(CXX) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS)
-
-ifeq ($(LINK.c),override)
- LINK.c = $(LINK.c.override)
-else
- LINK.c = $(PURELINK) $(PRELINK) $(LD) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) \
- $(LDLIBS) $(LIBS)
-endif # LINK.c.override
-
-ifeq ($(LINK.cc),override)
- LINK.cc = $(LINK.cc.override)
-else
- LINK.cc = $(PURELINK) $(PRELINK) $(LD) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS)
-endif # LINK.cc.override
-
-SOLINK.cc = $(PRELINK) $(DLD) $(SOFLAGS)