added PIC= with static_libs_only, and added list of supported make flags

1 files changed, 116 insertions, 90 deletions

diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index 29b7d4278fa..e054ff207b7 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -1,101 +1,122 @@
-#----------------------------------------------------------------------------
-#	$Id$
+>#----------------------------------------------------------------------------
+#  $Id$
 #----------------------------------------------------------------------------
 #
-# Please see the README file in this directory to get a complete listing
-# of all the platform compilation macros that may be defined to port ACE.
-
-#	The following describes the ACE wrapper macros
+#  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.  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).
+#  fast             Enable -fast option, e.g., with Sun C++.
+#  optimize         Enable optimization; see OCFLAGS and OCCFLAGS.
+#  orbix            Enable use of Orbix.
+#  profile          Enable profiling; see PCFLAGS and PCCFLAGS.
+#  purify           Purify all executables.
+#  quantify         Quantify all executables.
+#  static_libs_only Only build static libraries.
+#  shared_libs_only Only build shared libraries, but may be overridden in
+#                     individual Makefiles, e.g., in performance-tests/Misc.
 #
-#	Variable	Description
-#	--------	-----------
-#	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
-#	PRELINK		Executable to precede linking, such as purify or quantify
-#	PTDIRS		Pathnames of directories containing template code
-#	RM		Name of program to use to remove files
-#	SOFLAGS		Flags used to build a shared library
-#	SOBUILD		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
+#  The following describes the ACE wrapper macros:
+#
+#  Variable     Description
+#  --------     -----------
+#  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
+#  PRELINK      Executable to precede linking, such as purify or quantify
+#  PTDIRS       Pathnames of directories containing template code
+#  RM           Name of program to use to remove files
+#  SOFLAGS      Flags used to build a shared library
+#  SOBUILD      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
+#       Platform-dependent macro definitions
 #       (link to the appropriate platform-specific config file).
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
 
 #----------------------------------------------------------------------------
-#	Platform-independent macro definitions
+#       Platform-independent macro definitions
 #----------------------------------------------------------------------------
 
-CPPFLAGS	+= $(DEFFLAGS) $(INCLDIRS)
-IDL		= idl
-IDLFLAGS	= -s S.cpp -c C.cpp
-INCLDIRS	+= -I. -I$(ACE_ROOT)
-INSBIN		= $(ACE_ROOT)/bin
-INSINC		= $(ACE_ROOT)/ace
-INSLIB		= $(ACE_ROOT)/ace
-INSMAN		= $(ACE_ROOT)/man
-LDFLAGS		+= -L$(ACE_ROOT)/ace -L./
-LEX		= flex
-OCFLAGS		+= -O
-OCCFLAGS	+= -O
-PCFLAGS		+= #### set in platform_macros.GNU file, e.g., -p
-PCCFLAGS	+= #### set in platform_macros.GNU file, e.g., -p
-RM		= /bin/rm
-VAR		=
-VDIR		= .obj/
+CPPFLAGS        += $(DEFFLAGS) $(INCLDIRS)
+IDL             = idl
+IDLFLAGS        = -s S.cpp -c C.cpp
+INCLDIRS        += -I. -I$(ACE_ROOT)
+INSBIN          = $(ACE_ROOT)/bin
+INSINC          = $(ACE_ROOT)/ace
+INSLIB          = $(ACE_ROOT)/ace
+INSMAN          = $(ACE_ROOT)/man
+LDFLAGS         += -L$(ACE_ROOT)/ace -L./
+LEX             = flex
+OCFLAGS         += -O
+OCCFLAGS        += -O
+PCFLAGS         += #### set in platform_macros.GNU file, e.g., -p
+PCCFLAGS        += #### set in platform_macros.GNU file, e.g., -p
+RM              = /bin/rm
+VAR             =
+VDIR            = .obj/
 ifndef ACELIB
 ACELIB = -lACE
 endif
 ifndef  VSHDIR
-VSHDIR		= .shobj/
+VSHDIR          = .shobj/
 endif # VSHDIR
 # NOTE: VLDLIBS is defined below, in case it is overridden for static-
 #       or shared-only builds.
-YACC		= yacc
+YACC            = yacc
 
 #----------------------------------------------------------------------------
-#	Conditional macro definitions
+#       Conditional macro definitions
 #----------------------------------------------------------------------------
 
 ifdef debug
-CFLAGS 	+= $(DCFLAGS)
-CCFLAGS	+= $(DCCFLAGS)
+CFLAGS  += $(DCFLAGS)
+CCFLAGS += $(DCCFLAGS)
 
 else
 ifdef profile
-CFLAGS 	+= $(PCFLAGS)
-CCFLAGS	+= $(PCCFLAGS)
+CFLAGS  += $(PCFLAGS)
+CCFLAGS += $(PCCFLAGS)
 
 else
 ifdef optimize
@@ -120,50 +141,55 @@ ifdef static_libs_only
   #### don't build shared objects:
   BUILD           = $(VLIB) $(VBIN)
   OBJDIRS         = .obj
+  PIC             =
   SHLIB           =
   SHOBJ           = $(addsuffix .o,$(FILES))
   SOEXT           = o
   VSHDIR          = .obj/
-  VLDLIBS         = $(LDLIBS:%.$(SOEXT)=%.o)
+  VLDLIBS         = $(LDLIBS:%.so=%.o)
 endif # static_libs_only
 endif # shared_libs_only
+
 ifdef SHLIBA
-VLDLIBS :=$(VLDLIBS) -lACEshr $(LIBS)
+  VLDLIBS := $(LDLIBS) -lACEshr $(LIBS)
 else
-VLDLIBS :=$(VLDLIBS) $(ACELIB) $(LIBS)
-endif
+  VLDLIBS := $(LDLIBS) $(ACELIB) $(LIBS)
+endif # SHLIBA
 
 ifdef 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=/tmp/purifycache -max_threads=100
+  #### 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=/tmp/purifycache -max_threads=100
 endif # quantify
 
 ifdef 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.
-PRELINK += purify -best-effort -cache-dir=/tmp/purifycache -chain-length=20 -fds-inuse-at-exit=no -ignore-signals=SIGINT -inuse-at-exit -max_threads=100
+  #### 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.
+  PRELINK += purify -best-effort -cache-dir=/tmp/purifycache -chain-length=20 \
+             -fds-inuse-at-exit=no -ignore-signals=SIGINT -inuse-at-exit \
+             -max_threads=100
 endif # purify
 
-COMPILE.c	= $(CC) $(CFLAGS) $(CPPFLAGS) -c
-COMPILE.cc	= $(CXX) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS) -c
+COMPILE.c       = $(CC) $(CFLAGS) $(CPPFLAGS) -c
+COMPILE.cc      = $(CXX) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS) -c
 # 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)
+  LINK.c        = $(LINK.c.override)
 else
-  LINK.c	= $(PRELINK) $(LD) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LDLIBS) $(LIBS)
+  LINK.c        = $(PRELINK) $(LD) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LDLIBS) \
+                  $(LIBS)
 endif # LINK.c.override
 
 ifeq ($(LINK.cc),override)
-  LINK.cc	= $(LINK.cc.override)
+  LINK.cc       = $(LINK.cc.override)
 else
-  LINK.cc	= $(PRELINK) $(LD) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS)
+  LINK.cc       = $(PRELINK) $(LD) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS)
 endif # LINK.cc.override
 
-SOLINK.cc	= $(PRELINK) $(DLD) $(SOFLAGS)
+SOLINK.cc       = $(PRELINK) $(DLD) $(SOFLAGS)