14 files changed, 43 insertions, 333 deletions
diff --git a/include/makeinclude/platform_linux_lxpthread.GNU b/include/makeinclude/platform_linux_lxpthread.GNU
index 606a4a04f16..0c76c5d298c 100644
--- a/include/makeinclude/platform_linux_lxpthread.GNU
+++ b/include/makeinclude/platform_linux_lxpthread.GNU
@@ -10,25 +10,6 @@
 
 debug = 1
 optimize = 1
-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=
 
 ifeq ($(NO_IMPLICIT_TEMPLATES),)
       NO_IMPLICIT_TEMPLATES = -fno-implicit-templates
diff --git a/include/makeinclude/platform_linux_lxpthreads.GNU b/include/makeinclude/platform_linux_lxpthreads.GNU
index 606a4a04f16..0c76c5d298c 100644
--- a/include/makeinclude/platform_linux_lxpthreads.GNU
+++ b/include/makeinclude/platform_linux_lxpthreads.GNU
@@ -10,25 +10,6 @@
 
 debug = 1
 optimize = 1
-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=
 
 ifeq ($(NO_IMPLICIT_TEMPLATES),)
       NO_IMPLICIT_TEMPLATES = -fno-implicit-templates
diff --git a/include/makeinclude/platform_osf1_4.0.GNU b/include/makeinclude/platform_osf1_4.0.GNU
index b42e8f96499..9526765dcd2 100644
--- a/include/makeinclude/platform_osf1_4.0.GNU
+++ b/include/makeinclude/platform_osf1_4.0.GNU
@@ -19,6 +19,7 @@ endif # CXX_VERSION
 
 CXX_1016 =
 CXX_1136 =
+CXX_1180 =
 
 ifneq (,$(optimize))
   CXX_1016 = ,1016
@@ -32,6 +33,8 @@ ifeq (6.1-,$(findstring 6.1-,$(CXX_VERSION)))
   endif # 6.1-029
 else  # 6.2 or later
   CXX_1136 = ,1136
+  #### 6.2-009 has 1180, but 6.2-007 doesn't.
+  CXX_1180 = ,1180
 endif # 6.2 or later
 endif # ! 6.0
 
@@ -40,23 +43,21 @@ endif # ! 6.0
 #### CXX_VER to CXX_5 either on the make command line, or by
 #### or by setting the CXX_VER environment variable to CXX_5.
 # WARNING_FLAGS +=
+#    9: nested comment not allowed.  But there's one in /usr/include/pdsc.h!
+#  174: expr_has_no_effect
 #  193: zero used for undefined preprocessing identifier
 #  236: controlling expression is constant
 #  401: base_class_with_nonvirtual_dtor
+#  610: nonoverriding_function_decl
 #  835: unreferenced_function_param
 #  839: no_corresponding_delete (until this is fixed in libTAO)
 # 1016: expected type is incompatible with declared type of int (in bzero ())
 # 1136: conversion to integral type of smaller size could lose data
+# 1180: statement causes unreachable return
 ifneq ($(CXX_VER),CXX_5)
-  WARNING_FLAGS += -w0 -msg_display_number -msg_display_tag
+  WARNING_FLAGS += -w0 -msg_display_number
   WARNING_FLAGS += \
-    -msg_disable 193,236,401,835,839$(CXX_1016)$(CXX_1136)
-
-  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
+    -msg_disable 9,174,193,236,401,610,835,839$(CXX_1016)$(CXX_1136)$(CXX_1180)
 endif # 6.0 or later
 
 CCFLAGS         += $(CFLAGS) -ptr ptrepository $(WARNING_FLAGS)
diff --git a/include/makeinclude/platform_osf1_cxx.GNU b/include/makeinclude/platform_osf1_cxx.GNU
deleted file mode 100644
index 3b1c6fc7fd3..00000000000
--- a/include/makeinclude/platform_osf1_cxx.GNU
+++ /dev/null
@@ -1,35 +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
-
-  CFLAGS += -DDIGITAL_UNIX=4
-  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=5
-
-  ifeq (6.,$(findstring 6.,$(CXX_VERSION)))
-    #### variable "PTHREAD_THIS_CATCH_NP" was declared but never referenced
-    WARNING_FLAGS += -msg_disable 177
-  endif # 6.0 or later
-
-  SOFLAGS = -shared -use_ld_input $(ACELIB)
-endif # 5.x
-endif # ! 4.x
-endif # ! 3.x
diff --git a/include/makeinclude/platform_psos_diab_ppc.GNU b/include/makeinclude/platform_psos_diab_ppc.GNU
index 5bfe2b61993..0216a4bbc80 100644
--- a/include/makeinclude/platform_psos_diab_ppc.GNU
+++ b/include/makeinclude/platform_psos_diab_ppc.GNU
@@ -37,7 +37,10 @@ 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  //original line
+#sandass's stuff is below
 DIAB_PSOS_HACKS = -D__Itypes -D_WCHAR_T_DEFINED -D__wchar_t  
+# DIAB_PSOS_HACKS = -D__Itypes -D_WCHAR_T_DEFINED -D__wchar_t
 
 # ================================================================
 # Compilation Settings and Flags
@@ -88,12 +91,8 @@ CFLAGS += -D__DIAB -D__DIAB_42a -Xkill-opt=0x400 -Xno-old-style -Xlint $(PSOSINC
 # -# 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.
+# -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
@@ -108,12 +107,8 @@ CFLAGS += -D__DIAB -D__DIAB_42a -Xkill-opt=0x400 -Xno-old-style -Xlint $(PSOSINC
 #    -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
+# sandass was here
 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
 
@@ -148,11 +143,11 @@ DCCFLAGS         +=  $(DCFLAGS)
 
 # Dynamic Linker
 # DLD             = dld
-DLD             = dplus -tPPC860ES:psos -Wm $(PSS_BSP)/ram.dld $(PSS_BSP)/anchor.dld
+DLD             = dplus -tPPC860ES:psos -Wm$(PSS_BSP)/ram.lnk
 
 # Static Linker
 # LD              = dld
-LD              = dplus -tPPC860ES:psos -Wm $(PSS_BSP)/ram.dld $(PSS_BSP)/anchor.dld
+LD              = dplus -tPPC860ES:psos -Wm$(PSS_BSP)/ram.lnk
 
 # Static Linker Flags
 # -L<path> adds a directory path to the linker search path
diff --git a/include/makeinclude/platform_sunos5_ghs.GNU b/include/makeinclude/platform_sunos5_ghs.GNU
index b0143f3162a..862aec77e51 100644
--- a/include/makeinclude/platform_sunos5_ghs.GNU
+++ b/include/makeinclude/platform_sunos5_ghs.GNU
@@ -4,10 +4,12 @@
 
 debug = 1
 optimize = 1
+threads = 1
 exceptions =
 
-#### Green Hills 1.8.9 isn't compatible with the SunOS threads libraries.
-threads =
+ifeq ($(threads),0)
+  CFLAGS += -DACE_MT_SAFE=0
+endif # threads
 
 CC       = gcx
 CXX      = $(CC)
@@ -16,7 +18,7 @@ DCFLAGS  += -g
 DLD      = $(CXX)
 LD       = $(CXX)
 LDFLAGS  = --no_auto_instantiation
-LIBS     += -lsocket -ldl -lgen -lnsl -lposix4
+LIBS     += -lsocket -ldl -lgen -lnsl -lposix4 -lthread
 OCFLAGS  += -OL -OM
 PIC      = -PIC
 RANLIB   = @true
@@ -25,12 +27,6 @@ ARFLAGS  = -archive -o
 RANLIB   = @true
 SOFLAGS  = -shared
 
-ifeq ($(threads),1)
-  LIBS += -lthread
-else  # ! threads
-  CFLAGS += -DACE_MT_SAFE=0
-endif # ! threads
-
 ifdef exceptions
   CCFLAGS += --exceptions
 else  # ! 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
index 1fda9c3cd58..7e38c4d129a 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -28,17 +28,6 @@ debug = 1
 distrib = 0
 threads = 1
 
-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
diff --git a/include/makeinclude/platform_tru64_cxx.GNU b/include/makeinclude/platform_tru64_cxx.GNU
deleted file mode 100644
index 3b1c6fc7fd3..00000000000
--- a/include/makeinclude/platform_tru64_cxx.GNU
+++ /dev/null
@@ -1,35 +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
-
-  CFLAGS += -DDIGITAL_UNIX=4
-  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=5
-
-  ifeq (6.,$(findstring 6.,$(CXX_VERSION)))
-    #### variable "PTHREAD_THIS_CATCH_NP" was declared but never referenced
-    WARNING_FLAGS += -msg_disable 177
-  endif # 6.0 or later
-
-  SOFLAGS = -shared -use_ld_input $(ACELIB)
-endif # 5.x
-endif # ! 4.x
-endif # ! 3.x
diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU
index cd871eebf20..7438b6fc007 100644
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ b/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -17,7 +17,6 @@ CROSS-COMPILE = 1
 
 debug = 1
 optimize = 1
-rtti =
 shared_libs =
 static_libs = 1
 
@@ -77,13 +76,6 @@ ifeq ($(CPU),PPC604)
   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
@@ -101,7 +93,6 @@ else
   CCFLAGS += -fno-implicit-templates
 endif # I80386
 endif # I80486
-endif # PPC860
 endif # PPC604
 
 
@@ -116,38 +107,12 @@ else  # ! x86-win32
   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) -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 \
                   $(ACE_QUOTE)$(COMPILE.c) -traditional$(ACE_QUOTE) \
@@ -157,6 +122,8 @@ LDFLAGS         += -X -r
 #### the i386 family.  And -O2 causes some compilation failures.
 OCFLAGS         += -O
 PIC             =
+AR              = ar$(TOOLENV)
+ARFLAGS         = rv
 
 
 #### ld can't handle INCLDIRS, so override LINK definitions.
diff --git a/include/makeinclude/platform_vxworks5.x_ghs.GNU b/include/makeinclude/platform_vxworks5.x_ghs.GNU
index 8628c58480c..4dd02f18c97 100644
--- a/include/makeinclude/platform_vxworks5.x_ghs.GNU
+++ b/include/makeinclude/platform_vxworks5.x_ghs.GNU
@@ -1,6 +1,6 @@
 # $Id$
 #
-# VxWorks 5.2-5.3.1 with Green Hills 1.8.8 and 1.8.9
+# VxWorks 5.2-5.3.1 with Green Hills 1.8.8
 
 #### Notes:
 #### 1) This file requires that your PATH be set to include the location
@@ -58,12 +58,7 @@ ifeq ($(CPU),86)
   endif # GHS
   AR = $(WIND_BASE)/host/$(WIND_HOST_TYPE)/bin/ar386
   ARFLAGS  = rsu
-
-  #### For GHS 1.8.8:
-  #### LIBS += $(GHS)/libedgnoe.a
-
-  #### For GHS 1.8.9:
-  LIBS += $(GHS)/libscnoe.a $(GHS)/libsedgnoe.a $(GHS)/liblockinit_sc.o
+  LIBS += $(GHS)/libedgnoe.a
 else
 ifeq ($(CPU),ppc)
   ifndef GHS
diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU
index 14b8ea5e2e2..bd7fea06c6d 100644
--- a/include/makeinclude/rules.lib.GNU
+++ b/include/makeinclude/rules.lib.GNU
@@ -11,33 +11,32 @@
 #----------------------------------------------------------------------------
 
 ifndef OBJEXT
-  OBJEXT=o
+OBJEXT=o
 endif
 
 ifndef SOEXT
-  SOEXT=so
+SOEXT=so
 endif
 
 VSHLIB  = $(SHLIB:%.$(SOEXT)=%$(VAR).$(SOEXT))
 VLOBJS   = $(subst .cpp,.$(OBJEXT),$(foreach file,$(LSRC),$(VDIR)$(notdir $(file))))
 
 ifdef TEMPINCDIR
-  VSHOBJS1 =
-else  # ! TEMPINCDIR
-  LSRC    += $(LSRC2)
+VSHOBJS1 =
+else
+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
-endif # ! TEMPINCDIR
+VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))
+else
+VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))
+endif
+VSHOBJS1 = $(VSHOBJS)
+else
+VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))
+VSHOBJS1 = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))
+endif
+endif
 
 # Comment out for now...
 # $(DEFS:%=$(INSINC)/%) \
diff --git a/include/makeinclude/rules.nested.GNU b/include/makeinclude/rules.nested.GNU
index 16636a25a25..c7bb0735907 100644
--- a/include/makeinclude/rules.nested.GNU
+++ b/include/makeinclude/rules.nested.GNU
@@ -7,7 +7,7 @@
 $(TARGETS_NESTED):
 ifneq ($(DIRS),)
 ifeq (Windows,$(findstring Windows,$(OS)))
-	@cmd /c "FOR /D %i IN ($(DIRS)) DO $(MAKE) -C %i $(@:.nested=)"
+	@FOR /D %i IN ($(DIRS)) DO $(MAKE) -C %i $(@:.nested=)
 else  # ! Windows
 	@for dir in $(DIRS); do $(MAKE) -C $$dir $(@:.nested=); done
 endif # ! Windows
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index a36f854f89a..be6035f5f93 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -39,8 +39,6 @@
 #  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
@@ -246,57 +244,11 @@ ifeq ($(xt_reactor),0)
 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 ($(findstring g++,$(CXX)),g++)
@@ -375,9 +327,7 @@ ifdef shared_libs
       BUILD         = $(VSHLIB) $(SHLIBA) $(VBIN)
       LIB           =
       OBJEXT        = so
-      ifndef VXWORKS
-        VDIR        = .shobj/
-      endif # ! VXWORKS
+      VDIR          = .shobj/
       ifeq ($(BIN),)
         #### No executables are being built, so don't create .obj/.
         OBJDIRS     = .shobj