diff options
Diffstat (limited to 'include')
105 files changed, 0 insertions, 9332 deletions
diff --git a/include/makeinclude/all_in_one.GNU b/include/makeinclude/all_in_one.GNU deleted file mode 100644 index c2a718508ad..00000000000 --- a/include/makeinclude/all_in_one.GNU +++ /dev/null @@ -1,72 +0,0 @@ -# -*- Makefile -*- - -#---------------------------------------------------------------------------- -# $Id$ -#---------------------------------------------------------------------------- - -# Only include once. -ifndef ALL_IN_ONE_GNU -ALL_IN_ONE_GNU = 1 - -# Include wrapper macros to all user defines, etc. -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU - -TAO_ROOT ?= $(ACE_ROOT)/TAO - -ifneq ($(ADDITIONAL_INCLUDE),) - include $(ADDITIONAL_INCLUDE) -endif - -# Now test for installed components, and set the BIN. LIB, and SHLIB -# targets from the *_UNCHECKED ones if the component checks -# succeed. Client Makefile must set the variable REQUIRED_COMPONENTS -# with a list of required components. If no additional components -# are required, REQUIRED_COMPONENTS need not be set. -include $(ACE_ROOT)/include/makeinclude/component_check.GNU - -# If no required components are missing, set the real targets -ifeq ($(MISSING_COMPONENTS),) - ifdef BIN_UNCHECKED - BIN += $(BIN_UNCHECKED) - endif # !BIN_UNCHECKED - ifdef static_libs - ifdef LIB_UNCHECKED - LIB += $(LIB_UNCHECKED) - endif # !LIB_UNCHECKED - endif # static_libs - ifdef shared_libs - ifdef SHLIB_UNCHECKED - SHLIB += $(SHLIB_UNCHECKED) - endif # !SHLIB_UNCHECKED - endif # !shared_libs -endif # COMPILE_COMPONENT - -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU - -ifdef DIRS - include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -else # !DIRS - include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -endif # DIRS -ifdef CLEANUP_LIB - include_lib = 1 -endif # LIB - -ifdef CLEANUP_SHLIB - include_lib = 1 -endif # SHLIB - -ifeq ($(include_lib),1) - include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -endif - -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -# Remove the -g option if requested. -SUPPRESS_DASH_G ?= -ifeq ($(SUPPRESS_DASH_G),1) - DCFLAGS := $(filter-out -g, $DCFLAGS) -endif - -endif # ALL_IN_ONE_GNU diff --git a/include/makeinclude/build_dll.bor b/include/makeinclude/build_dll.bor deleted file mode 100644 index 7bfded1e82d..00000000000 --- a/include/makeinclude/build_dll.bor +++ /dev/null @@ -1,118 +0,0 @@ -# -# $Id$ -# -# 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 -# DEBUG - if defined means building with debug information -# UNICODE - if defined when building a unicode dll -# - -# Check if the output location was explicitly specified. -!if $d(BASE_BINDIR) || $d(BINDIR) -EXPLICIT_BINDIR = 1 -!endif - -!ifdef INSTALL_THIS_TARGET -!ifndef EXPLICIT_BINDIR -BINDIR = $(CORE_BINDIR) -!endif -!endif - -!include <$(ACE_ROOT)\include\makeinclude\decorator.bor> -!include <$(ACE_ROOT)\include\makeinclude\outputdir.bor> -!include <$(ACE_ROOT)\include\makeinclude\compiler.bor> - -!ifdef NAME -!ifndef TARGET -TARGET = $(BINDIR)\$(NAME)$(LIB_DECORATOR).dll -!endif -!ifndef INSTALL_THIS_TARGET -!ifndef EXPLICIT_BINDIR -CORE_TARGET = $(CORE_BINDIR)\$(NAME)$(LIB_DECORATOR).dll -!endif -!endif -!endif - -all: $(TARGET) $(CORE_TARGET) - @echo Do nothing >NUL - -!ifdef TARGET -$(TARGET): $(OBJFILES) $(RESOURCE) - @$(MAKE_BINDIR) - $(LD) @&&! - $(COMMON_LFLAGS) $(DLL_LFLAGS) $(LFLAGS) + - $(DLL_STARTUP_OBJ) $(LIBFILES) $(OBJFILES), + - $(TARGET),, + - $(COMMON_LIBS),, + - $(RESOURCE) -! -!ifndef DEBUG - @del $(TARGET:.dll=.tds) -!endif -!ifdef CORE_TARGET -$(CORE_TARGET): $(TARGET) - @copy $(TARGET) $(CORE_TARGET) >NUL -!ifdef DEBUG - @copy $(TARGET:.dll=.tds) $(CORE_TARGET:.dll=.tds) >NUL -!endif -!endif -!endif - -!include <$(ACE_ROOT)\include\makeinclude\clean.bor> - -INSTALL_TYPES = dll lib includes - -!include <$(ACE_ROOT)\include\makeinclude\install.bor> - -!ifdef CPPDIR -.path.cpp = $(CPPDIR) -!endif - -!ifdef CDIR -.path.c = $(CDIR) -!endif - -!ifdef RESDIR -.path.rc = $(RESDIR) -!else -.path.rc = . -!endif - -.path.$(OBJ_EXT) = $(OBJDIR) - -!ifdef DEBUG -!ifndef NO_FULL_PATH -USE_FULL_PATH = 1 -!endif -!endif - -.cpp.$(OBJ_EXT): - @$(MAKE_OBJDIR) -!ifdef USE_FULL_PATH - @for /F "delims=;" %i in ('cd') do @echo $(CC) $(COMMON_CFLAGS) $(DLL_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$(<:.\=) - @for /F "delims=;" %i in ('cd') do @$(CC) $(COMMON_CFLAGS) $(DLL_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$(<:.\=) -!else - $(CC) $(COMMON_CFLAGS) $(DLL_CFLAGS) $(CFLAGS) -c -n$(@D) $< -!endif - -.c.$(OBJ_EXT): - @$(MAKE_OBJDIR) -!ifdef USE_FULL_PATH - @for /F "delims=;" %i in ('cd') do @echo $(CC) $(COMMON_CFLAGS) $(DLL_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$(<:.\=) - @for /F "delims=;" %i in ('cd') do @$(CC) $(COMMON_CFLAGS) $(DLL_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$(<:.\=) -!else - $(CC) $(COMMON_CFLAGS) $(DLL_CFLAGS) $(CFLAGS) -c -n$(@D) $< -!endif - -.rc.res: - @$(MAKE_OBJDIR) - $(RC) $(RC_FLAGS) -fo$@ $< - -.autodepend diff --git a/include/makeinclude/build_exe.bor b/include/makeinclude/build_exe.bor deleted file mode 100644 index 3387e6e5cf5..00000000000 --- a/include/makeinclude/build_exe.bor +++ /dev/null @@ -1,114 +0,0 @@ -# -# $Id$ -# -# 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 -# DEBUG - if defined means building with debug information -# UNICODE - if defined when building a unicode exe -# - -# Check if the output location was explicitly specified. -!if $d(BASE_BINDIR) || $d(BINDIR) -EXPLICIT_BINDIR = 1 -!endif - -!include <$(ACE_ROOT)\include\makeinclude\decorator.bor> -!include <$(ACE_ROOT)\include\makeinclude\outputdir.bor> -!include <$(ACE_ROOT)\include\makeinclude\compiler.bor> - -!ifdef NAME -!ifndef TARGET -TARGET = $(BINDIR)\$(NAME).exe -!endif -!ifdef INSTALL_THIS_TARGET -!ifndef EXPLICIT_BINDIR -CORE_TARGET = $(CORE_BINDIR)\$(NAME).exe -!endif -!endif -!endif - -all: $(TARGET) $(CORE_TARGET) - @echo Do nothing >NUL - -!ifdef TARGET -$(TARGET): $(OBJFILES) $(RESOURCE) - @$(MAKE_BINDIR) - $(LD) @&&! - $(COMMON_LFLAGS) $(EXE_LFLAGS) $(LFLAGS) + - $(EXE_STARTUP_OBJ) $(PACKAGES) $(LIBFILES) $(OBJFILES), + - $(TARGET),, + - $(COMMON_LIBS),, + - $(RESOURCE) -! -!ifndef DEBUG - @del $(TARGET:.exe=.tds) -!endif -!ifdef CORE_TARGET -$(CORE_TARGET): $(TARGET) - @copy $(TARGET) $(CORE_TARGET) >NUL -!ifdef DEBUG - @copy $(TARGET:.exe=.tds) $(CORE_TARGET:.exe=.tds) >NUL -!endif -!endif -!endif - - -!include <$(ACE_ROOT)\include\makeinclude\clean.bor> - -INSTALL_TYPES = exe - -!include <$(ACE_ROOT)\include\makeinclude\install.bor> - -!ifdef CPPDIR -.path.cpp = $(CPPDIR) -!endif - -!ifdef CDIR -.path.c = $(CDIR) -!endif - -!ifdef RESDIR -.path.rc = $(RESDIR) -!else -.path.rc = . -!endif - -.path.$(OBJ_EXT) = $(OBJDIR) - -!ifdef DEBUG -!ifndef NO_FULL_PATH -USE_FULL_PATH = 1 -!endif -!endif - -.cpp.$(OBJ_EXT): - @$(MAKE_OBJDIR) -!ifdef USE_FULL_PATH - @for /F "delims=;" %i in ('cd') do @echo $(CC) $(COMMON_CFLAGS) $(EXE_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$(<:.\=) - @for /F "delims=;" %i in ('cd') do @$(CC) $(COMMON_CFLAGS) $(EXE_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$(<:.\=) -!else - $(CC) $(COMMON_CFLAGS) $(EXE_CFLAGS) $(CFLAGS) -c -n$(@D) $< -!endif - -.c.$(OBJ_EXT): - @$(MAKE_OBJDIR) -!ifdef USE_FULL_PATH - @for /F "delims=;" %i in ('cd') do @echo $(CC) $(COMMON_CFLAGS) $(EXE_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$(<:.\=) - @for /F "delims=;" %i in ('cd') do @$(CC) $(COMMON_CFLAGS) $(EXE_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$(<:.\=) -!else - $(CC) $(COMMON_CFLAGS) $(EXE_CFLAGS) $(CFLAGS) -c -n$(@D) $< -!endif - -.rc.res: - @$(MAKE_OBJDIR) - $(RC) $(RC_FLAGS) -fo$@ $< - -.autodepend diff --git a/include/makeinclude/build_lib.bor b/include/makeinclude/build_lib.bor deleted file mode 100644 index a16909869bc..00000000000 --- a/include/makeinclude/build_lib.bor +++ /dev/null @@ -1,106 +0,0 @@ -# -# $Id$ -# -# 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 -# DEBUG - if defined means building with debug information -# UNICODE - if defined when building a unicode lib -# - -# Check if the output location was explicitly specified. -!if $d(BASE_BINDIR) || $d(BINDIR) -EXPLICIT_BINDIR = 1 -!endif - -!ifdef INSTALL_THIS_TARGET -!ifndef EXPLICIT_BINDIR -BINDIR = $(CORE_BINDIR) -!endif -!endif - -!include <$(ACE_ROOT)\include\makeinclude\decorator.bor> -!include <$(ACE_ROOT)\include\makeinclude\outputdir.bor> -!include <$(ACE_ROOT)\include\makeinclude\compiler.bor> - -!ifdef NAME -!ifndef TARGET -TARGET = $(BINDIR)\$(NAME)$(LIB_DECORATOR).lib -!endif -!endif - -all: $(TARGET) - @echo Do nothing >NUL - -!ifdef CBX -!ifdef TARGET -$(TARGET): $(OBJFILES) - @$(MAKE_BINDIR) - -@del $(TARGET) 2>NUL - $(AR) -M < @&&! -VERBOSE -CREATE $@ -ADDMOD $(OBJFILES:\=/) -SAVE -END -! -!endif -!else -!ifdef TARGET -$(TARGET): $(OBJFILES) - @$(MAKE_BINDIR) - -@del $(TARGET) 2>NUL - $(AR) $(LIB_LFLAGS) $(TARGET) @&&! -+ $(**: = &^ -+ ) -! -!endif -!endif - -!include <$(ACE_ROOT)\include\makeinclude\clean.bor> - -INSTALL_TYPES = lib includes - -!include <$(ACE_ROOT)\include\makeinclude\install.bor> - -!ifdef CPPDIR -.path.cpp = $(CPPDIR) -!endif - -!ifdef CDIR -.path.c = $(CDIR) -!endif - -.path.$(OBJ_EXT) = $(OBJDIR) - -!ifdef DEBUG -!ifndef NO_FULL_PATH -USE_FULL_PATH = 1 -!endif -!endif - -.cpp.$(OBJ_EXT): - @$(MAKE_OBJDIR) -!ifdef USE_FULL_PATH - @for /F "delims=;" %i in ('cd') do @echo $(CC) $(COMMON_CFLAGS) $(LIB_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$(<:.\=) - @for /F "delims=;" %i in ('cd') do @$(CC) $(COMMON_CFLAGS) $(LIB_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$(<:.\=) -!else - $(CC) $(COMMON_CFLAGS) $(LIB_CFLAGS) $(CFLAGS) -c -n$(@D) $< -!endif - -.c.$(OBJ_EXT): - @$(MAKE_OBJDIR) -!ifdef USE_FULL_PATH - @for /F "delims=;" %i in ('cd') do @echo $(CC) $(COMMON_CFLAGS) $(LIB_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$(<:.\=) - @for /F "delims=;" %i in ('cd') do @$(CC) $(COMMON_CFLAGS) $(LIB_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$(<:.\=) -!else - $(CC) $(COMMON_CFLAGS) $(LIB_CFLAGS) $(CFLAGS) -c -n$(@D) $< -!endif - -.autodepend diff --git a/include/makeinclude/build_library.bor b/include/makeinclude/build_library.bor deleted file mode 100644 index 1e2d293fd7d..00000000000 --- a/include/makeinclude/build_library.bor +++ /dev/null @@ -1,12 +0,0 @@ -# -# $Id$ -# -# 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/clean.bor b/include/makeinclude/clean.bor deleted file mode 100644 index bdc7752e8a6..00000000000 --- a/include/makeinclude/clean.bor +++ /dev/null @@ -1,139 +0,0 @@ -# -# $Id$ -# -# Rules for cleaning up intermediate files -# - -!ifdef CBX -clean: clean_cbx -realclean: realclean_cbx -!else -clean: clean_bcb -realclean: realclean_bcb -!endif - -clean_bcb: - @copy &&! -@del $(OBJFILES:.obj=.obj ^ -@del ) $(IDLFILES:.idl=C.cpp ^ -@del ) $(IDLFILES:.idl=C.h ^ -@del ) $(IDLFILES:.idl=C.i ^ -@del ) $(IDLFILES:.idl=S.cpp ^ -@del ) $(IDLFILES:.idl=S.h ^ -@del ) $(IDLFILES:.idl=S.i ^ -@del ) $(IDLFILES:.idl=S_T.cpp ^ -@del ) $(IDLFILES:.idl=S_T.h ^ -@del ) $(IDLFILES:.idl=S_T.i ^ -@del ) $(IDLFILES:.idl=Cli.cpp ^ -@del ) $(IDLFILES:.idl=Cli.h ^ -@del ) $(IDLFILES:.idl=Cli.i ^ -@del ) $(IDLFILES:.idl=Ser.cpp ^ -@del ) $(IDLFILES:.idl=Ser.h ^ -@del ) $(IDLFILES:.idl=Ser.i ^ -@del ) $(IDLFILES:.idl=Ser_T.cpp ^ -@del ) $(IDLFILES:.idl=Ser_T.h ^ -@del ) $(IDLFILES:.idl=Ser_T.i ^ -@del ) $(RESOURCE) -! clean_$(NAME)~.bat 1> NUL - -@clean_$(NAME)~.bat 2> NUL - @del clean_$(NAME)~.bat - -clean_cbx: - @copy &&! -@del $(OBJFILES:.o=.o ^ -@del ) $(IDLFILES:.idl=C.cpp ^ -@del ) $(IDLFILES:.idl=C.h ^ -@del ) $(IDLFILES:.idl=C.i ^ -@del ) $(IDLFILES:.idl=S.cpp ^ -@del ) $(IDLFILES:.idl=S.h ^ -@del ) $(IDLFILES:.idl=S.i ^ -@del ) $(IDLFILES:.idl=S_T.cpp ^ -@del ) $(IDLFILES:.idl=S_T.h ^ -@del ) $(IDLFILES:.idl=S_T.i ^ -@del ) $(IDLFILES:.idl=Cli.cpp ^ -@del ) $(IDLFILES:.idl=Cli.h ^ -@del ) $(IDLFILES:.idl=Cli.i ^ -@del ) $(IDLFILES:.idl=Ser.cpp ^ -@del ) $(IDLFILES:.idl=Ser.h ^ -@del ) $(IDLFILES:.idl=Ser.i ^ -@del ) $(IDLFILES:.idl=Ser_T.cpp ^ -@del ) $(IDLFILES:.idl=Ser_T.h ^ -@del ) $(IDLFILES:.idl=Ser_T.i ^ -@del ) $(RESOURCE) -! clean_$(NAME)~.bat 1> NUL - -@clean_$(NAME)~.bat 2> NUL - @del clean_$(NAME)~.bat - -realclean_bcb: - @copy &&! -@del $(OBJFILES:.obj=.obj ^ -@del ) $(IDLFILES:.idl=C.cpp ^ -@del ) $(IDLFILES:.idl=C.h ^ -@del ) $(IDLFILES:.idl=C.i ^ -@del ) $(IDLFILES:.idl=S.cpp ^ -@del ) $(IDLFILES:.idl=S.h ^ -@del ) $(IDLFILES:.idl=S.i ^ -@del ) $(IDLFILES:.idl=S_T.cpp ^ -@del ) $(IDLFILES:.idl=S_T.h ^ -@del ) $(IDLFILES:.idl=S_T.i ^ -@del ) $(IDLFILES:.idl=Cli.cpp ^ -@del ) $(IDLFILES:.idl=Cli.h ^ -@del ) $(IDLFILES:.idl=Cli.i ^ -@del ) $(IDLFILES:.idl=Ser.cpp ^ -@del ) $(IDLFILES:.idl=Ser.h ^ -@del ) $(IDLFILES:.idl=Ser.i ^ -@del ) $(IDLFILES:.idl=Ser_T.cpp ^ -@del ) $(IDLFILES:.idl=Ser_T.h ^ -@del ) $(IDLFILES:.idl=Ser_T.i ^ -@del ) $(RESOURCE) -! realclean_$(NAME)~.bat 1> NUL - -@realclean_$(NAME)~.bat 2> NUL - @del realclean_$(NAME)~.bat - -@del $(TARGET) 2>NUL - -@del $(TARGET:.exe=.tds) 2>NUL - -@del $(TARGET:.dll=.tds) 2>NUL - -@del $(TARGET:.dll=.lib) 2>NUL - -@del $(OBJDIR)\$(NAME).csm 2>NUL - -@del $(OBJDIR)\$(NAME).\#* 2>NUL -!ifdef CORE_TARGET - -@del $(CORE_TARGET) 2>NUL - -@del $(CORE_TARGET:.exe=.tds) 2>NUL - -@del $(CORE_TARGET:.dll=.tds) 2>NUL -!endif - -realclean_cbx: - @copy &&! -@del $(OBJFILES:.o=.o ^ -@del ) $(IDLFILES:.idl=C.cpp ^ -@del ) $(IDLFILES:.idl=C.h ^ -@del ) $(IDLFILES:.idl=C.i ^ -@del ) $(IDLFILES:.idl=S.cpp ^ -@del ) $(IDLFILES:.idl=S.h ^ -@del ) $(IDLFILES:.idl=S.i ^ -@del ) $(IDLFILES:.idl=S_T.cpp ^ -@del ) $(IDLFILES:.idl=S_T.h ^ -@del ) $(IDLFILES:.idl=S_T.i ^ -@del ) $(IDLFILES:.idl=Cli.cpp ^ -@del ) $(IDLFILES:.idl=Cli.h ^ -@del ) $(IDLFILES:.idl=Cli.i ^ -@del ) $(IDLFILES:.idl=Ser.cpp ^ -@del ) $(IDLFILES:.idl=Ser.h ^ -@del ) $(IDLFILES:.idl=Ser.i ^ -@del ) $(IDLFILES:.idl=Ser_T.cpp ^ -@del ) $(IDLFILES:.idl=Ser_T.h ^ -@del ) $(IDLFILES:.idl=Ser_T.i ^ -@del ) $(RESOURCE) -! realclean_$(NAME)~.bat 1> NUL - -@realclean_$(NAME)~.bat 2> NUL - @del realclean_$(NAME)~.bat - -@del $(TARGET) 2>NUL - -@del $(TARGET:.exe=.tds) 2>NUL - -@del $(TARGET:.dll=.tds) 2>NUL - -@del $(TARGET:.dll=.lib) 2>NUL - -@del $(OBJDIR)\$(NAME).csm 2>NUL - -@del $(OBJDIR)\$(NAME).\#* 2>NUL -!ifdef CORE_TARGET - -@del $(CORE_TARGET) 2>NUL - -@del $(CORE_TARGET:.exe=.tds) 2>NUL - -@del $(CORE_TARGET:.dll=.tds) 2>NUL -!endif diff --git a/include/makeinclude/compiler.bor b/include/makeinclude/compiler.bor deleted file mode 100644 index e9ecfe3e035..00000000000 --- a/include/makeinclude/compiler.bor +++ /dev/null @@ -1,212 +0,0 @@ -# -# $Id$ -# -# Defines specific to a particular version of the compiler -# -# Inputs: -# ~~~~~~~ -# STATIC - if defined means creating a static library or executable -# DEBUG - if defined means building with debug information -# UNICODE - if defined means building unicode -# CBX - if defined means building with the new CBuilderX preview compiler -# -# 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) -# OBJ_EXT - the extension to be used for object files -# LIB_EXT - the extension to be used for libs -# - -# Get the BCBVER and VCLVER, if it is not set, we default to BCB6. -!if $(BCBVER) == 8 -VCLVER = -!else -!if $(BCBVER) == 6 -VCLVER = -!else -!if $(BCBVER) == 5 -VCLVER = 50 -!else -!if $(BCBVER) == 4 -VCLVER = 40 -!else -!error BCBVER must be explicitly set as environment variable or is set to a not supported value. -!endif -!endif -!endif -!endif - -!ifdef CBX -OBJ_EXT = o -LIB_EXT = a -!else -OBJ_EXT = obj -LIB_EXT = lib -!endif - -# -# Build tools -# - -!ifdef CBX -CC = bccx -LD = ilink -AR = ar -RC = brcc32 -!else -CC = bcc32 -LD = ilink32 -AR = tlib -RC = brcc32 -!endif - -# -# Common flags -# -!ifndef $(BCB) -BCB = $(MAKEDIR)\.. -!endif - -!ifdef DEBUG -!ifdef CBX -DEBUG_CFLAGS = -v -y -Od -vi- -k -D_DEBUG -DACE_NO_INLINE=1 -DEBUG_LFLAGS = -v -!else -DEBUG_CFLAGS = -v -y -Od -r- -vi- -k -D_DEBUG -DACE_NO_INLINE=1 -DEBUG_LFLAGS = -v -L$(BCB)\lib\debug -!endif -!else -!if $(BCBVER) == 6 || $(BCBVER) == 5 -DEBUG_CFLAGS = -OS -Ov -Og -DNDEBUG -!else -DEBUG_CFLAGS = -O2 -DNDEBUG -!endif -DEBUG_LFLAGS = -L$(BCB)\lib\release -!endif - -!ifdef STATIC -STATIC_CFLAGS = -STATIC_LFLAGS = -!else -STATIC_CFLAGS = -tWR -STATIC_LFLAGS = -!endif - -!ifdef CODEGUARD -CODEGUARD_CFLAGS = -vG -!endif - -!ifdef UNICODE -UNICODE_CFLAGS = -DACE_USES_WCHAR -WU -!endif - -!ifdef PCH_HEADER -PCH_CFLAGS = -H=$(OBJDIR)\$(NAME).csm -Hh=$(PCH_HEADER) -!endif - -THREAD_CFLAGS = -tWM -WARNINGS_CFLAGS = -w-rvl -w-rch -w-ccc -w-obs -w-aus -w-pia -w-inl -!ifdef CBX -DEFINES_CFLAGS = -QUIET_CFLAGS = -MISC_CFLAGS = -!else -!ifdef VCL -DEFINES_CFLAGS = -DWIN32 -!else -DEFINES_CFLAGS = -DWIN32;_NO_VCL -!endif -QUIET_CFLAGS = -q -MISC_CFLAGS = -!endif -DECORATOR_CFLAGS = -DACE_LD_DECORATOR_STR=ACE_LIB_TEXT(\"$(LIB_DECORATOR)\") - -COMMON_CFLAGS = $(QUIET_CFLAGS) $(DEBUG_CFLAGS) $(THREAD_CFLAGS) \ - $(STATIC_CFLAGS) $(WARNINGS_CFLAGS) $(DEFINES_CFLAGS) \ - $(MISC_CFLAGS) $(CODEGUARD_CFLAGS) $(UNICODE_CFLAGS) \ - $(DECORATOR_CFLAGS) $(PCH_CFLAGS) - -COMMON_LFLAGS = $(DEBUG_LFLAGS) $(STATIC_LFLAGS) -x -w-dup -Gn -L$(BCB)\lib -L$(BCB)\lib\psdk - -!ifdef VCL -PACKAGES = rtl.bpi vcl.bpi vclx.bpi vcljpg.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi \ - vcldb.bpi bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi \ - nmfast.bpi dclocx.bpi -!endif - -# -# DLL specific flags -# - -DLL_CFLAGS = -tWD -DLL_LFLAGS = -Tpd -Gi -!ifdef UNICODE -DLL_STARTUP_OBJ = c0d32w.$(OBJ_EXT) -!else -DLL_STARTUP_OBJ = c0d32.$(OBJ_EXT) -!endif - -# -# EXE specific flags -# - -EXE_CFLAGS = -EXE_LFLAGS = -Tpe -!ifdef UNICODE -!ifdef VCL -EXE_STARTUP_OBJ = c0w32w.$(OBJ_EXT) -!else -EXE_STARTUP_OBJ = c0x32w.$(OBJ_EXT) -!endif -!else -!ifdef VCL -EXE_STARTUP_OBJ = c0w32.$(OBJ_EXT) -!else -EXE_STARTUP_OBJ = c0x32.$(OBJ_EXT) -!endif -!endif - -# -# Static lib specific flags -# - -LIB_CFLAGS = -!ifdef CBX -LIB_LFLAGS = cfrv -!else -!ifdef DEBUG -LIB_LFLAGS = /C /P4096 -!else -LIB_LFLAGS = /C /P512 -!endif -!endif - - -# -# Libraries to be linked -# - -!ifdef CODEGUARD -CODEGUARD_LIB = cg32.lib -!endif - -!ifdef STATIC -COMMON_LIBS = $(CODEGUARD_LIB) import32.$(LIB_EXT) cw32mt.lib ws2_32.lib -!else -COMMON_LIBS = $(CODEGUARD_LIB) import32.$(LIB_EXT) cw32mti.lib ws2_32.lib -!endif diff --git a/include/makeinclude/component_check.GNU b/include/makeinclude/component_check.GNU deleted file mode 100644 index 105a72d0b39..00000000000 --- a/include/makeinclude/component_check.GNU +++ /dev/null @@ -1,16 +0,0 @@ -# -*- Makefile -*- - -#---------------------------------------------------------------------------- -# $Id$ -#---------------------------------------------------------------------------- - -# Load all components. -ALL_COMPONENTS := $(ACE_MAKE_OPTIONS) -ALL_COMPONENTS += $(shell sh $(ACE_ROOT)/bin/ace_components --ace) -ALL_COMPONENTS += $(shell sh $(ACE_ROOT)/bin/ace_components --tao) -ALL_COMPONENTS += $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ALL_COMPONENTS += $(shell sh $(ACE_ROOT)/bin/ace_components --pace) - -# Filter out all the components that are currently available from the -# list of requirements. -MISSING_COMPONENTS := $(filter-out $(ALL_COMPONENTS), $(REQUIRED_COMPONENTS)) diff --git a/include/makeinclude/decorator.bor b/include/makeinclude/decorator.bor deleted file mode 100644 index 0b68acc3514..00000000000 --- a/include/makeinclude/decorator.bor +++ /dev/null @@ -1,50 +0,0 @@ -# -# $Id$ -# -# Creates a suffix for decorating output file names -# -# Inputs: -# ~~~~~~~ -# DEBUG - defined if building a debug library/executable -# STATIC - defined if building a static library -# UNICODE - defined if building a unicode version -# -# 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 STATIC -DECO_PREFIX=_ -STATIC_DECO=s -!endif - -!ifdef DEBUG -DECO_PREFIX=_ -DEBUG_DECO=d -!endif - -!ifdef UNICODE -DECO_PREFIX=_ -UNICODE_DECO=u -!endif - -LIB_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(STATIC_DECO)$(UNICODE_DECO)$(DEBUG_DECO) - -!ifdef NO_EXE_DECORATION -EXE_DECORATOR= -!else -EXE_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(STATIC_DECO)$(UNICODE_DECO)$(DEBUG_DECO) -!endif - diff --git a/include/makeinclude/install.bor b/include/makeinclude/install.bor deleted file mode 100644 index 7eeaad64be4..00000000000 --- a/include/makeinclude/install.bor +++ /dev/null @@ -1,41 +0,0 @@ -# -# $Id$ -# -# Rules for installing files -# - -# This ugliness is to remove extra spaces from between the items in the list. -INSTALL_TYPES_1 = $(INSTALL_TYPES) $(BLANK_SPACE) -INSTALL_TYPES_2 = $(INSTALL_TYPES_1: =%) -INSTALL_TYPES_3 = $(INSTALL_TYPES_2:%%=%) -INSTALL_TYPES_4 = $(INSTALL_TYPES_3:%%=%) -INSTALL_TYPES_5 = $(INSTALL_TYPES_4:%=_install ) - -!ifdef INSTALL_THIS_TARGET -install: $(INSTALL_TYPES_5) -!else -install: -!endif - @echo Do Nothing 1> NUL - -exe_install: $(TARGET) $(CORE_TARGET) - @$(MAKE_INSTALL_EXEDIR) - -copy "$(TARGET)" $(INSTALL_EXEDIR) 1> NUL - -!ifdef DEBUG -dll_install: $(TARGET) $(TARGET:.dll=.tds) -!else -dll_install: $(TARGET) -!endif - @$(MAKE_INSTALL_DLLDIR) - -© "$**" $(INSTALL_DLLDIR) 1> NUL - -lib_install: $(TARGET:.dll=.lib) - @$(MAKE_INSTALL_LIBDIR) - -© "$**" $(INSTALL_LIBDIR) 1> NUL - -!ifndef INCLUDES_INSTALL -includes_install: $(INCLUDES) - @$(MAKE_INSTALL_INCDIR) - -© "$**" $(INSTALL_INCDIR) 1> NUL -!endif diff --git a/include/makeinclude/macros.GNU b/include/makeinclude/macros.GNU deleted file mode 100644 index 983c6ee649f..00000000000 --- a/include/makeinclude/macros.GNU +++ /dev/null @@ -1,26 +0,0 @@ -#-*- Makefile -*- - -#---------------------------------------------------------------------------- -# $Id$ -# -# Local and nested target definitions -#---------------------------------------------------------------------------- - -TARGETS_LOCAL = \ - all.local \ - debug.local \ - profile.local \ - optimize.local \ - install.local \ - deinstall.local \ - clean_idl_stubs.local \ - clean.local \ - realclean.local \ - clobber.local \ - depend.local \ - rcs_info.local \ - idl_stubs.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 87a35ae6725..00000000000 --- a/include/makeinclude/make_flags.bor +++ /dev/null @@ -1,32 +0,0 @@ -# -# $Id$ -# -# Makefile flags for recursive invocations of make -# - -!ifdef DEBUG -DEBUG_FLAG = -DDEBUG -!endif - -!ifdef STATIC -STATIC_FLAG = -DSTATIC -!endif - -!ifdef CODEGUARD -CODEGUARD_FLAG = -DCODEGUARD -!endif - -!ifdef INSTALL_DIR -INSTALL_DIR_FLAG = -DINSTALL_DIR=$(INSTALL_DIR) -!endif - -!ifdef UNICODE -UNICODE_FLAG = -DUNICODE -!endif - -!ifdef NO_FULL_PATH -NO_FULL_PATH_FLAG = -DNO_FULL_PATH -!endif - -MAKE_FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(UNICODE_FLAG) \ - $(CODEGUARD_FLAG) $(INSTALL_DIR_FLAG) $(NO_FULL_PATH_FLAG) diff --git a/include/makeinclude/outputdir.bor b/include/makeinclude/outputdir.bor deleted file mode 100644 index 2e9e8a2b7c9..00000000000 --- a/include/makeinclude/outputdir.bor +++ /dev/null @@ -1,117 +0,0 @@ -# -# $Id$ -# -# 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 -# UNICODE - defined if building with unicode enabled -# -# 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 -OBJSTATIC_DIR=Static -!else -OBJSTATIC_DIR=Dynamic -!endif - -!ifdef DEBUG -OBJDEBUG_DIR=Debug -!else -OBJDEBUG_DIR=Release -!endif - -!ifdef UNICODE -OBJUNICODE_DIR=Unicode -!else -OBJUNICODE_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) -!endif - -!ifndef CORE_BINDIR -CORE_BINDIR=$(ACE_ROOT)\bin -!endif - -!ifdef MKDIR -MAKE_BINDIR=$(MKDIR) "$(BINDIR)" -!else -# Use default mkdir provided by command shell. May not work on Win9x. -MAKE_BINDIR=if not exist "$(BINDIR)" mkdir "$(BINDIR)" -!endif - -!ifndef OBJDIR -OBJDIR=$(BASE_OBJDIR)\$(NAME)\$(OBJSTATIC_DIR)\$(OBJDEBUG_DIR)\$(OBJUNICODE_DIR) -!endif - -!ifdef MKDIR -MAKE_OBJDIR=$(MKDIR) "$(OBJDIR)" -!else -# Use default mkdir provided by command shell. May not work on Win9x. -MAKE_OBJDIR=if not exist "$(OBJDIR)" mkdir "$(OBJDIR)" -!endif - -!ifndef INSTALL_EXEDIR -INSTALL_EXEDIR=$(INSTALL_DIR)\bin -!endif - -!ifdef MKDIR -MAKE_INSTALL_EXEDIR=$(MKDIR) "$(INSTALL_EXEDIR)" -!else -# Use default mkdir provided by command shell. May not work on Win9x. -MAKE_INSTALL_EXEDIR=if not exist "$(INSTALL_EXEDIR)" mkdir "$(INSTALL_EXEDIR)" -!endif - -!ifndef INSTALL_DLLDIR -INSTALL_DLLDIR=$(INSTALL_DIR)\lib -!endif - -!ifdef MKDIR -MAKE_INSTALL_DLLDIR=$(MKDIR) "$(INSTALL_DLLDIR)" -!else -# Use default mkdir provided by command shell. May not work on Win9x. -MAKE_INSTALL_DLLDIR=if not exist "$(INSTALL_DLLDIR)" mkdir "$(INSTALL_DLLDIR)" -!endif - -!ifndef INSTALL_LIBDIR -INSTALL_LIBDIR=$(INSTALL_DIR)\lib -!endif - -!ifdef MKDIR -MAKE_INSTALL_LIBDIR=$(MKDIR) "$(INSTALL_LIBDIR)" -!else -# Use default mkdir provided by command shell. May not work on Win9x. -MAKE_INSTALL_LIBDIR=if not exist "$(INSTALL_LIBDIR)" mkdir "$(INSTALL_LIBDIR)" -!endif - -!ifndef INSTALL_INCDIR -INSTALL_INCDIR=$(INSTALL_DIR)\include\$(INCDIR_NAME) -!endif - -!ifdef MKDIR -MAKE_INSTALL_INCDIR=$(MKDIR) "$(INSTALL_INCDIR)" -!else -# Use default mkdir provided by command shell. May not work on Win9x. -MAKE_INSTALL_INCDIR=if not exist "$(INSTALL_INCDIR)" mkdir "$(INSTALL_INCDIR)" -!endif 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 a4f03f943ef..00000000000 --- a/include/makeinclude/platform_aix4_cset++.GNU +++ /dev/null @@ -1,120 +0,0 @@ -# $Id$ - -# AIX 4.x using the IBM C Set++ compiler. -# -# NOTE! IBM is no longer supporting AIX at any version earlier than 4.3, -# and Riverace is not testing or supporting ACE on them either. No steps -# have been taken to intentionally disable anything, but it is not being -# tested either. -# -# NOTE 2! This file is only for use with the older CSet++ compiler, which -# IBM doesn't sell or support any longer. Riverace doesn't support ACE -# with it either. This file is still here in case there is some site -# still using the old compiler, but it is completely unsupported. -# -# 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 (,$(exceptions)) - exceptions = 1 -endif -ifeq (,$(optimize)) - optimize = 0 -endif -ifeq (,$(threads)) - threads = 1 -endif - -# There's no way to turn off exceptions with IBM C/C++ -ifeq (0,$(exceptions)) - exceptions = 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) - -# aix_build turns on the funky shared library building code. -aix_build = 1 -# ibmcxx_build turns on the extra step for instantiating and compiling -# template instances. -ibmcxx_build = 1 - -ifeq ($(threads),1) -CC = xlc_r -CXX = xlC_r -DLD = makeC++SharedLib_r -else -CC = xlc -CXX = xlC -DLD = makeC++SharedLib -endif - -# -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. -TEMPINCDIR = tempinc -CCFLAGS += $(CFLAGS) -qtempinc=$(TEMPINCDIR) -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 - -ACELIB = -lACE -LD = $(CXX) - -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 += -O2 -qarch=com -RANLIB = ranlib -SOFLAGS = -p 0 - -SOVERSION = -SONAME = diff --git a/include/makeinclude/platform_aix_g++.GNU b/include/makeinclude/platform_aix_g++.GNU deleted file mode 100644 index d4c1037bda1..00000000000 --- a/include/makeinclude/platform_aix_g++.GNU +++ /dev/null @@ -1,85 +0,0 @@ -# $Id$ -# -# Platform macros for building on AIX with g++. This has been tested on -# AIX 4.3 and 5 with gcc 3. Earlier versions of gcc may compile, but are -# known to have serious problems on AIX. -# -# Contributed by Ian Wright <I.Wright@elsevier.co.uk> -# Updated for AIX 4.3 and gcc 3 by Steve Huston <shuston@riverace.com> - -debug ?= 1 -distrib ?= 0 -exceptions ?= 1 -optimize ?= 1 -rtti ?= 1 -threads ?= 1 -buildbits ?= native -with_ld ?= aix - -# Yes, believe it or not... -# The way to make a shared lib on AIX is to make a shared object file and -# then put that in an archive. -# Non-shared archives are named lib<x>ns.a - ns = non-shared. -SOEXT = a -# aix_build turns on the funky shared library building code in -# rules.lib.GNU -aix_build = 1 - -ifeq (0,$(rtti)) - CFLAGS += -fno-rtti -DACE_LACKS_RTTI -endif - -ifeq (1,$(threads)) - CFLAGS += -pthread -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) -AIX_VERS := $(AIX_MAJOR_VERS)0$(AIX_MINOR_VERS) - -CC = gcc -CXX = g++ - -CFLAGS += -W -Wall -mcpu=common -DACE_AIX_VERS=$(AIX_VERS) -ifeq ($(buildbits),32) - CFLAGS += -m32 -endif -ifeq ($(buildbits),64) - CFLAGS += -m64 -endif -DCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -# 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 += -pthread -endif - -# AIX 5 has a new ld option, -bexpfull, that exports all the symbols that -# g++ 3.3+ needs to work correctly. The new option is available by default -# in AIX 5.2 and later, but must be installed by a patch to AIX 5.1. -ifeq ($(AIX_MAJOR_VERS),5) -SOFLAGS += -shared -Wl,-bexpfull # -Wl,-bloadmap:lib.map -else -SOFLAGS += -shared -Wl,-bexpall # -Wl,-bloadmap:lib.map -endif - -LIBS += -lxti -ldl -ARFLAGS = cruv -RANLIB = ranlib - -# Test for template instantiation, add to SOFLAGS if versioned_so set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/include/makeinclude/platform_aix_ibm.GNU b/include/makeinclude/platform_aix_ibm.GNU deleted file mode 100644 index 069f1c3a584..00000000000 --- a/include/makeinclude/platform_aix_ibm.GNU +++ /dev/null @@ -1,198 +0,0 @@ -# $Id$ - -# This file is for use with AIX 4.3 and up, using either of the IBM -# compilers (IBM C/C++ 3.6.6 or Visual Age C++ 5 or 6 batch compiler). -# If you wish to use the CSet++ compiler, please use platform_aix4_cset++.GNU. -# Note that as of ACE 5.4, the only supported compilers from IBM are -# Visual Age C++ 6 and up. - -debug ?= 1 -distrib ?= 0 -exceptions ?= 1 -optimize ?= 0 -rtti ?= 1 -threads ?= 1 -buildbits ?= 32 - -ifeq (,$(inline)) -ifeq (1,$(debug)) - inline = 0 -else - inline = 1 -endif -endif - -# First, find out which compiler we're building with. The settings we -# use for compiling, as well as how to build shared libraries, depend on -# the compiler version. There's no easy way to ask lslpp which is installed. -# Instead, compile a file and see which compiler is 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__" > ./testxlCvers.cpp;xlC -E ./testxlCvers.cpp | tail -n 1;$(RM) testxlCvers.cpp) -#XLCVERSION := $(shell xlC -E ./testAIXCompilerVersion.cpp | tail -1') -#ACE_AIX_CLEAN := $(shell $(RM) ./testAIXCompilerVersion.cpp) - -# 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) -AIX_VERS := $(AIX_MAJOR_VERS)0$(AIX_MINOR_VERS) - -# Use of exceptions should be a compiler-specific setting, but for now it's -# not. IBM C/C++ doesn't have a way to turn exceptions off, and Visual -# Age C++ V5 building ACE without exception handling causes segv on startup -# of every test. Until this is straightened out, force exceptions=1 for -# both compilers. -exceptions=1 - -# Yes, believe it or not... -# The way to make a shared lib on AIX is to make a shared object file and -# then put that in an archive. -# Non-shared archives are named lib<x>ns.a - ns = non-shared. -SOEXT = a -# aix_build turns on the funky shared library building code in -# rules.lib.GNU -aix_build = 1 -#SHR_FILTER=$(ACE_ROOT)/bin/aix_shr - -ifeq ($(threads),1) -# Note - the _r form of the compiler command turns on -qthreads and the -# thread-required preprocessor defines, as well as -lpthreads for linking. -# If this is Visual Age C++ 5, DLD will get reset below. -CC = xlc_r -CXX = xlC_r -DLD = makeC++SharedLib_r -else -CC = xlc -CXX = xlC -DLD = makeC++SharedLib -endif - -ARFLAGS = ruv -AR = ar -LD = $(SHR_FILTER) $(CXX) -RANLIB = ranlib - -CPPFLAGS += -DACE_AIX_VERS=$(AIX_VERS) - -# AIX 5.2 offers POSIX aio, but the Visual Age C++ compiler can't grok the -# aio.h header file. This is a known problem and will be addressed in -# May 2004 (per IBM). This is a workaround for it, supplied by IBM. -# When the compiler fix is released, this workaround (and the change -# to -qflag, below) can be removed. (Steve Huston) -ifeq (502,$(AIX_VERS)) -CPPFLAGS += -U__C99_RESTRICT -endif - -# -qinitauto seems like an interesting option, but some tests (specifically -# Process_Strategy_Test) hang with it turned on. This should be investigated -# at some point. -DCCFLAGS += -g -qcheck=nobounds:div:null -DCFLAGS += -g - -# Now sort out the compiler differences here... -ifeq ($(XLCVERSION),0x0306) - SHR_FILTER=$(ACE_ROOT)/bin/aix_shr - TEMPINCDIR = tempinc - CCFLAGS += -qlanglvl=ansi -qflag=e:e -qonce -qtempinc=$(TEMPINCDIR) -DACE_TEMPLATES_REQUIRE_PRAGMA - SOFLAGS += -p 0 -# ibmcxx_build turns on the extra step for instantiating and compiling -# template instances in rules.lib.GNU. - ibmcxx_build = 1 - rtti = 0 -else # Visual Age 5 and up - ifeq ($(XLCVERSION),0x0500) - SHR_FILTER=$(ACE_ROOT)/bin/aix_shr - TEMPINCDIR = tempinc - CCFLAGS += -qflag=w:w -qonce -qtempinc=$(TEMPINCDIR) - else - ifeq ($(XLCVERSION),0x0600) - # This is just for the workaround for aio, above. Without it, the - # compiler warns that __C99_RESTRICT is reserved. When that workaround - # is gone, this ifeq can be removed also. -qflag=w:w is what we want - # in the end. - CCFLAGS += -qtemplateregistry=templateregistry.$(MAKEFILE) - ifeq (502,$(AIX_VERS)) - CCFLAGS += -qflag=e:e - else - CCFLAGS += -qflag=w:w - endif - else - ifeq ($(XLCVERSION),0x0700) - CCFLAGS += -qflag=w:w - ifeq ($(templates),manual) - CCFLAGS += -qnotempinc -qnotemplateregistry -DACE_TEMPLATES_REQUIRE_SOURCE - else - CCFLAGS += -qtemplateregistry=templateregistry.$(MAKEFILE) -DACE_TEMPLATES_REQUIRE_SOURCE - endif - # According to documentation, default is -qeh, which is equivalent - # to -qeh=v5. Apparently 6.0 fixed some problems with nested - # try-catch blocks. - ifeq ($(exceptions),1) - CCFLAGS += -qeh=v6 - endif - else - CXX = echo "Unrecognized compiler version $(XLCVERSION)\n" - endif - endif - endif - DLD = $(CXX) -qmkshrobj - SOFLAGS += $(CCFLAGS) $(CPPFLAGS) $(INCLDIRS) - ifeq ($(buildbits),64) - DLD += -q64 - CCFLAGS += -q64 -qwarn64 - ARFLAGS := -X64 $(ARFLAGS) - - # This option results in a crash of TAO when building 64bit with - # Visual Age 6. No idea why but don't use it when using Visual Age 6. - ifneq ($(XLCVERSION),0x0600) - # CCFLAGS += -qstaticinline - endif - else - # Using 32bit the staticinline option works. - #CCFLAGS += -qstaticinline - endif - CCFLAGS += -qfuncsect -endif - -# The Visual Age preprocessor is not usable with the TAO_IDL compiler. -# At the moment an idl file just contains includes of other idl files -# the Visual Age preprocessor doesn't report that file in the list of -# files that is used. The only way we can workaround this is using the -# gcc preprocessor, do this in your platform_macros.GNU is this -# causes problems -# TAO_IDL_PREPROCESSOR = gcc - -ifeq ($(exceptions),0) - CCFLAGS += -qnoeh -endif - -ifeq (1,$(rtti)) - CCFLAGS += -qrtti=all -else # ! rtti - CCFLAGS += -DACE_LACKS_RTTI -endif # ! rtti - -ifeq ($(shared_libs),1) -ACELIB = -lACE -else -ACELIB = -lACEns -endif - -LIBS += -lxti -ldl - -SONAME = -SOVERSION = -# 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 - -# -O2 is too much for Visual Age C++ 5.0. It ends up calling -# the wrong methods in some cases (orbsvcs/tests/EC_Throughput). -# Chad Elliott 7/24/2001 -OCCFLAGS += -qlibansi -O -qarch=com diff --git a/include/makeinclude/platform_chorus.GNU b/include/makeinclude/platform_chorus.GNU deleted file mode 100644 index b9f905e8f85..00000000000 --- a/include/makeinclude/platform_chorus.GNU +++ /dev/null @@ -1,120 +0,0 @@ -# $Id$ - -# Chorus 3.1b with GNU g++ 2.7.2 - -CHORUS = 1 -CROSS-COMPILE = 1 - -debug = 1 -exceptions = 0 -optimize = 1 -shared_libs = -static_libs = 1 - -# -# Directory where the Chorus Development System is installed -# -ifndef CLX_CDSPATH - CLX_CDSPATH = /vob/k_bbansw/chorus_r321_bin/CDS -endif #CLX_CDSPATH -ifndef CLX_CDSVERSION - CLX_CDSVERSION = 4.3 -endif #CLX_CDSVERSION -ifndef CLX_CDSHOST - CLX_CDSHOST = solaris -endif #CLX_CDSHOST -ifndef CLASSIXDIR - CLASSIXDIR=$(MERGEDIR) -endif #CLASSIXDIR -ifndef CPU - CPU=powerpc -endif - -XROOT = $(CLX_CDSPATH)/$(CPU)/$(CLX_CDSHOST)/$(CLX_CDSVERSION) -XDIR = $(XROOT)/$(CPU)-elf -CC = $(XDIR)/bin/gcc -B$(XROOT)/lib/gcc-lib/ - -# -# 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 \ - -fno-rtti \ - -fwritable-strings \ - -fsigned-char \ - "-msoft-float" \ - -D_POSIX_THREADS \ - -D_POSIX_THREAD_SAFE_FUNCTIONS \ - "-DNO_FPU_SUPPORT" - -pipes ?= 1 - -ifeq ($(CPU),powerpc) -CCFLAGS += -mstrict-align \ - -mno-sdata -endif - -ifeq ($(exceptions),1) -else # ! exceptions - CCFLAGS += -fno-exceptions -endif # ! exceptions - -# Chorus doesn't have rwho -rwho = 0 - -#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 - -POSTLINK= -r $(CLASSIXDIR)/lib/CC/libC.a $(CLASSIXDIR)/lib/classix/libcx.u.a; \ - mv $@ $@.xp.o; \ - $(CLASSIXDIR)/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 - - -OCFLAGS += -O -PIC = -fPIC - -AR = $(TOOLDIR)ar -ARFLAGS = srv - -RANLIB = $(TOOLDIR)ranlib -PRELIB = @true diff --git a/include/makeinclude/platform_chorus4.x_g++.GNU b/include/makeinclude/platform_chorus4.x_g++.GNU deleted file mode 100644 index 4b78cf134ec..00000000000 --- a/include/makeinclude/platform_chorus4.x_g++.GNU +++ /dev/null @@ -1,181 +0,0 @@ -# $Id$ -# -# Chorus 4.0 with egcs 1.1.2 -# -# This version of plaform macros builds upon the previous version -# of chorus. Many of the macros were the same so inclusion of -# the previous macros file seemed the easiest way to go. -# -# You will probably need to set the following environment variables -# or macros: -# -# Define your CPU: -# CPU powerpc (default), sparc or ... -# -# Define these: -# CHTOOLS_DIR <chorus install path>/4.0/chorus-$CPU/tools -# NUCLEUS_DIR <chorus install path>/4.0/chorus-$CPU/kernel -# -# or -# -# Define MERGEDIR to your kernel build location. -# - -CHORUS = 1 -CHORUS_4 = 1 -CROSS-COMPILE = 1 - -ifeq (,$(debug)) - debug = 1 -endif -exceptions = 0 -ifeq (,$(optimize)) - optimize = 1 -endif -static_libs_only = 1 - -# -# Directory where the Chorus Development System is installed -# -ifdef MERGEDIR - include $(MERGEDIR)/Paths -endif -ifndef CHTOOLS_DIR - CONFIGURATION_ERROR_CHTOOLS: CHTOOLS_DIR_must_be_set! -endif -ifndef NUCLEUS_DIR - CONFIGURATION_ERROR_NUCLEUS: NUCLEUS_DIR_must_be_set! -endif -ifndef CPU - CPU=powerpc -endif -ifndef CLX_TYPE - CLX_TYPE=$(CPU)-elf -endif -ifndef CLX_CDSVERSION - CLX_CDSVERSION = 5.00 -endif -ifndef CLX_CDSHOST - CLX_CDSHOST = solaris -endif -ifndef OS_DIR - OS_DIR = $(NUCLEUS_DIR)/../os -endif - -XROOT = $(CHTOOLS_DIR)/$(CPU)/$(CLX_CDSHOST)/$(CLX_CDSVERSION) -XDIR = $(XROOT)/$(CLX_TYPE) -TOOLDIR = $(XDIR)/bin - - -# -# Include Dirs -# -NUCLEUS_INCLDIR = $(NUCLEUS_DIR)/include -OS_INCLDIR = $(OS_DIR)/include - -INCLDIRS += -I$(OS_INCLDIR) \ - -I$(NUCLEUS_INCLDIR) \ - -I$(OS_INCLDIR)/chorus \ - -I$(NUCLEUS_INCLDIR)/chorus \ - -I$(OS_INCLDIR)/CC \ - -I$(NUCLEUS_INCLDIR)/posix \ - -I$(NUCLEUS_INCLDIR)/stdc \ - -I$(NUCLEUS_INCLDIR)/chorus/iom \ - -I$(NUCLEUS_INCLDIR)/CC - - - - -# -# Tools -# -CC = $(TOOLDIR)/gcc -B$(XROOT)/lib/gcc-lib/ -CXX = $(CC) -DLD = -LD = $(XDIR)/bin/ld -MATHLIB = -L$(NUCLEUS_DIR)/lib/libm -lm -AR = $(TOOLDIR)/ar -RANLIB = $(TOOLDIR)/ranlib - - -# Test for template instantiation. -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -# -# Flag Settings -# -CFLAGS += -w -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) \ - -fno-strict-prototypes \ - -Usun \ - -fno-builtin \ - -fconserve-space \ - -fcheck-new \ - -nostdinc \ - -fno-rtti \ - -fwritable-strings \ - -fsigned-char \ - "-msoft-float" \ - -DSOFT_FLOAT \ - -D_POSIX_THREADS \ - -D_POSIX_THREAD_SAFE_FUNCTIONS \ - "-DNO_FPU_SUPPORT" - -pipes ?= 1 - -ifeq ($(CPU),powerpc) -CCFLAGS += -mstrict-align \ - -mno-sdata -endif - -CPPFLAGS += -DCHORUS_4 -CCFLAGS += -D__CHORUS__=400 \ - -DCHORUS_VERSION_MAJOR=4 \ - -DCHORUS_VERSION_MINOR=0 \ - -DCHORUS_PATCH_LEVEL=0 \ - -DCHORUS_4 \ - -D_POSIX_THREAD_PROCESS_SHARED - -ifeq ($(exceptions),1) -else # ! exceptions - CCFLAGS += -fno-exceptions -endif # ! exceptions - -# Chorus doesn't have rwho -rwho = 0 - -OCFLAGS += -O -PIC = -fPIC -ARFLAGS = srv -# -# Adding debug symbols makes the binaries too -# large to load into memory. -#DCFLAGS += -g - - - -LINK.cc.override = $(CXX) -u _main -u _premain -LINK.cc = override - -CHORUSLINK = true -PRELIB = @true - -# -# Special link process to get the right libraries and -# build up the static constructors and destructors. -# -POSTLINK= -r $(OS_DIR)/lib/CC/libC.a $(OS_DIR)/lib/libbsd/libbsd.a \ - $(OS_DIR)/lib/classix/libcx.a \ - $(NUCLEUS_DIR)/lib/classix/libsys.u.a \ - -nostdlib -lgcc-chorus; \ - mv $@ $@.xp.o; \ - $(CHTOOLS_DIR)/host/bin/mkctors $@.xp.o > $@.ct.s; \ - $(CXX) -c $@.ct.s -o $@.ct.o; \ - $(RM) $@.ct.s; \ - $(LD) $(LDOPTIONS) -e _start -r -dn -o $@ \ - $(NUCLEUS_DIR)/lib/crt/crth.u.o $(NUCLEUS_DIR)/lib/crt/crt0.o \ - $(NUCLEUS_DIR)/lib/crt/crti.o $@.xp.o $@.ct.o \ - $(NUCLEUS_DIR)/lib/crt/crtn.o; \ - $(RM) $@.xp.o; \ - $(RM) $@.ct.o diff --git a/include/makeinclude/platform_chorus_ghs.GNU b/include/makeinclude/platform_chorus_ghs.GNU deleted file mode 100644 index 2b44361ec54..00000000000 --- a/include/makeinclude/platform_chorus_ghs.GNU +++ /dev/null @@ -1,80 +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 = 1 -endif # exceptions -optimize = 1 -shared_libs = -static_libs = 1 - -# Chorus doesn't have rwho -rwho = 0 - -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 - -ifeq (1,$(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 af4c700010a..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)/lib -CXX = CC -#CFLAGS += -CCFLAGS += -h noautoinstantiate -DCFLAGS += -g -DCCFLAGS += $(DCFLAGS) -OCFLAGS += -O2 -OCCFLAGS += $(OCFLAGS) - -ifeq (1,$(exceptions)) - CCFLAGS += -h exceptions -else - CCFLAGS += -h noexceptions -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_cygwin32.GNU b/include/makeinclude/platform_cygwin32.GNU deleted file mode 100644 index ed9c9823ad0..00000000000 --- a/include/makeinclude/platform_cygwin32.GNU +++ /dev/null @@ -1,30 +0,0 @@ -# $Id$ -# -# This file should allow to build ACE for cygwin32 with cygwin tools. -# -# Edit to change TCPU and w32api defs below. -# -# Don't forget to define the ACE_ROOT environment variable! -# - -# -# Chose your target CPU (by default we set it to pentiumpro. In your -# platform_macros.GNU file you can override this to pentium, i486 or i386 -# -TCPU ?= pentiumpro - -cygwin32 = 1 - -# Cygwin doesn't have rwho -rwho = 0 - -# Cygwin doesn't allow to add the version number of ACE to the dll name -# because fe ace.dll.5.2.3 isn't a valid dll name -versioned_so=0 - -# Disable auto-import warnings. The Cygwin linker has a problem with imports -# See https://sourceforge.net/tracker/?func=detail&atid=102435&aid=683455&group_id=2435 -# for the details why to do this. -LDFLAGS += -Wl,--enable-auto-import - -include $(ACE_ROOT)/include/makeinclude/platform_gnuwin32_common.GNU diff --git a/include/makeinclude/platform_dgux4_epc.GNU b/include/makeinclude/platform_dgux4_epc.GNU deleted file mode 100644 index 96080eca81a..00000000000 --- a/include/makeinclude/platform_dgux4_epc.GNU +++ /dev/null @@ -1,23 +0,0 @@ -# $Id$ - -# Digital Unix v.4.X using epc? -# (Apparently based on SunOS 5.x (Solaris 2.x) with SunC++ 4.x) - -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 a40ffbef07e..00000000000 --- a/include/makeinclude/platform_freebsd.GNU +++ /dev/null @@ -1,70 +0,0 @@ -# $Id$ - -# platform_freebsd.GNU - -## See /usr/ports/Mk/bsd.port.mk for sample usage of the OSVERSION -## variable, especially with respect to defining the correct compiler -## flags for threads. -OSVERSION := $(shell sysctl -n kern.osreldate) - -## GNU make does not support boolean conditional expressions -## so we have to use a dummy RET variable. -RET = $(shell test $(OSVERSION) -ge 200000 && printf 1) -ifeq ($(RET),1) -versioned_so = 1 -endif - -exceptions ?= 1 -threads ?= 1 -debug ?= 1 -optimize ?= 1 -pipes ?= 1 - -CC = gcc -CXX = g++ - -CFLAGS += -W -Wall -Wpointer-arith -DCFLAGS += -g -RET = $(shell test $(OSVERSION) -ge 300000 && printf 1) -ifneq ($(RET),1) - LDFLAGS += -Wl,-rpath $(ACE_ROOT)/lib -endif -DLD = $(CXX) -LD = $(CXX) -OCFLAGS += -O2 -PIC = -fpic -AR = ar -ARFLAGS = ruv -RANLIB = ranlib - -SOFLAGS += $(CPPFLAGS) -shared -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< -PRELIB = @echo - -## Set the correct compiler flags for pthreads. This -## test is copied from /usr/ports/Mk/bsd.port.mk -ifeq ($(threads),1) -RET = $(shell test $(OSVERSION) -lt 500016 && printf 1) -ifeq ($(RET),1) - PTHREAD_CFLAGS = -D_THREAD_SAFE - PTHREAD_LIBS = -pthread -else - RET = $(shell test $(OSVERSION) -lt 502102 && printf 1) - ifeq ($(RET),1) - PTHREAD_LIBS = -lc_r - else - PTHREAD_LIBS = -lpthread - endif -endif # RET - -CFLAGS += $(PTHREAD_CFLAGS) -LIBS += $(PTHREAD_LIBS) - -endif # threads - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/include/makeinclude/platform_g++_common.GNU b/include/makeinclude/platform_g++_common.GNU deleted file mode 100644 index c1d1c394479..00000000000 --- a/include/makeinclude/platform_g++_common.GNU +++ /dev/null @@ -1,139 +0,0 @@ -# -*- Makefile -*- -# $Id$ -# -# Common file help turn on/off explicit template instantiation - -ifeq ($(CXX),insure) - # insure does not pass through the -dumpversion option. - CXX_FOR_VERSION_TEST = g++ -else - CXX_FOR_VERSION_TEST = $(CXX) -endif - -CXX_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion) -ifeq (cmd,$(findstring cmd,$(SHELL))) -CXX_MAJOR_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion | sed -e "s/[^0-9\.]//g" | sed -e "s/\..*$$//") -else -CXX_MAJOR_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion | sed -e 's/[^0-9\.]//g' | sed -e 's/\..*$$//') -endif -ifeq ($(findstring $(CXX_MAJOR_VERSION),1 2 3),$(CXX_MAJOR_VERSION)) -GXX_4_OR_BETTER := 0 -else -GXX_4_OR_BETTER := 1 -endif - -# If no option has been specified, try to enable templates based on the -# version of the compiler. -# -ifndef templates - ifeq ($(GXX_4_OR_BETTER),1) - templates=automatic - else - ifeq (2.95,$(findstring 2.95,$(CXX_VERSION))) - templates = automatic - else - ifeq (3.,$(findstring 3.,$(CXX_VERSION))) - templates = automatic - else - ifeq (2.96,$(findstring 2.96,$(CXX_VERSION))) - templates = automatic - else - ifeq (2.9-gnupro, $(findstring 2.9-gnupro, $(CXX_VERSION))) - templates = automatic - else - ifeq (egcs, $(findstring egcs, $(CXX_VERSION))) - templates = explicit - else - templates = explicit - endif - endif - endif - endif - endif - endif -endif - -# Turn on the proper flags for explicit template instantiation. -# -ifeq ($(templates),explicit) - ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied. - TEMPLATES_FLAG=-fno-implicit-templates - endif - CPPFLAGS += -DACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -endif - -# The correct flags to pass to the linker for ELF dynamic shared library -# versioning. None of this works on OpenBSD's ld. -# If the platform file didn't already set versioned_so, default to 1. -versioned_so ?= 1 -with_ld ?= -ifeq ($(versioned_so),1) - ifeq ($(with_ld),hpux) - SOFLAGS += -Wl,+h -Wl,$(SONAME) - else - ifeq ($(with_ld),openbsd) - else - ifeq ($(with_ld),aix) - # What to do here??? - else - SOFLAGS += -Wl,-h -Wl,$(SONAME) - endif - endif - endif -endif - -static_libs_only ?= - -# Only modify LDFLAGS if DLD has been set. -ifneq ($(DLD),) - ifeq ($(DLD),$(CXX_FOR_VERSION_TEST)) # only try this is we are using ld through gcc - LD_FOR_VERSION_TEST = $(shell $(CXX_FOR_VERSION_TEST) -print-prog-name=ld) - else - LD_FOR_VERSION_TEST = $(DLD) - endif # DLD = CXX_FOR_VERSION_TEST - # The -E option is GNU ld specific - ifneq ($(mingw32),1) - GNU_LD := $(shell sh -c '$(LD_FOR_VERSION_TEST) -v 2>&1 | grep -c "GNU ld"') - else - GNU_LD := $(shell $(LD_FOR_VERSION_TEST) -v | grep -c 'GNU ld') - endif # mingw32 -endif # DLD - -ifeq ($(GNU_LD),1) - STATIC_LINK_FLAG ?= -static -endif # GNU_LD - -ifeq ($(shared_libs), 1) - ifneq ($(static_libs_only), 1) - # Add all symbols to the dynamic symbol table. Needed to enable - # dynamic_cast<> for shared libraries. (see - # http://gcc.gnu.org/faq.html#dso) - - ifeq ($(GNU_LD),1) - # Make sure this version of ld supports the -E option. - ifneq ($(mingw32),1) - LD_EXPORT_DEFINED := $(shell sh -c '$(LD_FOR_VERSION_TEST) -E 2>&1 | egrep -i "(option|flag)" /dev/null; echo $$?') - else - LD_EXPORT_DEFINED := $(shell $(LD_FOR_VERSION_TEST) -E 2>&1 | grep -c -i -e '(option|flag)') - ifeq ($(LD_EXPORT_DEFINED),0) - LD_EXPORT_DEFINED:=1 - else - LD_EXPORT_DEFINED:=0 - endif - endif # mingw32 - ifeq ($(LD_EXPORT_DEFINED),1) - LDFLAGS += -Wl,-E - endif # LD_EXPORT_DEFINED = 1 - endif # GNU ld - - # Take advantage of G++ (>= 4.x) visibility attributes to generate - # improved shared library binaries. - ifeq ($(GXX_4_OR_BETTER), 1) - ifneq ($(no_hidden_visibility),1) - CCFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden - else - CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0 - endif # no_hidden_visibility - endif # GXX_4_OR_BETTER == 1 - endif # static_libs_only -endif # shared_libs diff --git a/include/makeinclude/platform_gnuwin32_common.GNU b/include/makeinclude/platform_gnuwin32_common.GNU deleted file mode 100644 index 50d7c42af90..00000000000 --- a/include/makeinclude/platform_gnuwin32_common.GNU +++ /dev/null @@ -1,119 +0,0 @@ -# $Id$ - -ifneq ($(mingw32),1) - ifneq ($(cygwin32),1) - fail := \ - $(shell \ - echo "You should not use this file but one of"; \ - echo "platform_mingw32.GNU or platform_cygwin32.GNU"; \ - exit 1) - endif -endif - -# debug = 1 -# optimize = 1 -# exceptions = 0 - -GNUWIN32_DLL_ALLOW_EXECP = 0 - -GNUWIN32_CXX_VERSION := $(shell $(CXX) -dumpversion) -#exceptions across dll boundries are ok in gcc 3+ -ifeq (2.95,$(findstring 2.95,$(GNUWIN32_CXX_VERSION))) - GNUWIN32_DLL_ALLOW_EXECP = 0 -else - ifeq (3.,$(findstring 3.,$(GNUWIN32_CXX_VERSION))) - GNUWIN32_DLL_ALLOW_EXECP = 1 - else - GNUWIN32_DLL_ALLOW_EXECP = 0 - endif -endif - -winsock2 ?= 1 -exceptions ?= 1 -debug ?= 1 -optimize ?= 1 -threads ?= 1 -pipes ?= 1 - -ifeq ($(debug),0) -CFLAGS += -DNDEBUG -endif - -CC = gcc -CXX = g++ -RC = windres - -ifeq (3.4,$(findstring 3.4,$(GNUWIN32_CXX_VERSION))) - MODEL_FLAGS += -mtune=$(TCPU) -else - MODEL_FLAGS += -mcpu=$(TCPU) -endif - -CFLAGS += -W -Wall -Wpointer-arith -ifeq ($(threads),1) - MODEL_FLAGS += -mthreads -endif # threads - -CFLAGS += $(MODEL_FLAGS) - -EXEEXT = .exe - -DCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) - -ifeq ($(mingw32),1) -ifeq ($(winsock2),1) -LIBS += -lws2_32 -lmswsock -endif -LIBS += -lwsock32 -lnetapi32 -endif - -OCFLAGS += -O3 -PIC = -AR = ar -ARFLAGS = rsuv -RANLIB = ranlib -SOEXT = dll -SOFLAGS += $(MODEL_FLAGS) $(CPPFLAGS) -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< - -PLATFORM_FL_CPPFLAGS ?= -PLATFORM_FL_LIBS ?= -lfltk -lfltk_forms -lfltk_gl -lfltk_images -PLATFORM_FL_LDFLAGS ?= - -PLATFORM_GL_CPPFLAGS ?= -I/usr/X11R6/include -PLATFORM_GL_LIBS ?= -lGL -PLATFORM_GL_LDFLAGS ?= -L/usr/X11R6/lib - -PLATFORM_WX_CPPFLAGS ?= $(shell wx-config --cxxflags) -I/usr/local/include -PLATFORM_WX_LIBS ?= $(shell wx-config --libs) -PLATFORM_WX_LDFLAGS ?= $(shell wx-config --ldflags) - -# The sed below is to strip comments on the .def file, -# to workaround to a bug in ld. -SHLIBBUILD = \ - $(RM) $(VSHDIR)/$@.def.old $(VSHDIR)/$@.def; \ - dlltool --export-all --output-def $(VSHDIR)/$@.def --dllname $@ \ - $(VSHOBJS) \ - && mv $(VSHDIR)/$@.def $(VSHDIR)/$@.def.old \ - && sed 's/;.*$$//g' < $(VSHDIR)/$@.def.old > $(VSHDIR)/$@.def \ - && $(SOLINK.cc) -Wl,--enable-auto-image-base -Wl,--out-implib,$@.a \ - -shared -o $@ $(LDFLAGS) -Wl,$(VSHDIR)/$@.def \ - $(VSHOBJS) $(ACE_SHLIBS) $(LIBS) - -ifneq ($(GNUWIN32_DLL_ALLOW_EXECP), 1) - ifeq ($(exceptions),1) - SHLIBBUILD += \ - ;echo "Warning: exceptions fail when mixing DLL and non DLL calls." - endif -endif - -PRELIB = @true - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/include/makeinclude/platform_hpux.GNU b/include/makeinclude/platform_hpux.GNU deleted file mode 100644 index 5226189c387..00000000000 --- a/include/makeinclude/platform_hpux.GNU +++ /dev/null @@ -1,30 +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)/lib -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 -SONAME = -SOVERSION = diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU deleted file mode 100644 index eebdde865bd..00000000000 --- a/include/makeinclude/platform_hpux_aCC.GNU +++ /dev/null @@ -1,223 +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. - -buildbits ?= 0 -debug ?= 1 -distrib ?= 0 -exceptions ?= 1 -optimize ?= 0 -threads ?= 1 -versioned_so ?= 0 - -# First, extract the OS version number. -HPVERS_WORDS := $(subst ., ,$(shell uname -r)) -HPMODEL := $(shell uname -m) -HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS))) -# -CC = /bin/cc -CXX = aCC - -# Determine compiler version -CXXVERS_WORDS := $(subst ., , $(shell $(CXX) -V 2>&1)) -CXXMINORVERS := $(word 8, $(CXXVERS_WORDS)) -CXXMAJORVERS := $(word 7, $(CXXVERS_WORDS)) - -ifeq (,$(stdcpplib)) -# If the user didn't explicitly set stdcpplib, assume that the compiler -# can do -AA, unless it's a .2x version (e.g., 03.24). 03.27 can do -AA, -# so check for that one explicitly and enable it if so. - ifeq (,$(filter 2%,$(CXXMINORVERS))) - stdcpplib = 1 - else - ifeq (27,$(CXXMINORVERS)) - stdcpplib = 1 - else - stdcpplib = 0 - endif - endif -endif - -ifeq (1,$(stdcpplib)) - CCFLAGS += -AA - ifeq (03,$(CXXMAJORVERS)) - # Warning 930 is spurious when new(std::nothrow) is used. Reported to HP - # as support call 3201224717. (Steve Huston, 23-Nov-2002) - CCFLAGS += +W930 - endif -# Compile errors using -AA and +noeh together - HP problem report -# JAGad12608, fix slated for Dec 2001 Release -- Steve Huston, April 10, 2001. -# If you still have problems with this area, uncomment the following line: -# exceptions = 1 -endif - -# Set the appropriate preprocessor defs for threading based on OS version -# and specified compiler options. -ifeq ($(threads),1) - THR_DEFS = -DACE_HAS_THREADS - - # x.30 was the first version offering -mt. So, if it's a .2x version, - # set the defs by hand; anything else, use -mt. This leaves out .1x - # versions, which should be no problem at this point. - ifeq (,$(filter 2%,$(CXXMINORVERS))) - THR_DEFS += -mt - else - # Different for v2 vs. v1 C++ library selection. - ifeq (1,$(stdcpplib)) - THR_DEFS += -D_RWSTD_MULTI_THREAD - else - THR_DEFS += -DRWSTD_MULTI_THREAD -D_THREAD_SAFE - endif - - # For HP-UX 11.x, choose kernel threads over CMA (user) threads. - ifeq ($(word 2,$(HPVERS_WORDS)), 11) - THR_DEFS += -D_POSIX_C_SOURCE=199506L - endif - endif -else - THR_DEFS = -DACE_HAS_THREADS=0 - # On HP-UX 11, even without building for threads, the *_r reentrant - # functions are available, and _REENTRANT enables them. - ifeq ($(word 2,$(HPVERS_WORDS)), 11) - THR_DEFS += -D_REENTRANT - endif -endif - -ifeq ($(HPMODEL), ia64) - itanium = 1 -endif - -ifeq (03,$(CXXMAJORVERS)) - # Suppress Warning 302 ((...) parameter list is a non-portable feature) - CCFLAGS += +W302 - - ifeq (57,$(CXXMINORVERS)) - # aCC 3.57 has a bug. When a class has private constructors - # and is trying to be created from a friend class we end up with - # a compile error. We disable array optimization in the compiler - # by setting this environment variable. HP CR JAGaf43094 - export aCC_ARRAY_OPT=OFF - endif - ifeq (60,$(CXXMINORVERS)) - # Same bug as above - export aCC_ARRAY_OPT=OFF - endif -endif - -ifeq (05,$(CXXMAJORVERS)) - # Warnings about binary incompatiblity - CCFLAGS += +W1016,1031 -endif - -CPPFLAGS += $(THR_DEFS) -D_HPUX_SOURCE -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE - -# If exception support is explicitly disabled, tell the compiler. -# This is not recommended since the run-time library can throw exceptions. -ifneq ($(exceptions),1) - CCFLAGS += +noeh -endif - -# 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,908 -endif -DCCFLAGS += -g -DLD = $(CXX) $(CCFLAGS) -LD = $(CXX) -OCCFLAGS = -O -PIC = +Z - -PRELIB = $(COMPILE.cc) $^ -AR = /usr/ccs/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$(@F) -Wl,+b/usr/lib -endif -ifeq ($(buildbits),64) -SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/pa20_64 -endif -endif - -endif - -SOEXT = sl - -ifeq ($(buildbits),32) - ifeq ($(itanium),1) - CCFLAGS += +DD32 - else - CCFLAGS += +DA1.1 +DS1.1 - endif -else -ifeq ($(buildbits),64) - ifeq ($(itanium),1) - CCFLAGS += +DD64 - else - ifeq ($(word 2,$(HPVERS_WORDS)), 11) - ## Without the W, it isn't really a 64-bit build - CCFLAGS += +DA2.0W +DS2.0W - else - CCFLAGS += +DA2.0 +DS2.0 - endif - endif -LDFLAGS += -Wl,+vnocompatwarnings -else - ifneq ($(itanium),1) - # HP aCC on Itanium doesn't support this option, defaults to 32bit then. - CCFLAGS += +DAportable - endif -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) - # If -mt is in CPPLAGS, we don't need to add anything to LIBS; -mt does it. - ifeq ($(findstring -mt,$(CPPFLAGS)),) - ## -L./ must directly preceed the system libraries for 64-bit builds - ## with aCC 3.27. Without this change, libpthread.sl can not be found. - LIBS += -L./ -lpthread - endif - endif - LIBS += -lxti -lrt -ldld - -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 d4ee47b86c0..00000000000 --- a/include/makeinclude/platform_hpux_gcc.GNU +++ /dev/null @@ -1,85 +0,0 @@ -# $Id$ -# - -buildbits ?= 0 -debug ?= 1 -distrib ?= 0 -exceptions ?= 1 -optimize ?= 1 -stdcpplib ?= 1 -threads ?= 1 -versioned_so ?= 0 -with_ld ?= hpux - -# 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 (3.,$(findstring 3.,$(CXX_VERSION))) - THR_DEFS = -threads - endif - 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 - -# On HP-UX 11, there's a conflict with pthread_atfork in sys/unistd.h and -# sys/pthread.h - both define the function, but slightly differently. -# -fstrict-prototype resolves the issue. -#ifeq ($(word 2,$(HPVERS_WORDS)), 11) -#CCFLAGS += -fstrict-prototype -#endif -DCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -OCFLAGS += -O2 -PIC = -fPIC -# GNU ar doesn't work (missing libfl.sl?) so use HP ar. -AR = /usr/bin/ar -ARFLAGS = ruv -RANLIB = echo -LDFLAGS = -L. -L$(ACE_ROOT)/lib -Wl,+s -SOFLAGS += $(CPPFLAGS) -shared -nostdlib $(PIC) -Wl,-E -SOEXT = sl -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.$(SOEXT) $< -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 - -# Test for template instantiation, add to SOFLAGS if versioned_so set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) -DHPUX_VERS=$(HPUX_VERS) $(THR_DEFS) diff --git a/include/makeinclude/platform_hpux_kcc.GNU b/include/makeinclude/platform_hpux_kcc.GNU deleted file mode 100644 index b9f75c2865a..00000000000 --- a/include/makeinclude/platform_hpux_kcc.GNU +++ /dev/null @@ -1,123 +0,0 @@ -# $Id$ -# -# This is for HP-UX 11.x using the KCC compiler. -# -# 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. -# -# NOTE: This has only been tested with "buildbits" left as the default. -# - -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 - -# The only way we can disable exceptions is to also disable threads -ifeq ($(threads),1) - THR_DEFS = --thread_safe -DACE_HAS_THREADS -D_POSIX_C_SOURCE=199506L - LDFLAGS = --thread_safe - ARFLAGS = --thread_safe - exceptions = 1 -else - THR_DEFS = -DACE_HAS_THREADS=0 - LDFLAGS = - ARFLAGS = - ifeq (0,$(exceptions)) - CCFLAGS += --no_exceptions - LDFLAGS += --no_exceptions - endif -endif - - -CC = cc -CXX = KCC -CCFLAGS += $(CFLAGS) $(THR_DEFS) -DACE_LACKS_PRAGMA_ONCE --one_instantiation_per_object -DCFLAGS += +K0 -g -DLD = $(CXX) $(CCFLAGS) -LD = $(CXX) -OCCFLAGS = +K3 -O -PIC = +Z -LDFLAGS += -Wl,+s -z -SOFLAGS = -SOEXT = sl - -# Please note that KCC can not replace object files within a -# static library. You must rebuild the library with all of the .o's -# The ar rule will require you to touch all of the object files in .obj, -# including the ones under .obj/ti_files, to do this. -AR = KCC -ARFLAGS += -Bstatic -o - -# KCC allows suppresion of warnings and errors. -# Warning #111 statement is unreachable -CCFLAGS += --diag_suppress 111 - -# KCC always uses the standard cpp library -CCFLAGS += -DACE_HAS_STANDARD_CPP_LIBRARY=1 - -# -# libpthread is automatically linked in by KCC if we use --thread_safe, -# therefore we do not need to explicitly supply it. -# If we link statically and libpthread is supplied with $(LIBS), the -# program will core dump. -# -LIBS += -Bdynamic -lxti -lrt - -ifdef static_libs_only - ifneq ($(static_libs_only),0) - static_libs=1 - endif -endif -# Kind of a hack since LDFLAGS is used for both non-static -# library generation and binary generation. LD is only used for -# binary generation. -ifneq ($(static_libs),0) - CCFLAGS += --one_instantiation_per_object - LD += -Bstatic - # libc is also automatically linked in by KCC, but when we are linking - # statically libc must be linked dynamically or gethostbyname does not - # function properly. - LIBS += -lc -Bstatic -endif - -# -# This section has not been tested. -# -ifeq ($(distrib),1) - 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 -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 - -SONAME = -SOVERSION = diff --git a/include/makeinclude/platform_integrity_ghs.GNU b/include/makeinclude/platform_integrity_ghs.GNU deleted file mode 100644 index ffd50a45410..00000000000 --- a/include/makeinclude/platform_integrity_ghs.GNU +++ /dev/null @@ -1,83 +0,0 @@ -# $Id$ -CROSS-COMPILE = 1 - -ifndef debug - debug = 1 -endif -ifndef optimize - optimize = 1 -endif -ifndef rtti - rtti = 0 -endif # rtti -shared_libs = -static_libs = 1 -ifndef exceptions - exceptions = 1 -endif - -#### CPU type -ifndef CPU - CPU = ppc -endif # CPU - -INTEGRITYTARGET = 1 - -#### Green Hills location, and target-specific definitions. -ifndef GHSROOT - GHSROOT = /home/scooter2/i40_solaris2 -endif - -ifndef RTOSROOT - RTOSROOT = /export/integrity/rtos -endif - -ifndef BSP - BSP = mcp750 -endif - -ifndef TARGET_BSP - TARGET_BSP = $(ACE_ROOT)/tests/ACE.bsp -endif - -ifndef TARGET_LD - TARGET_LD = $(ACE_ROOT)/tests/INTEGRITY.ld -endif - -#### Set Integrity version -verline := $(shell ($(GHSROOT)/gversion 2>&1|grep "Green Hills Software")) -ifeq "$(verline)" "" - $(error Not Green Hills or the environment is not set-up) -endif -INTEGRITY_VERSION_STR := $(strip $(if ifeq $(word 4, $(verline)) "INTEGRITY", $(word 5, $(verline)))) -ifeq "$(INTEGRITY_VERSION_STR)" "" - $(error This Green Hills setup is not for Integrity) -endif -ifeq "$(INTEGRITY_VERSION_STR)" "4.1.8" - CCFLAGS += -DINTEGRITY_VERSION=40108 -endif - -CC = $(GHSROOT)/cc$(CPU) -CXX = $(GHSROOT)/cx$(CPU) - -# undefine "vector" because it's predefined for 7400 boards -IOPS = -bspname=$(RTOSROOT)/target/$(BSP).bld -os_dir $(RTOSROOT) --one_instantiation_per_object -non_shared -Uvector -ifeq (1, $(exceptions)) - IOPS += --exceptions - override rtti = 1 -endif # exceptions - -CCFLAGS += $(CFLAGS) -integrate -dynamic -I$(RTOSROOT)/INTEGRITY-include-SCA $(IOPS) -bspfile=$(TARGET_BSP) $(TARGET_LD) -DCFLAGS += -G -SOFLAGS += -shared -DLD = $(CXX) -LD = $(CXX) -LIBS += -lshm_client -lnet -livfssca -lposixsca -lsocket -PIC = -AR := $(CXX) -archive $(IOPS) -ARFLAGS = -o - - -ifeq (0, $(rtti)) - CCFLAGS += --no_rtti -endif # rtti diff --git a/include/makeinclude/platform_irix5.2.GNU b/include/makeinclude/platform_irix5.2.GNU deleted file mode 100644 index f21ebcb8356..00000000000 --- a/include/makeinclude/platform_irix5.2.GNU +++ /dev/null @@ -1,28 +0,0 @@ -# $Id$ - -# Irix 5.2 with gcc 2.6.1 - -debug = 1 -optimize = 1 - -MAKE = gmake -CC = gcc -CXX = g++ - -DCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -LDFLAGS += -LIBS += -ldl -OCFLAGS += -O2 -PIC = -fpic -RANLIB = echo -SOFLAGS = -SOBUILD = - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/include/makeinclude/platform_irix5.3_g++.GNU b/include/makeinclude/platform_irix5.3_g++.GNU deleted file mode 100644 index 83512d62179..00000000000 --- a/include/makeinclude/platform_irix5.3_g++.GNU +++ /dev/null @@ -1,27 +0,0 @@ -# $Id$ - -# Irix 5.3 with GNU C++ - -debug = 1 -optimize = 1 - -CC = gcc -CXX = g++ - -DCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -LDFLAGS += -L$(ACE_ROOT)/lib -OCFLAGS += -O2 -PIC = -fpic -RANLIB = echo -SOFLAGS += -shared $(CPPFLAGS) -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \ - $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/include/makeinclude/platform_irix5.3_sgic++.GNU b/include/makeinclude/platform_irix5.3_sgic++.GNU deleted file mode 100644 index 00cd1f6c2e9..00000000000 --- a/include/makeinclude/platform_irix5.3_sgic++.GNU +++ /dev/null @@ -1,25 +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 -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 5338d972dcd..00000000000 --- a/include/makeinclude/platform_irix6.x_common.GNU +++ /dev/null @@ -1,14 +0,0 @@ -# $Id$ - -xt_reactor = 1 -exceptions = 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 4a5bdc38440..00000000000 --- a/include/makeinclude/platform_irix6.x_g++.GNU +++ /dev/null @@ -1,33 +0,0 @@ -# $Id$ - -# Irix 6.X with GNU C++ - -include $(ACE_ROOT)/include/makeinclude/platform_irix6.x_common.GNU - -debug ?= 1 -optimize ?= 1 - -CC = gcc -CXX = g++ -CFLAGS += $(DCFLAGS) - -DCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -LDFLAGS += -L$(ACE_ROOT)/lib -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 - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/include/makeinclude/platform_irix6.x_kcc.GNU b/include/makeinclude/platform_irix6.x_kcc.GNU deleted file mode 100644 index f68058a9cf5..00000000000 --- a/include/makeinclude/platform_irix6.x_kcc.GNU +++ /dev/null @@ -1,41 +0,0 @@ -# $Id$ - -# Irix 6.x with KCC 3.4d - -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. -# 280: declaration of a member with the same name as its class -# Get this from <netinet/in.h>. -# 608: this pragma must immediately precede a declaration or statement -# Get this from <ucontext.h> -WARNING_FLAGS += --diag_suppress 111,280,608 - -debug = 1 -optimize = 1 - -CC = KCC -CXX = $(CC) -CFLAGS += -n32 -KCCOPTS = --thread_safe --one_per -CCFLAGS += $(CFLAGS) -DNULL=0 $(WARNING_FLAGS) $(KCCOPTS) -ifeq ($(optimize),1) -DCFLAGS += -g -else -DCFLAGS += +K0 -g -endif -DLD = $(CC) -LD = $(CC) -# warning 84: "" is not used for resolving any symbol. -LDFLAGS += -n32 -L$(ACE_ROOT)/lib -L. --backend -Wl,-woff,84 -#LIBS += -lpthread -OCFLAGS += +K3 -O2 -PIC = -AR = $(CC) -ARFLAGS = $(KCCOPTS) -o -RANLIB = @true -SOFLAGS += $(CPPFLAGS) $(KCCOPTS) -L$(ACE_ROOT)/lib $(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 d51f4876570..00000000000 --- a/include/makeinclude/platform_irix6.x_sgic++.GNU +++ /dev/null @@ -1,91 +0,0 @@ -# -*- Makefile -*- - -# $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. - -debug ?= 1 -optimize ?= 1 -threads ?= 1 - -ifndef templates - templates = implicit -endif # templates - -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. -ifeq ($(threads),1) - CPPFLAGS += -D_SGI_MP_SOURCE -endif - -OCCFLAGS += -O -OPT:Olimit=0 -DCCFLAGS += -g - -# Enable 64-bit builds -ifeq (64,$(buildbits)) - CPPFLAGS += -64 -endif - -# Enable exceptions even in the o32 bit ABI. -CCFLAGS += -exceptions -DACE_HAS_EXCEPTIONS - -# Use the standard library and standard template instantiation mechanisms -CCFLAGS += -LANG:std - -ifneq ($(templates),implicit) - # Instantiate no templates automatically, do not run prelinker. There - # are other choices available, but those have not been used in a while. - CCFLAGS += -no_prelink -endif # templates != implicit - -# 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 - -# Suppress warnings about "pack" pragmas not being defined -# Suppress warnings about "member with the same name as its class" -# Suppress warnings about "class has no copy assignment operator" -# Suppress warnings about "Access control" on inherited classes -# Suppress warnings about "last argument" of varargs function is unnamed -CCFLAGS += -diag_suppress 3284,1253,3439,1234,3506 - -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. -ifndef DONT_LINK_PTHREADS -ifeq ($(threads),1) - LIBS += -lpthread -endif -endif - -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 1de4ed8047c..00000000000 --- a/include/makeinclude/platform_linux.GNU +++ /dev/null @@ -1,163 +0,0 @@ -# -*- Makefile -*- -# $Id$ - -# According to Bryon G. Rigg <bgrigg@opus.bcbnet.com>, this file -# should allow ACE to be built on Linux. - -# We always include config-linux.h on Linux platforms. -ACE_PLATFORM_CONFIG ?= config-linux.h - -exceptions ?= 1 -debug ?= 1 -optimize ?= 1 -threads ?= 1 - -PLATFORM_XT_CPPFLAGS= -PLATFORM_XT_LIBS=-lXt -PLATFORM_XT_LDFLAGS= - -PLATFORM_FL_CPPFLAGS= -PLATFORM_FL_LIBS=-lfltk -lfltk_forms -lfltk_gl -PLATFORM_FL_LDFLAGS= - -PLATFORM_X11_CPPFLAGS=-I/usr/X11R6/include -PLATFORM_X11_LIBS=-lX11 -PLATFORM_X11_LDFLAGS=-L/usr/X11R6/lib - -PLATFORM_GL_CPPFLAGS=-I/usr/X11R6/include -PLATFORM_GL_LIBS =-lGL -PLATFORM_GL_LDFLAGS =-L/usr/X11R6/lib - -PLATFORM_GTK_CPPFLAGS=$(shell gtk-config --cflags) -PLATFORM_GTK_LIBS =$(shell gtk-config --libs) -PLATFORM_GTK_LDFLAGS = - -# NOTE: we only support wxWindows over GTK -PLATFORM_WX_CPPFLAGS= $(shell wx-config --cxxflags) $(PLATFORM_GTK_CPPFLAGS) -PLATFORM_WX_LIBS = $(shell wx-config --libs) $(PLATFORM_GTK_LIBS) -PLATFORM_WX_LDFLAGS = $(shell wx-config --ldflags) $(PLATFORM_GTK_LDFLAGS) - -PLATFORM_BOOST_CPPFLAGS ?= -PLATFORM_BOOST_LDLAGS ?= -PLATFORM_BOOST_UTF_LIBS ?= -lboost_unit_test_framework - -PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4 -PLATFORM_TCL_LIBS=-ltcl8.4 -PLATFORM_TCL_LDFLAGS= - -PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS) -PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG) -PLATFORM_TK_LDFLAGS= - -PLATFORM_AIO_SUPPORT := \ - $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -DACE_HAS_AIO_CALLS) - -ssl ?= 0 -ifeq ($(ssl),1) - # Some Linux OpenSSL installations compile in Kerberos support. Add - # the Kerberos include path to preprocessor include path. - # - # We should probably also add the Kerberos libraries to - # PLATFORM_SSL_LIBS but we can't be sure if they are needed without - # a more sophisticated check. This will only be a problem when - # statically linking the OpenSSL library. The majority of - # installations use shared OpenSSL libraries so we should be okay, - # at least until we migrate to Autoconf. - PLATFORM_SSL_CPPFLAGS += -I/usr/kerberos/include -endif # ssl - -insure ?= 0 -ifeq ($(insure),1) - CC = insure - CXX = insure -else - CC ?= gcc - CXX ?= g++ -endif - -# fix this -pipes ?= 1 - -CFLAGS += -W -Wall -Wpointer-arith -ifeq ($(threads),1) - CPPFLAGS += -D_REENTRANT $(PLATFORM_AIO_SUPPORT) -endif # threads - -# -# Rely on _GNU_SOURCE to set these defaults defined in /usr/include/features.h -# instead of setting them directly here (older versions of gcc don't set it -# for you): _SVID_SOURCE _BSD_SOURCE _POSIX_SOURCE _POSIX_C_SOURCE=199506L, etc... -CPPFLAGS += -D_GNU_SOURCE - -DCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -LIBS += -ldl - -ifeq ($(threads),1) - LIBS += -lpthread -endif -# look for the rt library in the usual places -LIBS += $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -lrt) - -ifeq ($(optimize),1) - SOFLAGS += -Wl,-O3 -endif - -PLATFORM_QT_CPPFLAGS ?= -I$(QTDIR)/include -PLATFORM_QT_LIBS ?= -lqt-mt -PLATFORM_QT_LDFLAGS ?= -L$(QTDIR)/lib - -OCFLAGS ?= -O3 -PIC = -fPIC -AR = ar -ARFLAGS = rsuv -RANLIB = @true -SOFLAGS += $(CPPFLAGS) -shared -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<; \ - $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o -PRELIB = @true - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) - -# Added line below to support "Executable Shared Object" files (as -# needed by the service configurator). -# Marius Kjeldahl <mariusk@sn.no, marius@funcom.com> -ifeq ($(threads),1) - ESOBUILD = $(COMPILEESO.cc) $(PIC) -shared -o $(VSHDIR)$*.so $< - ifndef PRELIB - PRELIB = @true - endif # ! PRELIB -endif - -sctp ?= -# support for OpenSS7 SCTP -ifeq ($(sctp),openss7) - PLATFORM_SCTP_CPPFLAGS+= -DACE_HAS_OPENSS7_SCTP - PLATFORM_SCTP_LDFLAGS?= - PLATFORM_SCTP_LIBS?= -endif - -# support for LKSCTP (Linux Kernel 2.5) -ifeq ($(sctp),lksctp) - PLATFORM_SCTP_CPPFLAGS+= -DACE_HAS_LKSCTP - PLATFORM_SCTP_LDFLAGS?= -L/usr/local/lib - PLATFORM_SCTP_LIBS?= -lsctp -endif - -#### 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_borland.GNU b/include/makeinclude/platform_linux_borland.GNU deleted file mode 100644 index afe08534767..00000000000 --- a/include/makeinclude/platform_linux_borland.GNU +++ /dev/null @@ -1,117 +0,0 @@ -# Hey Emacs, this is a -*- Makefile -*- -# $Id$ - -# platform_linux_borland.GNU - -ifndef BCB -BCB = /usr/local/kylix3 -endif - -exceptions ?= 1 -debug ?= 1 -optimize ?= 1 -threads ?= 1 - -PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4 -PLATFORM_TCL_LIBS=-ltcl8.4 -PLATFORM_TCL_LDFLAGS= - -PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS) -PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG) -PLATFORM_TK_LDFLAGS= - -PLATFORM_AIO_SUPPORT := \ - $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS) - -ifeq ($(threads),1) - LIBS += libpthread.so - ifeq (-DACE_HAS_AIO_CALLS,$(PLATFORM_AIO_SUPPORT)) - CPPFLAGS += -DACE_HAS_AIO_CALLS - LIBS += librt.so - endif -endif # threads - -PLATFORM_XT_CPPFLAGS= -PLATFORM_XT_LIBS=-lXt -PLATFORM_XT_LDFLAGS= - -PLATFORM_FL_CPPFLAGS= -PLATFORM_FL_LIBS=-lfltk -PLATFORM_FL_LDFLAGS= - -PLATFORM_X11_CPPFLAGS=-I/usr/X11R6/include -PLATFORM_X11_LIBS=-lX11 -PLATFORM_X11_LDFLAGS=-L/usr/X11R6/lib - -PLATFORM_GL_CPPFLAGS=-I/usr/X11R6/include -PLATFORM_GL_LIBS =-lGL -PLATFORM_GL_LDFLAGS =-L/usr/X11R6/lib - -PLATFORM_GTK_CPPFLAGS=$(shell gtk-config --cflags) -PLATFORM_GTK_LIBS =$(shell gtk-config --libs) -PLATFORM_GTK_LDFLAGS= - -# NOTE: we only support wxWindows over GTK -PLATFORM_WX_CPPFLAGS= $(shell wx-config --cxxflags) $(PLATFORM_GTK_CPPFLAGS) -PLATFORM_WX_LIBS = $(shell wx-config --libs) $(PLATFORM_GTK_LIBS) -PLATFORM_WX_LDFLAGS = $(shell wx-config --ldflags) $(PLATFORM_GTK_LDFLAGS) - -ifeq ($(insure),1) -CC = insure -CXX = insure -else -CC = $(BCB)/bin/bc++ -CXX = $(BCB)/bin/bc++ -endif - -# Test for template instantiation. -# - -# -# Common flags -# - -ifdef debug -DCFLAGS = -v -y -Od -r- -vi- -D_DEBUG -DCCFLAGS = #-v -y -Od -r- -vi- -k -D_DEBUG -else -DCFLAGS = -DNDEBUG -DCCFLAGS = -endif - -kylix = 1 -INCLUDEPATH = $(BCB)/include/stlport:$(BCB)/include:$(BCB)/include/vcl:/usr/include:$(ACE_ROOT) -LIBPATH = $(BCB)/lib/obj:$(BCB)/lib:/usr/lib:/lib:/usr/X11R6/lib:$(BCB)/bin -ACELIBPATH = $(ACE_ROOT)/lib:./ - -AR = ar -ARFLAGS = rsuv -RANLIB = @true - -DLD = $(BCB)/bin/ilink -LD = $(BCB)/bin/ilink - -TAO_IDL_PREPROCESSOR = bcpp - -WARNINGS_CFLAGS = -w-rvl -w-rch -w-ccc -w-obs -w-aus -w-pia -w-inl - -CFLAGS = $(WARNINGS_CFLAGS) -q -VP -Vx -a8 -b- -k $(DCFLAGS) \ - -c -I$(INCLUDEPATH) - -CPPFLAGS += #$(CFLAGS) -CCFLAGS += $(CFLAGS) -BORLDFLAGS = -c -L$(LIBPATH):$(ACELIBPATH) -x -Gn -v -BORINITEXEOBJ = borinit.o -BORINITSHAREDOBJ = borinitso.o -BORSHAREDOBJ += libborcrtl.so libborstl.so libborunwind.so libc.so libm.so libdl.so -BOREXELIBS += crt1.o -LIBS += $(BORSHAREDOBJ) - -PRELINK= -SOFLAGS= -Tpd $(BORLDFLAGS) - -LINK.cc = override -LINK.cc.override = $(LD) $(LDFLAGS) $(BOREXELIBS) $(BORLDFLAGS) $(POSTLINK) -SOLINK.cc = $(LD) -Tpd - -versioned_so=0 diff --git a/include/makeinclude/platform_linux_cxx.GNU b/include/makeinclude/platform_linux_cxx.GNU deleted file mode 100644 index effb11a4bf1..00000000000 --- a/include/makeinclude/platform_linux_cxx.GNU +++ /dev/null @@ -1,51 +0,0 @@ -# $Id$ - -# This platform macros file is intended to work with -# Linux, using the cxx compiler.. - -debug = 1 -exceptions ?= 1 -rtti ?= 1 - -CC = cxx -CXX = $(CC) -CFLAGS += - - #### RedHat 5.2 /usr/include/malloc.h has an extraneous semicolon. - WARNING_FLAGS += -w0 -msg_disable 381 - ifneq (,$(VERBOSE_WARNING)) - WARNING_FLAGS += -msg_display_number -msg_display_tag - endif # VERBOSE_WARNING - -CCFLAGS += $(CFLAGS) $(WARNING_FLAGS) -ifeq ($(rtti),0) - CCFLAGS += -nortti -endif # rtti -DCFLAGS += -g -O0 -DLD = $(CXX) -LD = $(CXX) -LIBS += -ldl -lpthread -ifeq (-DACE_HAS_AIO_CALLS,$(PLATFORM_AIO_SUPPORT)) - LIBS += -lrt -endif -MATHLIB = -lm -OCFLAGS += -O4 -PIC = -ARFLAGS = rsuv -RANLIB = @true -SOFLAGS += -shared $(ACELIB) -SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \ - ln $(VSHDIR)$*.o $@ - -ifeq (0,$(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_linux_icc.GNU b/include/makeinclude/platform_linux_icc.GNU deleted file mode 100644 index 0516a9deeaf..00000000000 --- a/include/makeinclude/platform_linux_icc.GNU +++ /dev/null @@ -1,147 +0,0 @@ -# $Id$ - -# This file should allow ACE to be built on Linux, using the Intel compiler. - -exceptions ?= 1 -debug ?= 1 -optimize ?= 1 -threads ?= 1 -no_hidden_visibility ?= 1 - -PLATFORM_XT_CPPFLAGS= -PLATFORM_XT_LIBS=-lXt -LATFORM_XT_LDFLAGS= - -PLATFORM_FL_CPPFLAGS= -PLATFORM_FL_LIBS=-lfltk -PLATFORM_FL_LDFLAGS= - -PLATFORM_X11_CPPFLAGS=-I/usr/X11R6/include -PLATFORM_X11_LIBS=-lX11 -PLATFORM_X11_LDFLAGS=-L/usr/X11R6/lib - -PLATFORM_GL_CPPFLAGS=-I/usr/X11R6/include -PLATFORM_GL_LIBS =-lGL -PLATFORM_GL_LDFLAGS =-L/usr/X11R6/lib - -PLATFORM_GTK_CPPFLAGS=$(shell gtk-config --cflags) -PLATFORM_GTK_LIBS =$(shell gtk-config --libs) -PLATFORM_GTK_LDFLAGS= - -# NOTE: we only support wxWindows over GTK -PLATFORM_WX_CPPFLAGS= $(shell wx-config --cxxflags) $(PLATFORM_GTK_CPPFLAGS) -PLATFORM_WX_LIBS = $(shell wx-config --libs) $(PLATFORM_GTK_LIBS) -PLATFORM_WX_LDFLAGS = $(shell wx-config --ldflags) $(PLATFORM_GTK_LDFLAGS) - -PLATFORM_TCL_CPPFLAGS ?= -I/usr/include/tcl8.4 -PLATFORM_TCL_LIBS ?= -ltcl8.4 -PLATFORM_TCL_LDFLAGS = - -PLATFORM_TK_CPPFLAGS ?= -I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS) -PLATFORM_TK_LIBS ?= $(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG) -PLATFORM_TK_LDFLAGS ?= - -PLATFORM_AIO_SUPPORT := \ - $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS) - -SYSARCH := $(shell uname -m) - -ifeq ($(insure),1) - CC = insure - CXX = insure -else - CC = icc - CXX = icpc -endif - -ifndef CXX_VERSION - CXX_VERSION := $(shell $(CXX) --version) -endif - -ifeq (8.0,$(findstring 8.0,$(CXX_VERSION))) - CFLAGS += -wd1476,1505 -endif -ifeq (8.1,$(findstring 8.1,$(CXX_VERSION))) - CFLAGS += -wd1476,1505,1572 -no-gcc -endif -ifeq (9.0,$(findstring 9.0,$(CXX_VERSION))) - CFLAGS += -wd1684 -endif -ifeq (9.1,$(findstring 9.1,$(CXX_VERSION))) - CFLAGS += -wd1684 -endif - -ifeq ($(inline),0) - CPPFLAGS += -fno-inline -endif - -CFLAGS += -w1 -ifeq ($(threads),1) - CPPFLAGS += -D_REENTRANT $(PLATFORM_AIO_SUPPORT) -endif # threads - -CCFLAGS += $(CFLAGS) $(IMPLICIT_TEMPLATES_FLAG) -ip -DCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -LIBS += -ldl - -ifeq ($(threads),1) - LIBS += -lpthread - ifeq (-DACE_HAS_AIO_CALLS,$(PLATFORM_AIO_SUPPORT)) - LIBS += -lrt - endif -endif - -PLATFORM_QT_CPPFLAGS ?= -I$(QTDIR)/include -PLATFORM_QT_LIBS ?= -lqt-mt -PLATFORM_QT_LDFLAGS ?= -L$(QTDIR)/lib - -OCFLAGS += -O3 - -# Disable floating point optimizer solves problem with -# min/max float values in the TAO_IDL compiler tests -# If these options are not passed we can get overflows -# when testing min/max -ifeq ($(SYSARCH),ia64) - CPPFLAGS += -mp -else - CPPFLAGS += -fp-model double -endif - -ifeq ($(optimize),0) - # Disable all optimizing in code - CPPFLAGS += -O0 -endif - -PIC = -fPIC -AR = ar -ARFLAGS = rsuv -RANLIB = @true -SOFLAGS += $(CPPFLAGS) -shared -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<; \ - $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o -PRELIB = @true - -ifeq ($(shared_libs), 1) - ifneq ($static_libs_only), 1) - LDFLAGS += -Wl,-E - - ifneq ($(no_hidden_visibility),1) - CCFLAGS += -fvisibility=hidden - else - CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0 - endif # no_hidden_visibility - endif -endif - - -# Added line below to support "Executable Shared Object" files (as -# needed by the service configurator). -# Marius Kjeldahl <mariusk@sn.no, marius@funcom.com> -ifeq ($(threads),1) - ESOBUILD = $(COMPILEESO.cc) $(PIC) -shared -o $(VSHDIR)$*.so $< - ifndef PRELIB - PRELIB = @true - endif # ! PRELIB -endif diff --git a/include/makeinclude/platform_linux_kcc.GNU b/include/makeinclude/platform_linux_kcc.GNU deleted file mode 100644 index 6b57898c6dd..00000000000 --- a/include/makeinclude/platform_linux_kcc.GNU +++ /dev/null @@ -1,72 +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 - -ifeq (,$(debug)) - debug=0 -endif -ifeq (,$(optimize)) - optimize=1 -endif -ifeq (,$(threads)) - threads = 1 -endif - -CC = KCC -CXX = $(CC) -CPPFLAGS += -D_REENTRANT -D_GNU_SOURCE - -CCFLAGS += $(CFLAGS) -DNULL=0 --one_instantiation_per_object -DCFLAGS += +K0 -g -OCFLAGS += +K3 -O -DLD = $(CC) -LD = $(CC) -# Using just -ldl results in a very annoying warning (nm: no symbols), -# because the prelinker searches for missing templates in the libdl -# library. Passing the option directly to the linker fixes the -# warning. -LIBS += -Wl,-ldl -MATHLIB = -lm - -ifeq (,$(exceptions)) - exceptions=0 -endif # exceptions - -ifeq ($(exceptions),0) - CCFLAGS += --no_exceptions -endif # ! exceptions - -ifeq ($(threads),1) - CFLAGS += --thread_safe - LDFLAGS += --thread_safe -endif # threads - -# KCC allows suppresion of warnings and errors. -# Warning #280 declaration of a member with the same name as its class -CCFLAGS += --diag_suppress 280 - -ifdef static_libs_only - ifneq ($(static_libs_only),0) - static_libs=1 - endif -endif -ifneq ($(static_libs),0) - CCFLAGS += --one_instantiation_per_object -endif - -PIC = -fPIC -AR = $(CC) -ARFLAGS = $(CCFLAGS) $(CPPFLAGS) -Bstatic -o -RANLIB = @true -SOFLAGS += $(PIC) $(CCFLAGS) $(CPPFLAGS) -SOBUILD = $(COMPILE.cc) $(SOFLAGS) -o $(VSHDIR)$*.o $< -PRELIB = @true -PRELIB_USES_OBJ_ONLY = 1 diff --git a/include/makeinclude/platform_linux_pgi.GNU b/include/makeinclude/platform_linux_pgi.GNU deleted file mode 100644 index 63178406929..00000000000 --- a/include/makeinclude/platform_linux_pgi.GNU +++ /dev/null @@ -1,104 +0,0 @@ -# $Id$ - -# This file should allow ACE to be built on Linux, using the -# Portland Group PGI compilers -# -# This is just a copy of platform_linux.GNU, with a few things changed. - -ifndef exceptions - exceptions = 1 -endif -ifeq (,$(debug)) - debug = 0 -endif -ifeq (,$(optimize)) - optimize = 1 -endif -ifeq (,$(threads)) - threads = 1 -endif -ifeq (,$(static_libs_only)) - static_libs_only=1 -endif - -PLATFORM_XT_CPPFLAGS= -PLATFORM_XT_LIBS=-lXt -LATFORM_XT_LDFLAGS= - -PLATFORM_FL_CPPFLAGS= -PLATFORM_FL_LIBS=-lfltk -PLATFORM_FL_LDFLAGS= - -PLATFORM_X11_CPPFLAGS=-I/usr/X11R6/include -PLATFORM_X11_LIBS=-lX11 -PLATFORM_X11_LDFLAGS=-L/usr/X11R6/lib - -PLATFORM_GL_CPPFLAGS=-I/usr/X11R6/include -PLATFORM_GL_LIBS =-lGL -PLATFORM_GL_LDFLAGS =-L/usr/X11R6/lib - -PLATFORM_GTK_CPPFLAGS=$(shell gtk-config --cflags) -PLATFORM_GTK_LIBS =$(shell gtk-config --libs) -PLATFORM_GTK_LDFLAGS= - -# NOTE: we only support wxWindows over GTK -PLATFORM_WX_CPPFLAGS= $(shell wx-config --cxxflags) $(PLATFORM_GTK_CPPFLAGS) -PLATFORM_WX_LIBS = $(shell wx-config --libs) $(PLATFORM_GTK_LIBS) -PLATFORM_WX_LDFLAGS = $(shell wx-config --ldflags) $(PLATFORM_GTK_LDFLAGS) - -PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4 -PLATFORM_TCL_LIBS=-ltcl8.4 -PLATFORM_TCL_LDFLAGS= - -PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS) -PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG) -PLATFORM_TK_LDFLAGS= - -PLATFORM_AIO_SUPPORT := \ - $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS) - -CC = pgcc -CXX = pgCC - -CFLAGS += --one_instantiation_per_object --prelink_objects -Wc,-tused -ifeq ($(threads),1) - CPPFLAGS += -D_REENTRANT $(PLATFORM_AIO_SUPPORT) -endif # threads - -CCFLAGS += $(CFLAGS) $(IMPLICIT_TEMPLATES_FLAG) -DCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -LIBS += -ldl - -ifeq ($(threads),1) - LIBS += -lpthread - ifeq (-DACE_HAS_AIO_CALLS,$(PLATFORM_AIO_SUPPORT)) - LIBS += -lrt - endif -endif - -PLATFORM_QT_CPPFLAGS=-I$(QTDIR)/include -PLATFORM_QT_LIBS=-lqt -PLATFORM_QT_LDFLAGS=-L$(QTDIR)/lib - -OCFLAGS += -O3 - -PIC = -fPIC -AR = ar -ARFLAGS = rsuv -RANLIB = @true -SOFLAGS += $(CPPFLAGS) -shared $(PIC) --one_instantiation_per_object --prelink_objects -SOBUILD = $(COMPILE.cc) $(PIC) --one_instantiation_per_object --prelink_objects -o $(VSHDIR)$*.so $<; \ - $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o -PRELIB = @true - -# Added line below to support "Executable Shared Object" files (as -# needed by the service configurator). -# Marius Kjeldahl <mariusk@sn.no, marius@funcom.com> -ifeq ($(threads),1) - ESOBUILD = $(COMPILEESO.cc) $(PIC) -shared -o $(VSHDIR)$*.so $< - ifndef PRELIB - PRELIB = @true - endif # ! PRELIB -endif diff --git a/include/makeinclude/platform_lynxos.GNU b/include/makeinclude/platform_lynxos.GNU deleted file mode 100644 index fb11c2e4d23..00000000000 --- a/include/makeinclude/platform_lynxos.GNU +++ /dev/null @@ -1,154 +0,0 @@ -# $Id$ -# -# LynxOS with g++. Defaults to LynxOS Version 4.0.0. For Version 3.1.0, -# for example, add "VERSION=3.1.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. - -ifeq ($(shell uname -s),LynxOS) - export VERSION=$(shell uname -r) -else - 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)) - export VERSION=4.0.0 - endif # VERSION - - ifeq (,$(LYNXTARGET)) - export LYNXTARGET = x86 - endif # LYNXTARGET - - ifeq (,$(OBJSFORMAT)) - ifeq (x86,$(LYNXTARGET)) - OBJSFORMAT = coff - else # ! x86 - OBJSFORMAT = xcoff - endif # ! x86 - export OBJSFORMAT - endif # OBJSFORMAT - - ifeq (,$(HOST_OS)) - export HOST_OS = sunos - endif # HOST_OS - - ifeq (,$(HOST_OS_REVISION)) - #### Added for 3.1.0 - export HOST_OS_REVISION = `uname -r` - endif # HOST_OS_REVISION - - ifeq (,$(HOST_OS_TYPE)) - #### Added for 3.1.0 - export HOST_OS_TYPE = solaris - endif # HOST_OS_TYPE - - ifeq (,$(ENV_PREFIX)) - export ENV_PREFIX = /usr/lynx/$(VERSION)/$(LYNXTARGET) - endif # ENV_PREFIX - - ifeq (,$(findstring $(ENV_PREFIX),$(PATH))) - export PATH:=$(ENV_PREFIX)/cdk/$(HOST_OS)-$(OBJSFORMAT)-$(LYNXTARGET)/bin:$(ENV_PREFIX)/cdk/$(HOST_OS)-$(OBJSFORMAT)-$(LYNXTARGET)/usr/bin:$(PATH) - endif # PATH -endif # ! LynxOS - -LYNXOS_MAJOR = $(shell echo $(VERSION) | awk -F. '{print $$1;}') -LYNXOS_MINOR = $(shell echo $(VERSION) | awk -F. '{print $$2;}') - -# LynxOS 3.x does not support shared libraries or native exceptions -ifeq ($(LYNXOS_MAJOR),3) - shared_libs_only = - static_libs_only = 1 - exceptions = 0 -endif - -ifeq ($(shared_libs_only),1) - shared_libs = 1 - static_libs = -endif -ifeq ($(static_libs_only),1) - shared_libs = - static_libs = 1 -endif - -optimize ?= 1 -debug ?= 1 -pipes ?= 1 -threads ?= 1 -exceptions ?= 1 - -PLATFORM_XT_CPPFLAGS= -PLATFORM_XT_LIBS=-lXm -lXt -PLATFORM_XT_LDFLAGS= - -PLATFORM_X11_CPPFLAGS= -PLATFORM_X11_LIBS=-lXpm -lXmu -lXext -lX11 -lSM -lICE -PLATFORM_X11_LDFLAGS= - -PLATFORM_TCL_CPPFLAGS= -PLATFORM_TCL_LIBS= -PLATFORM_TCL_LDFLAGS= - -PLATFORM_TK_CPPFLAGS= -PLATFORM_TK_LIBS= -PLATFORM_TK_LDFLAGS= - -PLATFORM_SSL_CPPFLAGS=-I/usr/ssl/include -PLATFORM_SSL_LIBS= -PLATFORM_SSL_LDFLAGS=-L/usr/ssl/lib - -ifeq ($(threads),1) - CFLAGS += -mthreads - SOFLAGS += -mthreads -endif - -ifeq ($(shared_libs),1) - CFLAGS += -mshared -DACE_HAS_SVR4_DYNAMIC_LINKING - SOFLAGS += -mshared -DACE_HAS_SVR4_DYNAMIC_LINKING - LIBS += -ldl -else - LIBS += -lnetinet -lnsl -endif - -CC = gcc -CXX = g++ -CFLAGS += -Wpointer-arith -Wall -CFLAGS += -DACE_LYNXOS_MAJOR=$(LYNXOS_MAJOR) -DACE_LYNXOS_MINOR=$(LYNXOS_MINOR) -DCFLAGS += -g -PIC = -fPIC -DLD = $(CXX) -LD = $(CXX) -OCFLAGS += -O2 -AR = ar -ARFLAGS = ruv -RANLIB = @true -SOFLAGS += $(CPPFLAGS) -shared -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<; \ - $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o -PRELIB = @true - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) - -# To save much disk space, strip all executables. Comment the -# following line out if you want to debug. Or, add "POSTLINK=" -# to your make invocation. -ifeq ($(static_libs),1) - POSTLINK = ; strip $@ -endif diff --git a/include/makeinclude/platform_m88k.GNU b/include/makeinclude/platform_m88k.GNU deleted file mode 100644 index 0155a3f5e54..00000000000 --- a/include/makeinclude/platform_m88k.GNU +++ /dev/null @@ -1,37 +0,0 @@ -# $Id$ - -# SunOS 5.x (Solaris 2.x) with SunC++ 4.x - -debug = 1 -optimize = 1 - -CC = gcc -CXX = g++ - - -CFLAGS += -w -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)/lib -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 - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) -D__m88k__ $(TEMPLATES_FLAG) -fno-strict-prototypes diff --git a/include/makeinclude/platform_macosx.GNU b/include/makeinclude/platform_macosx.GNU deleted file mode 100644 index 582164ac98b..00000000000 --- a/include/makeinclude/platform_macosx.GNU +++ /dev/null @@ -1,46 +0,0 @@ -# $Id$ -# platform_macosx.GNU -# support for Mac OS X 10.2 (jaguar), 10.3 (panther) -# Note: /sw/lib & /sw/include are inserted for the convience of Fink -# users. Non-Fink users should simply create these directories to -# eliminate the warnings. - -exceptions ?= 1 -threads ?= 1 -debug ?= 1 -optimize ?= 0 -versioned_so ?= 0 -pipes ?= 1 -with_ld = macosx - -CC = gcc -CXX = g++ -CFLAGS += -Wall -Wpointer-arith -Wno-long-double -I/sw/include - -DCFLAGS += -g -DLD = libtool -LD = $(CXX) -LDFLAGS += -L/sw/lib -flat_namespace -undefined warning -LIBS += -lcc_dynamic -lstdc++ -lSystem - -## dlcompat package (not part of base Darwin) is needed for dlopen() on 10.2. -## Fink installer puts libraries in /sw/lib and headers in /sw/include -## In order to install dlcompat do the following: -## - download fink from http://fink.sf.net -## - type: -## fink install dlcompat -## 10.3 does not need this package. -LIBS += -ldl -# 10.3 cannot do -03, this could be version dependent (probably on gcc) -OCFLAGS += -O2 -RANLIB = ranlib -SOEXT = dylib -SOFLAGS += -dynamic -SOBUILD = -o $(VSHDIR)$*.dylib $< - -# Test for template instantiation, add to SOFLAGS if versioned_so set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/include/makeinclude/platform_macosx_panther.GNU b/include/makeinclude/platform_macosx_panther.GNU deleted file mode 100644 index 7d86fafa83b..00000000000 --- a/include/makeinclude/platform_macosx_panther.GNU +++ /dev/null @@ -1,45 +0,0 @@ -# $Id$ -# platform_macosx.GNU -# support for Mac OS X 10.3 (Panther) - -ifndef exceptions - exceptions = 1 -endif -ifeq (,$(threads)) - threads = 1 -endif -ifeq (,$(debug)) - debug = 1 -endif -ifeq (,$(optimize)) - optimize = 0 -endif -ifeq (,$(versioned_so)) - versioned_so = 0 -endif -with_ld = macosx - -pipes ?= 1 - -CC = gcc -CXX = g++ -CFLAGS += -Wall -Wpointer-arith -Wno-long-double - -DCFLAGS += -g -DLD = libtool -LD = $(CXX) -LIBS += -lcc_dynamic -lstdc++ -lSystem - -OCFLAGS += -O2 -mcpu=G3 -mtune=G4 -RANLIB = ranlib -SOEXT = dylib -SOFLAGS += -dynamic -SOBUILD = -o $(VSHDIR)$*.dylib $< - -# Test for template instantiation, add to SOFLAGS if versioned_so set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -LDFLAGS += -flat_namespace -undefined warning -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/include/makeinclude/platform_macosx_tiger.GNU b/include/makeinclude/platform_macosx_tiger.GNU deleted file mode 100644 index 91afd7421df..00000000000 --- a/include/makeinclude/platform_macosx_tiger.GNU +++ /dev/null @@ -1,60 +0,0 @@ -# $Id$ -# platform_macosx.GNU -# support for Mac OS X 10.4 (Tiger) -# By default, this uses the default compiler selected using gcc_select. - -cidl = 1 -boost = 1 -zzip = 1 -zlib = 1 -ifndef exceptions - exceptions = 1 -endif -ifeq (,$(threads)) - threads = 1 -endif -ifeq (,$(debug)) - debug = 1 -endif -ifeq (,$(optimize)) - optimize = 0 -endif -ifeq (,$(ssl)) - ssl = 1 -endif -ifeq (,$(versioned_so)) - versioned_so = 0 -endif -ifeq (,$(no_hidden_visibility)) -# Disable symbol visibility support by default. -# -# Apple's g++ 4 compiler doesn't appear to correctly support -# visibility attributes, at least as well as the vanilla g++. - no_hidden_visibility = 1 -endif -with_ld = macosx - -pipes ?= 1 - -CC = gcc -CXX = g++ -CFLAGS += -Wall -Wpointer-arith -Wno-long-double - -DCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -#LIBS += -lstdc++.6 -lSystem -lSystemStubs - -OCFLAGS += -O2 -mcpu=G3 -mtune=G4 -RANLIB = ranlib -SOEXT = dylib -SOFLAGS += -dynamiclib -SOBUILD = -o $(VSHDIR)$*.dylib $< - -# Test for template instantiation, add to SOFLAGS if versioned_so set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -LDFLAGS += -flat_namespace -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/include/makeinclude/platform_mingw32.GNU b/include/makeinclude/platform_mingw32.GNU deleted file mode 100644 index 73f1d2a2ed0..00000000000 --- a/include/makeinclude/platform_mingw32.GNU +++ /dev/null @@ -1,56 +0,0 @@ -# $Id$ - -# This file should allow to build ACE for mingw32 with mingw tools. -# Edit to change TCPU below. -# -# Don't forget to define the ACE_ROOT environment variable! - -# mingw32 packages as distributed from sourceforge: -# http://sourceforge.net/project/showfiles.php?group_id=2435&release_id=15084 -# See also http://www.mingw.org. -# -# You will also need a GNU Make for win32 (so you can actualy -# USE this file :-). Tested with MSYS from MinGW -# -# Caveat: -# -# If ld complains about not finding crt2.o, dllcrt2.o or gcrt2.o -# when linking executables, you will need to modify the specs file for gcc: -# lib/gcc-lib/mingw32/2.95.2/specs -# look for the line after the one begining ``*startfile:'', and add -# full path as prefix for crt2, dllcrt2 and gcrt2 -# (i.e., change -# ... %{!shared:%{!mdll:crt2%O%s}} ... -# with -# ... %{!shared:%{!mdll:c:/mingw32/lib/gcc-lib/mingw32/2.95.2/crt2%O%s}} ... -# or something similar depending on the location of your instalation). - -# -# Chose your target CPU (by default we set it to pentiumpro. In your -# platform_macros.GNU file you can override this to pentium, i486 or i386 -# -TCPU ?= pentiumpro - -mingw32 = 1 - -# MingW doesn't allow to add the version number of ACE to the dll name -# because fe ace.dll.5.2.3 isn't a valid dll name -versioned_so=0 - -# MinGW doesn't have rwho -rwho = 0 - -# MinGW has wfmo and registry -wfmo = 1 -winregistry = 1 - -# Disable auto-import warnings. The MingW linker has a problem with imports -# See https://sourceforge.net/tracker/?func=detail&atid=102435&aid=683455&group_id=2435 -# for the details why to do this. -LDFLAGS += -Wl,--enable-auto-import - -PWD=$(subst \,/,$(shell pwd)) - -include $(ACE_ROOT)/include/makeinclude/platform_gnuwin32_common.GNU - -PRELIB:= diff --git a/include/makeinclude/platform_mvs.GNU b/include/makeinclude/platform_mvs.GNU deleted file mode 100644 index aedc5be3f48..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)/lib/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 bd1073953a2..00000000000 --- a/include/makeinclude/platform_netbsd.GNU +++ /dev/null @@ -1,55 +0,0 @@ -# $Id$ - -# platform_netbsd.GNU - -versioned_so = 1 - -ifndef exceptions - exceptions = 1 -endif - -ifeq (,$(debug)) - debug = 1 -endif - -ifeq (,$(optimize)) - optimize = 1 -endif - -ifeq (,$(threads)) - threads = 1 -endif - -pipes ?= 1 - -CC = gcc -CXX = g++ - -CFLAGS += -W -Wall -Wpointer-arith -DCFLAGS += -g -LDFLAGS += -Wl,-rpath $(ACE_ROOT)/lib -DLD = $(CXX) -LD = $(CXX) -LIBS += -OCFLAGS += -O2 -PIC = -fpic -AR = ar -ARFLAGS = ruv -RANLIB = ranlib - -SOFLAGS += $(CPPFLAGS) -shared -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< -PRELIB = @echo - -ifeq ($(threads),1) -LDFLAGS += -pthread -CFLAGS += -D_REENTRANT -DACE_HAS_THREADS -endif # threads - -# Test for template instantiation, add to SOFLAGS if versioned_so set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) - diff --git a/include/makeinclude/platform_openbsd.GNU b/include/makeinclude/platform_openbsd.GNU deleted file mode 100644 index d1fe3144e5b..00000000000 --- a/include/makeinclude/platform_openbsd.GNU +++ /dev/null @@ -1,62 +0,0 @@ -# $Id$ - -# platform_openbsd.GNU - -versioned_so = 1 - -ifndef exceptions - exceptions = 1 -endif - -ifeq (,$(debug)) - debug = 1 -endif - -ifeq (,$(optimize)) - optimize = 1 -endif - -ifeq (,$(threads)) - threads = 1 -endif - -pipes ?= 1 - -CC = gcc -CXX = g++ - -CFLAGS += -W -Wall -Wpointer-arith -DCFLAGS += -g -LDFLAGS += -Wl,-rpath $(ACE_ROOT)/lib -DLD = $(CXX) -LD = $(CXX) -LIBS += -OCFLAGS += -O2 -PIC = -fpic -AR = ar -ARFLAGS = ruv -RANLIB = ranlib - -#SOFLAGS += -Bshareable -x /usr/lib/c++rt0.o -SOFLAGS += $(CPPFLAGS) -shared -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< -PRELIB = @echo - -ifeq ($(threads),1) -LDFLAGS += -pthread -CFLAGS += -D_THREAD_SAFE -DACE_HAS_THREADS -endif # threads - -# Setting the internal name and version of shared libraries isn't supported -# by OpenBSD. In fact, the -h option gives an error and interestingly -# enough, the -soname option doesn't but just ignores its parameter. -# This tells platform_g++_common.GNU not to add these link options. -with_ld = openbsd - -# Test for template instantiation, add to SOFLAGS if versioned_so set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) - diff --git a/include/makeinclude/platform_openvms.GNU b/include/makeinclude/platform_openvms.GNU deleted file mode 100644 index 7cb18f81cb3..00000000000 --- a/include/makeinclude/platform_openvms.GNU +++ /dev/null @@ -1,59 +0,0 @@ -# $Id$ - -# for OpenVMS GNV - -ACE_OPENVMS = 1 -versioned_so = 0 -ifndef exceptions - exceptions = 1 -endif -ifeq (,$(debug)) - debug = 1 -endif -ifeq (,$(optimize)) - optimize = 0 -endif - -VDIR = obj/ -VSHDIR = shobj/ - -LN_S = cp -p -DEFFLAGS += -#CCFLAGS += -D__USE_STD_IOSTREAM -ieee -Wc/template=noauto -Wc/noimplicit -CCFLAGS += -D__USE_STD_IOSTREAM -ieee -names_as_is_short -ifeq ($(debug),1) -LDFLAGS += -g -threads -else -LDFLAGS += -threads -endif -DCCFLAGS += -g -OCCFLAGS += -O - -CFLAGS += -ieee -DCFLAGS += -g -OCFLAGS += -O - -#MATHLIB = -lm -PIC = -ARFLAGS = -c -RANLIB = @true -SOFLAGS = -shared -auto_symvec - -LIBS += -lpthread - -CC = cc -CXX = cxx -LD = $(CXX) -DLD = $(CXX) -SOVERSION = -SOEXT = exe -EXEEXT = .exe -INSLIB = $(ACE_ROOT)/lib -REALCLEAN_FILES += $(CLEANUP_VSHLIB_NO_VER:%.exe=%_symvec.opt) $(CLEANUP_VSHLIB_NO_VER:%.exe=%.DSF) \ - $(CLEANUP_BIN:%=%.DSF) - -ifneq ($(MAKEFILE),$(DEPENDENCY_FILE)) -VMS_DUMMY_ := $(shell touch $(DEPENDENCY_FILE)) -VMS_DUMMY_ := $(VMS_DUMMY_) -endif - diff --git a/include/makeinclude/platform_osf1_3.2_cxx.GNU b/include/makeinclude/platform_osf1_3.2_cxx.GNU deleted file mode 100644 index a39e943248c..00000000000 --- a/include/makeinclude/platform_osf1_3.2_cxx.GNU +++ /dev/null @@ -1,35 +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 - -# exceptions=1 is the default on this platform. exceptions=0 has not -# been tested. See the bottom of this file for more. Turning off exceptions -# on this platform can cause bad things to happen. -exceptions ?= 1 - -# We want to test with rtti=1 -rtti ?= 1 -threads ?= 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)/lib -L./ -g2 -O0 -shared -SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \ - ln $(VSHDIR)$*.o $@ diff --git a/include/makeinclude/platform_osf1_4.x_cxx.GNU b/include/makeinclude/platform_osf1_4.x_cxx.GNU deleted file mode 100644 index 47cdd96ae4b..00000000000 --- a/include/makeinclude/platform_osf1_4.x_cxx.GNU +++ /dev/null @@ -1,148 +0,0 @@ -# $Id$ - -# This platform macros file is intended to work with -# Digital UNIX 4.x (OSF/1 4.x), using the cxx compiler.. - -# Note that TAO has not been tested with debug=0 on this platform. So -# you should be careful when turning off debug. -debug ?= 1 - -# exceptions=1 is the default on this platform. exceptions=0 has not -# been tested. See the bottom of this file for more. Turning off exceptions -# on this platform can cause bad things to happen. -exceptions ?= 1 - -# We want to test with rtti=1 -rtti ?= 1 -threads ?= 1 - -# Use of Standard C++ Library requires some flags to be added to the -# compile line -# -stdcpplib ?= 1 - -CC = cxx -CXX = $(CC) - -# Note: Just get the version if it hasnt been defined so far. -# -ifndef CXX_VERSION - CXX_VERSION := $(shell $(CXX) -V) -endif # ! CXX_VERSION - -#### Note: -thread uses POSIX threads. If you want to use DCE threads -#### instead, change "-pthread" to "-threads". -ifeq ($(threads),1) - CFLAGS += -pthread -endif - - - -#### 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-cxx-common.h for the meaning of this warning. - #### It's not necessary on DU 5.0. - WARNING_FLAGS += -msg_disable 1016 - endif # optimize - ifeq (4.,$(findstring 4.,$(shell uname -r))) - # 9: nested comment not allowed. But there's one in /usr/include/pdsc.h! - WARNING_FLAGS += -msg_disable 9 - endif -endif # 6.0 or later - -# Check for enabling automatic template instantiation -# -ifeq (6.,$(findstring 6.,$(CXX_VERSION))) - templates = automatic -else - templates = explicit -endif # 6.x - -# Turn on the appropriate flags -# -ifeq ($(templates),explicit) - ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied. - TEMPLATES_FLAG = -nopt - # Needed to ensure explicit template instantiation of inline functions - inline = 0 - endif - CPPFLAGS += -DACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -else - ifeq ($(templates), automatic) - ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied. - TEMPLATES_FLAG = -pt - SOFLAGS += -tall - endif - else - ifeq ($(templates), used) - ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied. - TEMPLATES_FLAG = -pt - SOFLAGS += -tused - endif - endif # templates == used - endif # templates == automatic -endif # templates == explicit - -# Add the extra definitions needed to use the Standard Template Library -# -ifeq ($(stdcpplib), 1) - CPPFLAGS += -D__USE_STD_IOSTREAM -endif - -# The correct flags to pass to the linker for ELF dynamic shared library -# versioning -# -ifneq ($(SONAME),) - SOFLAGS += -soname $(SONAME) -endif - -CCFLAGS += $(CFLAGS) $(WARNING_FLAGS) $(TEMPLATES_FLAG) -DCFLAGS += -g -O0 -DLD = $(CXX) -LD = $(CXX) -#### 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. It must appear before any -#### linker commands. -LDFLAGS += -hidden $(wildcard /usr/lib/libcxxstd.a) -non_hidden -LIBS += $(CFLAGS) -lxti -lrt -MATHLIB = -lm -OCFLAGS += -O3 -PIC = -ARFLAGS = cruvZ -# This is needed to pull in all the template instantiations from the -# repository into the library. -# -TMPINCDIR = cxx_repository - -# When libraries are archived, a hash index is automatically created -# so there is no need for ranlib -# -RANLIB = @true -SOFLAGS += -shared -use_ld_input $(ACELIB) - -LIBS := $(LIBS) -SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \ - ln $(VSHDIR)$*.o $@ -ifeq (0,$(rtti)) - CCFLAGS += -nortti -endif # rtti - - -ifeq (0,$(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. - ifeq (6.,$(findstring 6.,$(CXX_VERSION))) - CCFLAGS += -nocleanup - endif # 6.x -endif # ! exceptions diff --git a/include/makeinclude/platform_osf1_4.x_g++.GNU b/include/makeinclude/platform_osf1_4.x_g++.GNU deleted file mode 100644 index d4af6cba618..00000000000 --- a/include/makeinclude/platform_osf1_4.x_g++.GNU +++ /dev/null @@ -1,34 +0,0 @@ -# $Id$ - -# This platform macros file is intended to work with Digital UNIX 4.x -# (OSF/1 4.x) and GCC in version 2.7.2.1 (or newer). -debug ?= 1 -exceptions ?= 1 -rtti ?= 1 -threads ?= 1 -optimize ?= 1 - -CC = gcc -CXX = g++ -CFLAGS += -D_REENTRANT - -DCFLAGS += -g -LD = $(CXX) -DLD = $(CXX) -LIBS += -lpthread -lmach -lexc -lxti -lrt -OCFLAGS += -O3 -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 - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) -fno-strict-prototypes diff --git a/include/makeinclude/platform_osf1_4.x_kcc.GNU b/include/makeinclude/platform_osf1_4.x_kcc.GNU deleted file mode 100644 index a3a3178239d..00000000000 --- a/include/makeinclude/platform_osf1_4.x_kcc.GNU +++ /dev/null @@ -1,65 +0,0 @@ -# $Id$ - -# This platform macros file is intended to work with Digital UNIX 4.x -# (OSF/1 4.x) and KAI C++ 3.3f. - -ifeq (,$(debug)) - debug = 1 -endif - -ifeq (,$(exceptions)) - exceptions = 1 -endif - -ifeq (,$(rtti)) - rtti = 1 -endif - -ifeq (,$(threads)) - threads = 1 -endif - -ifeq (,$(optimize)) - optimize = 1 -endif - -# 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 += --display_error_number --diag_suppress 9,111 - -CC = KCC -CXX = $(CC) -CFLAGS += -D_REENTRANT -KCCOPTS = --thread_safe --one_per -CCFLAGS += $(CFLAGS) -DNULL=0 $(WARNING_FLAGS) $(KCCOPTS) -ifeq ($(optimize),1) -DCFLAGS += -g3 -else -DCFLAGS += +K0 -g -endif -LD = $(CC) -DLD = $(CC) -LIBS += -lpthread -lmach -lexc -lxti -lrt -lm -OCFLAGS += +K3 -O -PIC = -AR = $(CC) -ARFLAGS = $(KCCOPTS) -o -# When libraries are archived, a hash index is automatically created so there -# is no need for ranlib -RANLIB = /usr/bin/true -SOFLAGS += $(CPPFLAGS) $(KCCOPTS) -L$(ACE_ROOT)/lib $(ACELIB) -lc - -# With kcc 4, if it does template splitting and ends up with more than -# a certain number of templates, it can screw up the link command so that -# the entry point for the program gets set to one of the template -# instantiations! This forces the correct entry point. -LDFLAGS += --backend -Wl,-e,__start - -# Work around kcc overflowing the arg list... -SHLIBBUILD = $(AR) $(ARFLAGS) $@-tmp.a $(VSHOBJS1) $(LDFLAGS) $(LIBS); $(filter-out -c,$(COMPILE.cc) $(PIC)) -o $@ -all $@-tmp.a -none $(LDFLAGS) $(LIBS) -lc --COMPO_ln_dy -expect_unresolved --COMPO_ln_dy '*'; rm $@-tmp.a - -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< -PRELIB = @true diff --git a/include/makeinclude/platform_osf1_4.x_rcc.GNU b/include/makeinclude/platform_osf1_4.x_rcc.GNU deleted file mode 100644 index 100b1850de0..00000000000 --- a/include/makeinclude/platform_osf1_4.x_rcc.GNU +++ /dev/null @@ -1,41 +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). - -ifeq (,$(debug)) - debug = 1 -endif - -ifeq (,$(exceptions)) - exceptions = 1 -endif -ifeq (,$(rtti)) - rtti = 1 -endif - -ifeq (,$(threads)) - threads = 1 -endif - -ifeq (,$(optimize)) - optimize = 1 -endif - -CC = rcc -CXX = RCC -CFLAGS += -D_REENTRANT -CCFLAGS += $(CFLAGS) -nosienna -DCFLAGS += -g -O0 -DLD = $(CXX) -LD = $(CXX) -LIBS += -lpthread -lc_r -lxti -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 e2a4cbc49fa..00000000000 --- a/include/makeinclude/platform_psos_diab_ppc.GNU +++ /dev/null @@ -1,202 +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) -# -ei1676 turns off the gazillion messages about not overriding pure virtual -# functions in derived classes. - -#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) -ei1676 - -# 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 86491598ac5..00000000000 --- a/include/makeinclude/platform_psosim_g++.GNU +++ /dev/null @@ -1,63 +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 -pipes ?=1 - -CC = gcc -CXX = g++ -CFLAGS += -W -Wall -Wpointer-arith #### -Winline - - -# -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 - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/include/makeinclude/platform_qnx_neutrino.GNU b/include/makeinclude/platform_qnx_neutrino.GNU deleted file mode 100644 index 68bdb5ff4dc..00000000000 --- a/include/makeinclude/platform_qnx_neutrino.GNU +++ /dev/null @@ -1,37 +0,0 @@ -# $Id$ - -# QNX 4.25 hosted GNU g++ for Neutrino 2.0 - -CROSS-COMPILE = 1 -static_libs_only = 1 - -debug ?= 1 -optimize ?= 1 -repo ?= 1 - -pipes ?= 1 - -CC = i386-nto-gcc -CXX = i386-nto-g++ - -CFLAGS += -W -Wall -Wpointer-arith -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 - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/include/makeinclude/platform_qnx_rtp_gcc.GNU b/include/makeinclude/platform_qnx_rtp_gcc.GNU deleted file mode 100644 index 7c13b512c11..00000000000 --- a/include/makeinclude/platform_qnx_rtp_gcc.GNU +++ /dev/null @@ -1,55 +0,0 @@ -# $Id$ -# -# QNX/RTP hosted, using gcc-2.95.2 - -nto_version := $(shell uname -a | awk '{ gsub("\\.","", $$3 ); print $$3;}') - -inline = 1 -debug ?= 1 -optimize ?= 0 -exceptions ?= 1 -threads ?= 1 -ifeq ($(exceptions),1) - CCFLAGS += -fexceptions - LDFLAGS += -fexceptions -else - CCFLAGS += -fno-exceptions - LDFLAGS += -fno-exceptions -endif # ! exceptions - -ifeq ($(inline),1) - CCFLAGS += -finline-functions -else - CCFLAGS += -fno-inline -endif # inline - -ifeq ($(debug),1) - DCFLAGS += -gdwarf-2 -else # debug excludes optimize due to g++ internal compiler error - ifeq ($(optimize),1) - OCFLAGS += -O3 - endif #optimize -endif #debug -CC = gcc -CXX = g++ - -CFLAGS += -pipe -W -Wall -Wpointer-arith -DACE_NTO_VERS=$(nto_version) -CPPFLAGS += -DACE_NTO_VERS=$(nto_version) - -DLD = $(CXX) -LD = $(CXX) -LIBS += -lsocket -lstdc++ -lm - -PIC = -fPIC -AR = ar -ARFLAGS = ruv -#RANLIB = ranlib -SOFLAGS += $(CPPFLAGS) -shared -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< -PRELIB = @true - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/include/makeinclude/platform_rtems.x_g++.GNU b/include/makeinclude/platform_rtems.x_g++.GNU deleted file mode 100644 index ea61a2a0a51..00000000000 --- a/include/makeinclude/platform_rtems.x_g++.GNU +++ /dev/null @@ -1,90 +0,0 @@ -# $Id$ -# -# RTEMS 4.5.0 and later with GNU g++. - -#### 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. - -CROSS-COMPILE = 1 - -debug ?= 1 -optimize ?= 1 -rtti ?= 1 - -shared_libs = -static_libs = 1 - -ifeq (,$(RTEMS_MAKEFILE_PATH)) - default: - @ERROR: you must set your RTEMS_MAKEFILE_PATH environment variable -endif # RTEMS_MAKEFILE_PATH - -ifeq (,$(PERL_PATH)) - PERL_PATH = perl -endif # ! PERL_PATH - - -# Test for template instantiation. -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -#### BEGIN target CPU-specific settings - -# look them up -CFLAGS = $(shell make --no-print-directory -f $(ACE_ROOT)/include/makeinclude/Makefile.rtems print_cflags) -#CCFLAGS = $(shell make --no-print-directory -f $(ACE_ROOT)/include/makeinclude/Makefile.rtems print_cflags) -fno-implicit-templates -CCFLAGS = $(TEMPLATES_FLAG) - -#### END target CPU-specific settings - -CXX := $(shell make --no-print-directory -f $(ACE_ROOT)/include/makeinclude/Makefile.rtems print_cxx) - -ifndef ACE_CC -ACE_CC := $(shell make --no-print-directory -f $(ACE_ROOT)/include/makeinclude/Makefile.rtems print_cc) -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 += - ifneq (1,$(exceptions)) - #### With exceptions, this is applied in wrapper_macros.GNU. - #### Without, we do it here. - CFLAGS += -Wno-uninitialized - endif # ! exceptions -endif # egcs - -#CFLAGS += -D_REENTRANT -ansi -fno-builtin -fno-defer-pop \ -# -fvolatile $(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 += -# Hand build tests/rtems_init.o .. something like this -# sparc-rtems-gcc -B/opt/rtems/sparc-rtems/erc32/lib/ -specs bsp_specs \ -# -qrtems -mcpu=cypress -O -g \ -# -I$(ACE_ROOT) -c -o rtems_init.o rtems_init.c - -LD = $(CXX) $(CCFLAGS) $(ACE_ROOT)/tests/rtems_init.o -LDFLAGS += #-Wl,-X -Wl,-r -OCFLAGS += -O -PIC = - - -#### 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) diff --git a/include/makeinclude/platform_sco-nothread.GNU b/include/makeinclude/platform_sco-nothread.GNU deleted file mode 100644 index 971d616fa7c..00000000000 --- a/include/makeinclude/platform_sco-nothread.GNU +++ /dev/null @@ -1,29 +0,0 @@ -# $Id$ - -debug = 1 -optimize = 1 - -CC = gcc -CXX = g++ - -CFLAGS += -w -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 - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) -fno-strict-prototypes 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 5028c9e8f02..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)/lib -L ./ ${FSU_PTHREADS_DIR}/init/init.o # -z muldefs -# LDLIBS += -L $(ACE_ROOT)/lib -L ./ ${FSU_PTHREADS_DIR}/init/init.o -lACE # -z muldefs -LDLIBS += -L $(ACE_ROOT)/lib # -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 4e3d7e47b4f..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)/lib -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 8f24bd09976..00000000000 --- a/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU +++ /dev/null @@ -1,42 +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)/lib -L ./ ${MIT_PTHREADS_DIR}/init/init.o # -z muldefs -# LDLIBS += -L $(ACE_ROOT)/lib -L ./ ${MIT_PTHREADS_DIR}/init/init.o -lACE # -z muldefs -LDLIBS += -L $(ACE_ROOT)/lib -L ./ -lACE # -z muldefs -CXX = g++ -CFLAGS += -melf -w - -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 - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += -melf -fPIC -Xpg4plus $(TEMPLATES_FLAG) -I ${MIT_PTHREADS_DIR}/include -I /usr/progressive/lib/g++-include 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 e0d349f2952..00000000000 --- a/include/makeinclude/platform_sco5.0.0-nothread.GNU +++ /dev/null @@ -1,40 +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)/lib -CXX = g++ -CFLAGS += -melf -w - -# -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 - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += -melf $(TEMPLATES_FLAG) diff --git a/include/makeinclude/platform_sunos4_g++.GNU b/include/makeinclude/platform_sunos4_g++.GNU deleted file mode 100644 index b80e9a14c2b..00000000000 --- a/include/makeinclude/platform_sunos4_g++.GNU +++ /dev/null @@ -1,33 +0,0 @@ -# $Id$ - -# SunOS 4.x (Solaris 1.x) with g++ - -debug ?= 1 -optimize ?= 1 - -CC = gcc -CXX = g++ -CFLAGS += -fno-strict-prototypes - -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 - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/include/makeinclude/platform_sunos4_lucid.GNU b/include/makeinclude/platform_sunos4_lucid.GNU deleted file mode 100644 index e062639afca..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 2727c38e9f9..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 5aa1e54ceab..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_sunos5_centerline.GNU b/include/makeinclude/platform_sunos5_centerline.GNU deleted file mode 100644 index e70dc213e9d..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_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU deleted file mode 100644 index 9ad51e4d59c..00000000000 --- a/include/makeinclude/platform_sunos5_g++.GNU +++ /dev/null @@ -1,73 +0,0 @@ -# -*- Makefile -*- - -# $Id$ - -# SunOS 5.x (Solaris 2.x) with g++ - -# NOTE: On Solaris86, you'll need to use GNU as instead of /usr/ccs/bin/as, -# if you want -gstabs+ and -pipe support. - -debug ?= 1 -optimize ?= 1 -threads ?= 1 -exceptions ?= 1 -pipes ?= 1 - -ifeq ($(exceptions),0) - CFLAGS += -fno-exceptions -endif # exceptions - -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 #### -Winline - -ifeq ($(threads),1) - CPPFLAGS += -D_REENTRANT -endif - -DLD = $(CXX) -LD = $(CXX) -LDFLAGS += -LIBS += -lsocket -ldl -lgen -lnsl -lposix4 -lthread -OCFLAGS += -O3 -PIC = -fPIC -AR = ar -ARFLAGS = ruv -RANLIB = @true -SOFLAGS += -G $(CPPFLAGS) -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< -PRELIB = @true - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) - -PLATFORM_X11_CPPFLAGS= -I/usr/openwin/include -I/usr/dt/include -PLATFORM_X11_LIBS =-lX11 -PLATFORM_X11_LDFLAGS= - -# TODO: Fix the parameters -#PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4 -#PLATFORM_TCL_LIBS=-ltcl8.4 -#PLATFORM_TCL_LDFLAGS= -# -#PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS) -#PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG) -#PLATFORM_TK_LDFLAGS= - -## Unfortunately, gcc 3.0 fails to many cpp files with -## optimization enabled. Even -O causes the compiler -## to core dump on some files. -ifeq ($(shell $(CXX) --version),3.0) - override optimize = 0 -endif diff --git a/include/makeinclude/platform_sunos5_ghs.GNU b/include/makeinclude/platform_sunos5_ghs.GNU deleted file mode 100644 index caa20ba0f2b..00000000000 --- a/include/makeinclude/platform_sunos5_ghs.GNU +++ /dev/null @@ -1,49 +0,0 @@ -# $Id$ - -# SunOS 5.x (Solaris 2.x) with GreenHills compiler. - -debug = 1 -exceptions = 0 -optimize = 1 -threads = 1 - -# I(kitty) don't know anything about this compiler. Making it explicit. -# -templates = explicit - -# Turn on the proper flags for explicit template instantiation. -# -ifeq ($(templates),explicit) - ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied. - TEMPLATES_FLAG=-tnone - endif - CPPFLAGS += -DACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION - LDFLAGS += --no_auto_instantiation -endif - -CC = gcx -CXX = $(CC) -CCFLAGS += $(CFLAGS) --no_rtti $(TEMPLATES_FLAG) -DCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -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 -endif # ! threads - -ifeq (1,$(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 80554e48bb1..00000000000 --- a/include/makeinclude/platform_sunos5_kcc.GNU +++ /dev/null @@ -1,111 +0,0 @@ -# $Id$ -*- Makefile -*- - -# SunOS 5.x (Solaris 2.x) with KAI C++ 3.3e - -debug = 1 -distrib = 0 -threads = 1 -exceptions = 1 - -# I(kitty) don't know anything about this combination. Making it explicit. -# XXX: Get the flags from the Kai web-site and fill it in. -templates = explicit - -# Turn on the proper flags for explicit template instantiation. -# -ifeq ($(templates),explicit) - ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied. - TEMPLATES_FLAG= - endif - CPPFLAGS += -DACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -endif - -# These are required for KCC 3.4g compiler. -LDFLAGS += --one_instantiation_per_object -CCFLAGS += --one_instantiation_per_object - -ifeq ($(threads),1) - CFLAGS += --thread_safe - LDFLAGS += --thread_safe - ARFLAGS = --thread_safe -else - ARFLAGS = - CCFLAGS += -DACE_HAS_THREADS=0 -endif # threads - -CC = KCC -CXX = KCC - -DCFLAGS += +K0 -g -DLD = $(CXX) -LD = $(CXX) - -ifeq (1,$(exceptions)) - CCFLAGS += --exceptions -else - CCFLAGS += --no_exceptions - LDFLAGS += --no_exceptions -endif - - - -LIBS += -Bdynamic -lsocket -lnsl -lgen -ldl -lposix4 -MATHLIB = -lm -CPPFLAGS += $(CFLAGS) -OCFLAGS += +K3 -o -PIC = -KPIC -AR = KCC -ARFLAGS += -Bstatic -o -RANLIB = echo -SOFLAGS += -G $(CPPFLAGS) - - -ifdef static_libs_only - ifneq ($(static_libs_only),0) - static_libs=1 - endif -endif -ifneq ($(static_libs),0) - CCFLAGS += --one_instantiation_per_object -endif - - - -#### Create template repository to avoid compiler warning. -TEMPLATE_REPOSITORY = Templates.DB - -ifdef CLEANUP_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 # CLEANUP_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". -#### -ifeq (1,$(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 eebe37c5de7..00000000000 --- a/include/makeinclude/platform_sunos5_sunc++.GNU +++ /dev/null @@ -1,296 +0,0 @@ -# -*- Makefile -*- - -# $Id$ - -# SunOS 5.x (Solaris 2.x) with Sun C++ 4.2 and 5.x -# -# 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! -# SOFLAGS += -xtarget=ultra2 -xarch=v9a -# LDFLAGS += -L/opt/SUNWspro/SC5.0/lib/v9 -L/usr/lib/sparcv9 -# Please note that the xtarget and xarch settings are specific to -# the target CPU. The /opt/SUNWspro/ Sun C++ installation directory -# is site-specific. -# -# To build 64-bit binaries with Forte 6 and later, build with the -# "buildbits=64" option (make buildbits=64). -# -# 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. - -compat4 ?= 0 -debug ?= 1 -distrib ?= 0 -stdcpplib ?= 1 -threads ?= 1 -versioned_so ?= 1 -tk_reactor ?= 0 -ace_with_x11 ?= 0 -no_hidden_visibility ?= 1 - -PLATFORM_TK_CPPFLAGS= -PLATFORM_TK_LIBS=-ltk -ltcl -PLATFORM_TK_LDFLAGS= - -PLATFORM_X11_CPPFLAGS= -I/usr/openwin/include -I/usr/dt/include -PLATFORM_X11_LIBS =-lX11 -PLATFORM_X11_LDFLAGS= - -ifeq ($(threads),1) - CFLAGS += -mt - LDFLAGS += -mt -endif # threads - -CC = cc -CXX = CC - -CC_VERSION := $(shell $(CXX) -V 2>&1) - -ifeq (C++ 5.6,$(findstring C++ 5.6,$(CC_VERSION))) - PLATFORM_STLPORT_CPPFLAGS = -library=stlport4 -else - ifeq (C++ 5.7,$(findstring C++ 5.7,$(CC_VERSION))) - PLATFORM_STLPORT_CPPFLAGS = -library=stlport4 - endif -endif - -#### 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". -#### -#### Have to do this _before_ adding any -xarch, -xtarget, etc. flags since -#### -fast is shorthand for a list of internally-assigned options, some of -#### which will are -xarch, -xtarget. Thus, explicit -xarch needs to go -#### to the right of -fast. -DCFLAGS += -g -DCCFLAGS += -DLD = $(CXX) -ifeq (1,$(fast)) - CFLAGS += -fast - DCFLAGS = - DCCFLAGS = - LDFLAGS += -fast -endif # fast - -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. - ifeq (1,$(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. - CPPFLAGS += -DACE_LACKS_RTTI - endif # ! rtti - - #### Create template repository to avoid compiler warning. - TEMPLATE_REPOSITORY = Templates.DB - -else # ! 4.2 - ifeq (C++ 5,$(findstring C++ 5,$(CC_VERSION))) - #### CC 5.0 or later - #### Inlining appears to cause link problems with early releases of - #### CC 5.0. - ifeq (C++ 5.0,$(findstring C++ 5.0,$(CC_VERSION))) - inline = 0 - else - ifeq (C++ 5.1,$(findstring C++ 5.1,$(CC_VERSION))) - inline = 0 - else # ! 5.1 - inline ?= 1 - exceptions ?= 1 - endif # 5.2 or greater - endif #! 5.0 - - CCFLAGS += $(CFLAGS) - - #### If compat=4 is desired, set up for that. There are syntactic diffs - #### in the compatibility modes, but here all we need to be concerned with - #### is turning on -compat=4, and not trying to enable the new libraries. - ifeq ($(compat4),1) - CCFLAGS += -compat=4 - - #### 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. - ifeq (1,$(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. - CPPFLAGS += -DACE_LACKS_RTTI - endif # ! rtti - else - #### Support RTTI by default. And, use old iostreams. - ifeq (C++ 5.0,$(findstring C++ 5.0,$(CC_VERSION))) - ifeq (1,$(stdcpplib)) - CCFLAGS += -library=Cstd - else - CCFLAGS += -library=iostream,no%Cstd - CPPFLAGS += -DACE_USES_OLD_IOSTREAMS - endif # stdcpplib - else - ifeq (0,$(stdcpplib)) - CCFLAGS += -library=iostream - CPPFLAGS += -DACE_USES_OLD_IOSTREAMS - endif # stdcpplib - - # If 64-bit build is desired, turn that on. If no code gen options - # are given to Forte 6, the default build is 32-bit, even when - # building on a 64-bit system. Specifying xarch=v9 generates code - # that runs on any Sparc v9 (64-bit) processor. - # Beginning at (I believe) Studio 10 (C++ 5.7) there's a - # -xarch=generic64 option that works for both Sparc and x86. - # If you want to tune this further, you should extract and insert - # from CCFLAGS in a private platform_macros.GNU file. - ifeq (64,$(buildbits)) - ifeq (C++ 5.7,$(findstring C++ 5.7,$(CC_VERSION))) - CCFLAGS += -xarch=generic64 - LDFLAGS += -xarch=generic64 - else - CCFLAGS += -xarch=v9 - LDFLAGS += -xarch=v9 - endif # C++ 5.7 - endif # buildbits - endif # CC 5.0 - endif # compat4 requested - endif # CC 5.0 or later -endif # ! 4.2 - -# If no option has been specified, try to enable templates based on the -# version of the compiler. -ifeq ($(templates),) - ifeq (Compilers 4.2,$(findstring Compilers 4.2,$(CC_VERSION))) - templates = explicit - else - templates = automatic - endif -endif - -# Turn on the proper flags for explicit template instantiation. -# -ifeq ($(templates),explicit) - ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied. - TEMPLATES_FLAG=-instances=explicit - endif - CPPFLAGS += -DACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -endif - -CCFLAGS += $(TEMPLATES_FLAG) - -#### Sun CC-specific "Pure virtual finction called" bug fix trigger. -#### XXX: Shouldn't this go into a compiler version specific guard ??? -CPPFLAGS += -DSUN_CC_HAS_PVFC_BUG - -#### 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. -ifeq (0,$(exceptions)) - CCFLAGS += -noex - ifeq (C++ 5.6,$(findstring C++ 5.6,$(CC_VERSION))) - override stlport = 1 - else - ifeq (C++ 5.7,$(findstring C++ 5.7,$(CC_VERSION))) - override stlport = 1 - endif - endif -endif # ! exceptions - -ifeq ($(shared_libs), 1) - ifneq ($(static_libs_only), 1) - - # Sun Studio 8 or better has version greater than 5.3. - SUN_STUDIO_8_OR_BETTER := $(shell a=`echo $(CC_VERSION) | sed -e 's/[^0-9]*\([0-9]*\)\.\([0-9]*\).*$$/\1\2/g'`; if test "$$a" -gt 53; then echo 1; else echo 0; fi) - - # Take advantage of Sun Studio 8 (v5.5) symbol scopes to - # generate improved shared library binaries. - ifeq ($(SUN_STUDIO_8_OR_BETTER),1) - ifneq ($(no_hidden_visibility),1) - CCFLAGS += -xldscope=hidden - else - CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0 - endif # no_hidden_visibility - endif # Sun Studio 8 (C++ 5.5) or better. - endif # static_libs_only -endif # shared_libs - -LD = $(CXX) -ifeq ($(distrib),0) - LDFLAGS += -R $(ACE_ROOT)/lib -R./ -endif - -LIBS += -lsocket -ldl -lnsl -lgen -lposix4 -ladm - -LDFLAGS += -xildoff - -OCFLAGS += -xO4 -PIC = -KPIC -AR = CC -ARFLAGS = -xar -o -RANLIB = echo -SOFLAGS += -G $(CPPFLAGS) - -# The correct flags to pass to the linker for ELF dynamic shared library -# versioning. This knows that wrapper_macros.GNU will set versioned_so to -# 1 if it's not set. So, the only way SOFLAGS should _not_ get this is if -# versioned_so has been explicitly disabled. -# -ifeq ($(versioned_so),1) - SOFLAGS += -h $(SONAME) -endif - -ifdef CLEANUP_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 # CLEANUP_BIN diff --git a/include/makeinclude/platform_tandem.GNU b/include/makeinclude/platform_tandem.GNU deleted file mode 100644 index 7081e560849..00000000000 --- a/include/makeinclude/platform_tandem.GNU +++ /dev/null @@ -1,92 +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)/lib" -#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)/lib -#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 72bedef2735..00000000000 --- a/include/makeinclude/platform_tru64_cxx.GNU +++ /dev/null @@ -1,27 +0,0 @@ -# $Id$ - -# This platform macros file is intended to work with -# Digital UNIX using the cxx compiler. - -# Include the common macros for all compilers -# -include $(ACE_ROOT)/include/makeinclude/platform_tru64_pre.GNU - - -# Include the macro file for osf1_4.x -# -include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.x_cxx.GNU - - -### There is a bug with pthreads header file shipped with v1885 of -### V5.1. We need to turn this flag to get asm () inline for -### compilation. -ifeq (1885,$(findstring 1885,$(ACE_DU_SUBVERSION))) - ifeq (6.,$(findstring 6.,$(CXX_VERSION))) - CPPFLAGS += -D_PTHREAD_ENV_DECCXX - endif # 6.x -endif #v1885 - -# Include the common macros for all compilers -# -include $(ACE_ROOT)/include/makeinclude/platform_tru64_post.GNU diff --git a/include/makeinclude/platform_tru64_g++.GNU b/include/makeinclude/platform_tru64_g++.GNU deleted file mode 100644 index 155d71109f8..00000000000 --- a/include/makeinclude/platform_tru64_g++.GNU +++ /dev/null @@ -1,20 +0,0 @@ -# $Id$ - -# This platform macros file is intended to work with -# Digital UNIX using the GNU compiler. - -# Of late, this platform and compiler combination hasn't been tested. In -# fact neither compilation nor testing has been done for almost a year. -# So it's better to avoid this combination, if possible. - -# Include the common macros for all compilers -# -include $(ACE_ROOT)/include/makeinclude/platform_tru64_pre.GNU - -# Include the macro file for osf1_4.x -# -include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.x_g++.GNU - -# Include the common macros for all compilers -# -include $(ACE_ROOT)/include/makeinclude/platform_tru64_post.GNU diff --git a/include/makeinclude/platform_tru64_kcc.GNU b/include/makeinclude/platform_tru64_kcc.GNU deleted file mode 100644 index 0fe62b9c24d..00000000000 --- a/include/makeinclude/platform_tru64_kcc.GNU +++ /dev/null @@ -1,35 +0,0 @@ -# $Id$ - -# This platform macros file is intended to work with -# Digital UNIX using the KAI compiler. - -# Include the common macros for all compilers -# -include $(ACE_ROOT)/include/makeinclude/platform_tru64_pre.GNU - -# Include the macro file for osf1_4.x -# -include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.x_kcc.GNU - -ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION))) - ifeq (4.0F,$(findstring 4.0F,$(ACE_DU_SUBVERSION))) - # variable "" was declared but never referenced. - # Get these from PTHREAD_THIS_CATCH_NP. - WARNING_FLAGS += --diag_suppress 177 - endif # ! 4.0F - -else # ! 4.x -ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION))) - # variable "" was declared but never referenced. - # Get these from PTHREAD_THIS_CATCH_NP. - WARNING_FLAGS += --diag_suppress 177 - - # KCC makes a lot of these warnings from the C compiler. - WARNING_FLAGS += --backend -msg_disable --backend nonstandcast,missingreturn,uninit1,ptrmismatch - -endif # 5.x -endif # ! 4.x - -# Include the common macros for all compilers -# -include $(ACE_ROOT)/include/makeinclude/platform_tru64_post.GNU diff --git a/include/makeinclude/platform_tru64_post.GNU b/include/makeinclude/platform_tru64_post.GNU deleted file mode 100644 index 52ccdc93d1a..00000000000 --- a/include/makeinclude/platform_tru64_post.GNU +++ /dev/null @@ -1,32 +0,0 @@ -# $Id$ - -# Common definitions which were in multiple files adding to the confusion - -# All versions of 4.x...Why doesn't Digital have 4.[a-z] ? That would be -# more fun... - -ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION))) - ifeq (4.0D,$(findstring 4.0D,$(ACE_DU_SUBVERSION))) - CFLAGS += -DDIGITAL_UNIX=0x40D - else - ifeq (4.0E,$(findstring 4.0E,$(ACE_DU_SUBVERSION))) - CFLAGS += -DDIGITAL_UNIX=0x40E - else - ifeq (4.0F,$(findstring 4.0F,$(ACE_DU_SUBVERSION))) - CFLAGS += -DDIGITAL_UNIX=0x40F - else - ifeq (4.0G,$(findstring 4.0G,$(ACE_DU_SUBVERSION))) - CFLAGS += -DDIGITAL_UNIX=0x40F # can't have 0x40G - else - CFLAGS += -DDIGITAL_UNIX=0x400 - endif - endif - endif - endif -else # ! 4.x - ifeq (V5.1,$(findstring V5.1,$(ACE_DU_SUBVERSION))) - CFLAGS += -DDIGITAL_UNIX=0x510 - else - CFLAGS += -DDIGITAL_UNIX=0x500 - endif -endif # ! 5.x diff --git a/include/makeinclude/platform_tru64_pre.GNU b/include/makeinclude/platform_tru64_pre.GNU deleted file mode 100644 index 318ba855258..00000000000 --- a/include/makeinclude/platform_tru64_pre.GNU +++ /dev/null @@ -1,11 +0,0 @@ -# $Id$ - -# Common definitions for all versions of Digital Unix. - -ifndef ACE_DU_VERSION - ACE_DU_VERSION := $(shell uname -r) -endif # ! ACE_DU_VERSION - -ifndef ACE_DU_SUBVERSION - ACE_DU_SUBVERSION := $(shell /usr/sbin/sizer -v) -endif # ! ACE_DU_SUBVERSION diff --git a/include/makeinclude/platform_unixware_g++.GNU b/include/makeinclude/platform_unixware_g++.GNU deleted file mode 100644 index 08a5ca29f13..00000000000 --- a/include/makeinclude/platform_unixware_g++.GNU +++ /dev/null @@ -1,44 +0,0 @@ -# $Id$ - -# UnixWare V2.2.1.2 with g++ version 2.7.2.2 - -debug ?= 0 -exceptions ?= 1 -threads ?= 1 - -CC = gcc -CXX = g++ - -ACE_GNUG_ON_UNIXWARE = 1 - -#ifeq ($(exceptions),1) - CCFLAGS += -fexceptions -#endif - -DCFLAGS += -g -#DCFLAGS += -g - -OCCFLAGS += -O2 - -DLD = $(CXX) -g -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 - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -pipes ?= 1 -CFLAGS += -W -Wall -Wpointer-arith #### -Winline -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/include/makeinclude/platform_unixware_udk.GNU b/include/makeinclude/platform_unixware_udk.GNU deleted file mode 100644 index dbb12577402..00000000000 --- a/include/makeinclude/platform_unixware_udk.GNU +++ /dev/null @@ -1,38 +0,0 @@ -# $Id$ - -# UnixWare V2.2.1.2 with g++ version 2.7.2.2 - -debug ?= 1 -exceptions ?= 1 -threads ?= 1 - -CC = CC -CXX = CC - -CFLAGS += -Kthread - -#CFLAGS += -W -Wall -Wpointer-arith -CCFLAGS += $(CFLAGS) -Tno_implicit,no_auto,none -Wf,--display_error_number - -#ifeq ($(exceptions),1) -# CCFLAGS += -fexceptions -#endif - -DCFLAGS += -g -#DCFLAGS += -g - -OCCFLAGS += -O2 - -DLD = $(CXX) -g -LD = $(CXX) -LIBS += -lsocket -lnsl -lgen -PIC = -KPIC -AR = ar -ARFLAGS = ruv -RANLIB = /bin/true -#SOFLAGS = -assert pure-text -SOFLAGS += -G -# 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.5.x.GNU b/include/makeinclude/platform_vxworks5.5.x.GNU deleted file mode 100644 index 5c7014194a2..00000000000 --- a/include/makeinclude/platform_vxworks5.5.x.GNU +++ /dev/null @@ -1,306 +0,0 @@ -# $Id$ -# VxWorks 5.5.x (x > 0). - -#### Notes: -#### 1) This file requires that the WIND_BASE and WIND_HOST_TYPE environment -#### variables be set. If the target CPU is not SIMNT, then your CPU -#### environment variable must be set. -#### 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. -#### 3) The TOOL environment variable may be set to "diab" (default is "gnu"). -#### 4) If perl is not on your path, you'll also need to set your PERL_PATH -#### environment variable to the full path to perl. - -VXWORKS = 1 -CROSS-COMPILE = 1 - -ifneq (,$(HOST_ROOT)) - TAO_IDL := $(HOST_ROOT)/bin/tao_idl.exe - TAO_IDL_DEP := $(TAO_IDL) - TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/gperf -endif - -ifeq ("$(OS)", "Windows_NT") -ifneq ($(MAKE_MODE), unix) -vxworks_ntbuild = 1 -MKDIR_NTSTYLE = 1 -endif -endif - -debug ?= 1 -optimize ?= 1 -rtti ?= 1 -threads ?= 1 -exceptions ?= 1 - -ifeq ($(static_libs),1) - shared_libs = 0 -else - static_libs = 0 -endif -versioned_so ?= 0 - -# VxWorks doesn't have rwho -rwho = 0 - -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 - -ifeq ($(DIAB_HOST_TYPE),) -ifeq ("$(OS)", "Windows_NT") - DIAB_HOST_TYPE = WIN32 -else - DIAB_HOST_TYPE = UNIX -endif -endif - -HOST_DIR = $(WIND_BASE)/host/$(WIND_HOST_TYPE) - -ifeq (,$(PERL_PATH)) - PERL_PATH = perl -endif # ! PERL_PATH - -ifeq ($(VXWORKS_VERSION_FLAG),) - VXWORKS_VERSION_FLAG = -DACE_VXWORKS=0x551 -endif # VXWORKS_VERSION_FLAG - -ifeq ($(TOOL),) - override TOOL = gnu -else - override TOOL := $(TOOL) -endif -override TOOL_FAMILY := $(TOOL) - -ifeq ("$(TOOL)","gnu") - templates ?= automatic -endif - -PRJ_TYPE = vxApp -TARGET_DIR = $(WIND_BASE)/target/h -TGT_DIR = $(WIND_BASE)/target - -ifeq ($(CPU),) - # default CPU - CPU = SIMNT -else - override CPU := $(CPU) -endif - -ifeq ($(findstring PPC, $(CPU)), PPC) - CCFLAGS += -mlongcall -endif - -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 = $(VDIR) -endif # shared_libs - -BIN_UNCHECKED ?= -SHLIB_UNCHECKED ?= - -ifneq ("$(BIN_UNCHECKED)","") -VX_APP_BUILD := 1 -else - ifeq ($(SHARED_LIBS),1) - ifneq ("$(SHLIB_UNCHECKED)","") - VX_SO_BUILD := 1 - endif - endif - ifneq ($(VX_SO_BUILD),1) - VX_LIB_BUILD := 1 - endif -endif - -ifneq ($(VX_LIB_BUILD),1) - VXWORKSLINK = true - ifeq ($(VX_APP_BUILD),1) - ## set variables for VxWorks linktarget identification - PRJ_FILE = $(basename $(notdir $(BIN_UNCHECKED))).vxworks - EXEEXT = .out - PRJ_DIR = . - CLEANUP_OBJS := ctdt.c $(PRJ_DIR)/$(PRJ_FILE) $(CLEANUP_OBJS) - else - ## set variables for VxWorks .SO linktarget identification - PRJ_FILE = $(basename $(notdir $(SHLIB_UNCHECKED))).vxworks - PRJ_DIR = . - CLEANUP_OBJS := ctdt.c $(PRJ_DIR)/$(PRJ_FILE) *.out $(CLEANUP_OBJS) - endif -endif - -include $(TARGET_DIR)/make/defs.default -include $(TARGET_DIR)/make/defs.$(WIND_HOST_TYPE) -include $(TARGET_DIR)/make/defs.$(PRJ_TYPE) -include $(TARGET_DIR)/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL) - -## make sure we don't use that stupid, crippled vxrm.bat script. -override RM=rm -f - -ifeq ("$(VXWORKSLINK)","true") - # prevent possible clash with static LIB rules - # in VxWorks make includes and rules.lib.GNU - override ARCHIVE = - override LARGE_PROJECT = - PRJ_OBJS = $(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - ifeq ($(SHARED_LIBS),1) - ##LD_PARTIAL += -L$(ACE_ROOT)/lib -L./ $(LDLIBPATH) $(LD_LINK_PATH) - PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - ifeq ($(VX_SO_BUILD),1) - ## Shared lib builds for VxWorks will also build 'import' libraries - LIB_INSTALL += $(VLIB:%=$(INSLIB)/%) - CLEANUP_INSTALL += $(CLEANUP_VLIB:%=$(INSLIB)/%) - REALCLEAN_FILES += $(CLEANUP_LIB:%=%) $(CLEANUP_LIB:%=%_debug) $(CLEANUP_LIB:%=%_profile) $(CLEANUP_LIB:%=%_optimize) - endif - else - LD_PARTIAL += -L$(ACE_ROOT)/ace -L./ $(LDLIBPATH) $(LD_LINK_PATH) - PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) $(VLDLIBS) $(ACE_SHLIBS) $(LIBS) - endif - PRJ_OBJS_FOR_LD=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - PRJ_OBJS_FOR_NM=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - PRJ_OBJS_FOR_AR=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - POST_BUILD_RULE = $(POSTLINK) - COMPILE_TRADITIONAL = $(CC) $(OPTION_OBJECT_ONLY) $(OPTION_DOLLAR_SYMBOLS)\ - $(filter-out -ansi, $(CFLAGS)) - - ## make sure default target stays the ACE/TAO default target - ## -default: all - -endif - -CPPFLAGS += $(VXWORKS_VERSION_FLAG) - -ifeq ($(debug),1) - DCFLAGS += -g - DCCFLAGS += -g - CPPFLAGS += -endif - -ifeq ("$(TOOL)","gnu") -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -ifeq ("$(templates)","automatic") -ifdef repo -ifeq ("$(VXWORKSLINK)","true") - ifeq ($(VX_APP_BUILD),1) - ifneq ($(SHARED_LIBS),1) - LD_PARTIAL += -frepo - endif - endif -else - ace_lib_prelink := 1 - LINK.cc = override - LINK.cc.override = $(LD_PARTIAL) -frepo -L$(ACE_ROOT)/ace -L$(INSLIB) -L./ $(LDLIBPATH) $(LD_LINK_PATH) - LDFLAGS = $(ACE_SHLIBS) -endif -else - C++FLAGS += -fmerge-templates -endif -endif - -# TEMPLATES_FLAG is set by platform_g++_common.GNU -ifneq ($(TEMPLATES_FLAG),) # If specified, add it to the CCFLAGS - CPPFLAGS += $(TEMPLATES_FLAG) -endif -endif # TOOL == gnu - -ifeq ("$(TOOL)","diab") -ifeq ($(exceptions),1) - C++FLAGS += -Xexceptions -else - C++FLAGS += -Xexceptions-off -endif -else -ifeq ("$(TOOL)","gnu") -ifeq ($(exceptions),1) - C++FLAGS += -fexceptions -else - C++FLAGS += -fno-exceptions -endif -endif -endif - -ifeq (0,$(rtti)) -C++FLAGS += -DACE_LACKS_RTTI -ifeq ("$(TOOL)","gnu") - C++FLAGS += -fno-rtti -else - C++FLAGS += -Xrtti-off -endif -endif # rtti - -ifneq ($(findstring $(VX_CPU_FAMILY),ppc arm),) -ifeq ("$(TOOL)","diab") - C++FLAGS += -Xchar-signed -else -ifeq ("$(TOOL)","gnu") - C++FLAGS += -fsigned-char -endif -endif -endif - -ifeq ($(CPU),SIMNT) -override MUNCH_FLAGS := -asm $(TOOLENV) -endif - -ifneq ($(optimize),1) - CC_OPTIM_NORMAL = -endif - -CCFLAGS += $(C++FLAGS) - -PIC = - -ifeq ("$(VXWORKSLINK)","true") - - ifdef repo - ifeq ($(SHARED_LIBS),1) - BACKUP_RPO_RULE = for %f in ($(basename $(addprefix $(VDIR), $(OBJS)) $(VSHOBJS))) do if exist %f.rpo mv %f.rpo %f.rpobak $(ACE_NUL_STDERR) - POST_BUILD_RULE = for %f in ($(basename $(addprefix $(VDIR), $(OBJS)) $(VSHOBJS))) do if exist %f.rpobak mv %f.rpobak %f.rpo $(ACE_NUL_STDERR) - endif - endif - -.PHONY: $(PRJ_DIR)/$(PRJ_FILE) - ## special target to satisfy VxWorks dependencies for images -$(PRJ_DIR)/$(PRJ_FILE): - ifdef repo - ifeq ($(SHARED_LIBS),1) - #### execute prelink step to make compiler instantiate all needed - #### templates; discard image and repo files (*.rpo) after linkstep - #### this step holds for both .SO as well as 'app' images so use both VSHOBJS and OBJS - -$(LD_PARTIAL) -frepo -L$(ACE_ROOT)/ace -L./ $(LDLIBPATH) $(LD_LINK_PATH)$(LINK_OUTPUT_FLAG) ace-templ_inst $? $(ACE_SHLIBS) $(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - -$(RM) ace-templ_inst - #### We need to backup the .RPO files or otherwise the link step of the final image will - #### start instantiating templates again even if we do not specify '-frepo'! - -$(BACKUP_RPO_RULE) - ifeq ($(VX_SO_BUILD),1) - #### build library of objects in .SO to use as a sort of import library for VxWorks - echo $(filter %.o, $(VSHOBJS)) | xargs $(AR) $(ARFLAGS) $(VLIB) $(AREXTRA) - -chmod a+r $(VLIB) - ifneq (,$(RANLIB)) - -$(RANLIB) $(VLIB) - endif # RANLIB - endif # VX_SO_BUILD - endif - endif - @echo 1>$@ - -endif diff --git a/include/makeinclude/platform_vxworks5.x_ghs.GNU b/include/makeinclude/platform_vxworks5.x_ghs.GNU deleted file mode 100644 index 7d38a2d8e3e..00000000000 --- a/include/makeinclude/platform_vxworks5.x_ghs.GNU +++ /dev/null @@ -1,118 +0,0 @@ -# $Id$ -# -# VxWorks 5.3.1 and later with Green Hills 1.8.8 and later. - -#### 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 -#### GHSROOT = /project/doc/pkg/wind/green -#### include $(ACE_ROOT)/include/makeinclude/platform_vxworks5.x_ghs.GNU - -VXWORKS = 1 -CROSS-COMPILE = 1 - -ifndef debug - debug = 1 -endif -ifndef optimize - optimize = 1 -endif -ifndef rtti - rtti = 1 -endif # rtti -shared_libs = -static_libs = 1 - -# VxWorks doesn't have rwho -rwho = 0 - -#### 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 GHSROOT - GHSROOT = /project/doc/pkg/wind/green - endif - ifndef GHS - GHS = $(GHSROOT)/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 GHSROOT - GHSROOT = /appl/newgreen - endif - ifndef GHS - GHS = $(GHSROOT)/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: -ifeq (1,$(exceptions)) - LIBS += $(GHS)/libsce.a $(GHS)/libsedge.a $(GHS)/setup_eh.o -else - LIBS += $(GHS)/libscnoe.a $(GHS)/libsedgnoe.a -endif -LIBS += $(GHS)/liblockinit_sc.o $(GHSROOT)/$(CPU)/libarch.a - -CC = cxvx$(CPU) -CXX = $(CC) -CCFLAGS += $(CFLAGS) -tnone -Dghs -I$(GHSROOT)/vxworks/include -I$(WIND_BASE)/target/h -DCFLAGS += -g -SOFLAGS += -shared -DLD = $(CXX) -LD = $(CXX) -LDFLAGS = --no_auto_instantiation -OCFLAGS += -OL -OM -PIC = - -ifeq (1, $(exceptions)) - CCFLAGS += --stdle --exceptions - override rtti = 1 -endif # exceptions - -ifeq (0, $(rtti)) - CCFLAGS += --no_rtti -endif # rtti diff --git a/include/makeinclude/platform_vxworks6.2.GNU b/include/makeinclude/platform_vxworks6.2.GNU deleted file mode 100644 index f3e8a9bafab..00000000000 --- a/include/makeinclude/platform_vxworks6.2.GNU +++ /dev/null @@ -1,351 +0,0 @@ -# $Id$ -# VxWorks 6.2 - -#### Notes: -#### 1) This file requires that the WIND_BASE and WIND_HOST_TYPE environment -#### variables be set. If the target CPU is not SIMNT, then your CPU -#### environment variable must be set. -#### 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. -#### 3) The TOOL environment variable may be set to "diab" (default is "gnu"). -#### 4) If perl is not on your path, you'll also need to set your PERL_PATH -#### environment variable to the full path to perl. - -VXWORKS = 1 -CROSS-COMPILE = 1 - -ifneq (,$(HOST_ROOT)) - TAO_IDL ?= $(HOST_ROOT)/bin/tao_idl$(EXEEXT) - TAO_IDL_DEP ?= $(TAO_IDL) - TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/gperf -endif - -ifeq ("$(OS)", "Windows_NT") -ifneq ($(MAKE_MODE), unix) -vxworks_ntbuild = 1 -MKDIR_NTSTYLE = 1 -endif -endif - -debug ?= 1 -optimize ?= 1 -rtti ?= 1 -threads ?= 1 -exceptions ?= 1 -rtp ?= 1 -pthread ?= 1 - -ifeq ($(static_libs),1) - shared_libs = 0 -else - static_libs = 0 -endif -versioned_so ?= 0 - -# VxWorks doesn't have rwho -rwho = 0 - -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 - -ifeq ($(DIAB_HOST_TYPE),) -ifeq ("$(OS)", "Windows_NT") - DIAB_HOST_TYPE = WIN32 -else - DIAB_HOST_TYPE = UNIX -endif -endif - -HOST_DIR = $(WIND_BASE)/host/$(WIND_HOST_TYPE) - -ifeq (,$(PERL_PATH)) - PERL_PATH = perl -endif # ! PERL_PATH - -ifeq ($(VXWORKS_VERSION_FLAG),) - VXWORKS_VERSION_FLAG = -DACE_VXWORKS=0x620 -endif # VXWORKS_VERSION_FLAG - -ifeq ($(TOOL),) - override TOOL = gnu -else - override TOOL := $(TOOL) -endif -override TOOL_FAMILY := $(TOOL) - -ifeq ("$(TOOL)","gnu") - templates ?= automatic -endif - -ifeq ($(rtp),0) - PRJ_TYPE = vxApp -endif - -ifeq ($(rtp),1) - TARGET_DIR = $(WIND_BASE)/target/usr -else - TARGET_DIR = $(WIND_BASE)/target/h -endif -TGT_DIR = $(WIND_BASE)/target - -ifeq ($(CPU),) - # default CPU - CPU = SIMNT -else - override CPU := $(CPU) -endif - -ifeq ($(shared_libs),1) - SHARED_LIBS = 1 -endif -ifeq ($(shared_libs_only),1) - SHARED_LIBS = 1 -endif - -ifeq ($(rtp),0) - ifeq ($(SHARED_LIBS),1) - ACELIB = -L./ - #### There's no difference between non-shared and shared object code. - VSHDIR = $(VDIR) - endif # shared_libs -endif - -BIN_UNCHECKED ?= -SHLIB_UNCHECKED ?= - -ifneq ("$(BIN_UNCHECKED)","") -VX_APP_BUILD := 1 -else - ifeq ($(SHARED_LIBS),1) - ifneq ("$(SHLIB_UNCHECKED)","") - VX_SO_BUILD := 1 - endif - endif - ifneq ($(VX_SO_BUILD),1) - VX_LIB_BUILD := 1 - endif -endif - -ifneq ($(VX_LIB_BUILD),1) - ifeq ($(rtp),0) - VXWORKSLINK = true - endif - ifeq ($(VX_APP_BUILD),1) - ## set variables for VxWorks linktarget identification - ifeq ($(rtp),0) - EXEEXT = .out - PRJ_FILE = $(basename $(notdir $(BIN_UNCHECKED))).vxworks - else - PRJ_FILE = $(basename $(notdir $(BIN_UNCHECKED))).vxe - EXEEXT = .vxe - VXE_DIR := $(OUTPUT_DIRECTORY) - EXE = $(BIN_UNCHECKED) - GENERATED_DIRTY += $(PRJ_DIR)/$(PRJ_FILE) - endif - PRJ_DIR = . - CLEANUP_OBJS := ctdt.c $(PRJ_DIR)/$(PRJ_FILE) $(CLEANUP_OBJS) - else - ## set variables for VxWorks .SO linktarget identification - PRJ_FILE = $(basename $(notdir $(SHLIB_UNCHECKED))).vxworks - PRJ_DIR = . - CLEANUP_OBJS := ctdt.c $(PRJ_DIR)/$(PRJ_FILE) *.out $(CLEANUP_OBJS) - endif -endif - -ifeq ($(rtp),1) - include $(WIND_USR)/make/defs.default - include $(WIND_USR)/make/defs.$(WIND_HOST_TYPE) - include $(WIND_USR)/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL) - CPPFLAGS += -mrtp - LDFLAGS := $(filter-out -X, $(LDFLAGS)) - LD := $(CPLUS) - DLD := $(CPLUS) - LDFLAGS += -L$(WIND_USR)/lib/$(VX_CPU_FAMILY)/$(CPU)/common - LDLIBS += -ldl -else - include $(TGT_DIR)/h/make/defs.default - include $(TGT_DIR)/h/make/defs.$(WIND_HOST_TYPE) - include $(TGT_DIR)/h/make/defs.$(PRJ_TYPE) - include $(TGT_DIR)/h/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL) -endif - -## make sure we don't use that stupid, crippled vxrm.bat script. -override RM=rm -f - -ifeq ("$(VXWORKSLINK)","true") - # prevent possible clash with static LIB rules - # in VxWorks make includes and rules.lib.GNU - override ARCHIVE = - override LARGE_PROJECT = - PRJ_OBJS = $(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - ifeq ($(SHARED_LIBS),1) - ##LD_PARTIAL += -L$(ACE_ROOT)/lib -L./ $(LDLIBPATH) $(LD_LINK_PATH) - PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - ifeq ($(VX_SO_BUILD),1) - ## Shared lib builds for VxWorks will also build 'import' libraries - LIB_INSTALL += $(VLIB:%=$(INSLIB)/%) - CLEANUP_INSTALL += $(CLEANUP_VLIB:%=$(INSLIB)/%) - REALCLEAN_FILES += $(CLEANUP_LIB:%=%) $(CLEANUP_LIB:%=%_debug) $(CLEANUP_LIB:%=%_profile) $(CLEANUP_LIB:%=%_optimize) - endif - else - LD_PARTIAL += -L$(ACE_ROOT)/ace -L./ $(LDLIBPATH) $(LD_LINK_PATH) - PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) $(VLDLIBS) $(ACE_SHLIBS) $(LIBS) - endif - PRJ_OBJS_FOR_LD=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - PRJ_OBJS_FOR_NM=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - PRJ_OBJS_FOR_AR=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - POST_BUILD_RULE = $(POSTLINK) - COMPILE_TRADITIONAL = $(CC) $(OPTION_OBJECT_ONLY) $(OPTION_DOLLAR_SYMBOLS)\ - $(filter-out -ansi, $(CFLAGS)) - - ## make sure default target stays the ACE/TAO default target - ## -default: all - -endif - -CPPFLAGS += $(VXWORKS_VERSION_FLAG) - -ifeq ($(debug),1) - DCFLAGS += -g - DCCFLAGS += -g - CPPFLAGS += -endif - -ifeq ($(pthread),1) - CPPFLAGS += -DACE_HAS_PTHREADS -endif - -ifeq ("$(TOOL)","gnu") -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -ifeq ("$(templates)","automatic") -ifdef repo -ifeq ("$(VXWORKSLINK)","true") - ifeq ($(VX_APP_BUILD),1) - ifneq ($(SHARED_LIBS),1) - LD_PARTIAL += -frepo - endif - endif -else - ifeq ($(rtp),0) - ace_lib_prelink := 1 - LINK.cc = override - LINK.cc.override = $(LD_PARTIAL) -frepo -L$(ACE_ROOT)/ace -L$(INSLIB) -L./ $(LDLIBPATH) $(LD_LINK_PATH) - LDFLAGS = $(ACE_SHLIBS) - endif -endif -else - C++FLAGS += -fmerge-templates -endif -endif - -# TEMPLATES_FLAG is set by platform_g++_common.GNU -ifneq ($(TEMPLATES_FLAG),) # If specified, add it to the CCFLAGS - CPPFLAGS += $(TEMPLATES_FLAG) -endif -endif # TOOL == gnu - -ifeq ("$(TOOL)","diab") -ifeq ($(exceptions),1) - C++FLAGS += -Xexceptions -else - C++FLAGS += -Xexceptions-off -endif -else -ifeq ("$(TOOL)","gnu") -ifeq ($(exceptions),1) - C++FLAGS += -fexceptions -else - C++FLAGS += -fno-exceptions -endif -endif -endif - -ifeq (0,$(rtti)) -C++FLAGS += -DACE_LACKS_RTTI -ifeq ("$(TOOL)","gnu") - C++FLAGS += -fno-rtti -else - C++FLAGS += -Xrtti-off -endif -endif # rtti - -ifneq ($(findstring $(VX_CPU_FAMILY),ppc arm),) -ifeq ("$(TOOL)","diab") - C++FLAGS += -Xchar-signed -else -ifeq ("$(TOOL)","gnu") - C++FLAGS += -fsigned-char -endif -endif -endif - -ifeq ($(CPU),SIMNT) -override MUNCH_FLAGS := -asm $(TOOLENV) -endif - -ifneq ($(optimize),1) - CC_OPTIM_NORMAL = -endif - -CCFLAGS += $(C++FLAGS) - -ifeq (0,$(rtp)) -PIC = -else - ifeq ("$(TOOL)","diab") - PIC = -Xpic - else - ifeq ("$(TOOL)","gnu") - PIC = -fpic - endif -endif -endif - -ifeq ("$(VXWORKSLINK)","true") - - ifdef repo - ifeq ($(SHARED_LIBS),1) - BACKUP_RPO_RULE = for %f in ($(basename $(addprefix $(VDIR), $(OBJS)) $(VSHOBJS))) do if exist %f.rpo mv %f.rpo %f.rpobak $(ACE_NUL_STDERR) - POST_BUILD_RULE = for %f in ($(basename $(addprefix $(VDIR), $(OBJS)) $(VSHOBJS))) do if exist %f.rpobak mv %f.rpobak %f.rpo $(ACE_NUL_STDERR) - endif - endif - -.PHONY: $(PRJ_DIR)/$(PRJ_FILE) - ## special target to satisfy VxWorks dependencies for images -$(PRJ_DIR)/$(PRJ_FILE): - ifdef repo - ifeq ($(SHARED_LIBS),1) - #### execute prelink step to make compiler instantiate all needed - #### templates; discard image and repo files (*.rpo) after linkstep - #### this step holds for both .SO as well as 'app' images so use both VSHOBJS and OBJS - -$(LD_PARTIAL) -frepo -L$(ACE_ROOT)/ace -L./ $(LDLIBPATH) $(LD_LINK_PATH)$(LINK_OUTPUT_FLAG) ace-templ_inst $? $(ACE_SHLIBS) $(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - -$(RM) ace-templ_inst - #### We need to backup the .RPO files or otherwise the link step of the final image will - #### start instantiating templates again even if we do not specify '-frepo'! - -$(BACKUP_RPO_RULE) - ifeq ($(VX_SO_BUILD),1) - #### build library of objects in .SO to use as a sort of import library for VxWorks - echo $(filter %.o, $(VSHOBJS)) | xargs $(AR) $(ARFLAGS) $(VLIB) $(AREXTRA) - -chmod a+r $(VLIB) - ifneq (,$(RANLIB)) - -$(RANLIB) $(VLIB) - endif # RANLIB - endif # VX_SO_BUILD - endif - endif - @echo 1>$@ - -endif diff --git a/include/makeinclude/platform_win32_dmc.GNU b/include/makeinclude/platform_win32_dmc.GNU deleted file mode 100644 index 2818bb64265..00000000000 --- a/include/makeinclude/platform_win32_dmc.GNU +++ /dev/null @@ -1,47 +0,0 @@ -# $Id$ - -# debug = 1 -# optimize = 1 -# exceptions = 0 - -winsock2 ?= 1 -exceptions ?= 0 -debug ?= 1 -optimize ?= 1 -threads ?= 1 -rtti ?= 1 - -pipes = 0 -ifeq ($(debug),0) -CFLAGS += -DNDEBUG -v1 -endif -ifeq ($(rtti),1) - CFLAGS += -Ar -endif - -CC = dmc -CXX = dmc -RC = - -CFLAGS += $(MODEL_FLAGS) -ND - -EXEEXT = .exe - -DCFLAGS += -g -DLD = link -LD = link - -PIC = -AR = ar -ARFLAGS = rsuv -RANLIB = ranlib -SOEXT = dll -SOFLAGS += $(MODEL_FLAGS) $(CPPFLAGS) -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< - -PRELIB = @true - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) - -# Dmc doesn't have rwho -rwho = 0 diff --git a/include/makeinclude/platform_win32_icc.GNU b/include/makeinclude/platform_win32_icc.GNU deleted file mode 100644 index e0079956735..00000000000 --- a/include/makeinclude/platform_win32_icc.GNU +++ /dev/null @@ -1,47 +0,0 @@ -# $Id$ - -# debug = 1 -# optimize = 1 -# exceptions = 0 - -winsock2 ?= 1 -exceptions ?= 1 -debug ?= 1 -optimize ?= 1 -threads ?= 1 -pipes ?= 0 -inline ?= 0 - -ifeq ($(debug),0) -CFLAGS += -DNDEBUG /MD -else -CFLAGS += /MDd -endif - -ifeq ($(buildbits),64) - CFLAGS += /Wp64 -DWIN64 -endif - -CC = icl -CXX = icl -RC = rc - -CFLAGS += -DWIN32 /nologo /GR - -EXEEXT = .exe - -DCFLAGS += -DLD = $(CXX) -LD = $(CXX) - -OCFLAGS += -O3 -PIC = -AR = ar -ARFLAGS = rsuv -RANLIB = ranlib -SOEXT = dll -OBJEXT = obj -SOFLAGS += $(MODEL_FLAGS) $(CPPFLAGS) -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/include/makeinclude/platform_win32_interix.GNU b/include/makeinclude/platform_win32_interix.GNU deleted file mode 100644 index feababd508d..00000000000 --- a/include/makeinclude/platform_win32_interix.GNU +++ /dev/null @@ -1,37 +0,0 @@ -# $Id$ - -# platform_win32_interix.GNU - -#versioned_so = 1 - -exceptions ?= 1 -debug ?= 1 -optimize ?= 1 -threads ?= 1 - -CC = gcc -CXX = g++ - -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CFLAGS += -W -Wall -Wpointer-arith -pipe -frepo -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) -D_ALL_SOURCE -DCFLAGS += -g -LDFLAGS += -L /usr/lib -L$(ACE_ROOT)/lib -ldl -lc -dynamic -DLD = $(CXX) -LD = $(CXX) -LIBS += -AR = ar -ARFLAGS = ruvs -RANLIB = ranlib - -SOFLAGS += $(CPPFLAGS) -shared -i -W1,-E -W1,-Bsymbolic -#SOBUILD = $(COMPILE.cc) -o $(VSHDIR)$*.so $< -PRELIB = @echo - -ifeq ($(threads),1) -LDFLAGS += -lpthread -#CFLAGS += -D_THREAD_SAFE -D_REENTRANT -DACE_HAS_THREADS -CFLAGS += -D_REENTRANT -DACE_HAS_THREADS -endif # threads - diff --git a/include/makeinclude/recurse.bor b/include/makeinclude/recurse.bor deleted file mode 100644 index 06ccede3a3b..00000000000 --- a/include/makeinclude/recurse.bor +++ /dev/null @@ -1,213 +0,0 @@ -# -# $Id$ -# -# Macros for recursive invocations of make -# -# Inputs: -# ~~~~~~~ -# DIRS - list of sub-directories to invoke make in -# MAKEFILES - list of makefiles to be run -# NAMES - list of names of targets to be built -# - -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> - -# We want to avoid all of this recursion if this is a multi-target sub-make. -!ifndef TARGET_NAME -# This is not a multi-target sub-make ... - -!ifdef DIRS - -all: $(DIRS) - -# We use an extra level of make recursion to ensure the current directory is -# automatically restored when the sub-directory is finished. -$(DIRS): - @echo Entering directory $< - @$(MAKE) $(MAKE_FLAGS) -f&&! -all: - @cd $< - $(MAKE) $(MAKE_FLAGS) -fMakefile.bor -! - -# This ugliness is to remove extra spaces from between the items in the list. -DIRS_CLEAN_1 = $(DIRS) $(BLANK_SPACE) -DIRS_CLEAN_2 = $(DIRS_CLEAN_1: =%) -DIRS_CLEAN_3 = $(DIRS_CLEAN_2:%%=%) -DIRS_CLEAN_4 = $(DIRS_CLEAN_3:%%=%) -DIRS_CLEAN = $(DIRS_CLEAN_4:%=.Clean ) - -clean: $(DIRS_CLEAN) - -# We use an extra level of make recursion to ensure the current directory is -# automatically restored when the sub-directory is finished. -$(DIRS_CLEAN): - @echo Cleaning directory $(<:.Clean=) - @$(MAKE) $(MAKE_FLAGS) -f&&! -all: - @cd $(<:.Clean=) - $(MAKE) $(MAKE_FLAGS) -fMakefile.bor clean -! - -# This ugliness is to remove extra spaces from between the items in the list. -DIRS_REALCLEAN_1 = $(DIRS) $(BLANK_SPACE) -DIRS_REALCLEAN_2 = $(DIRS_REALCLEAN_1: =%) -DIRS_REALCLEAN_3 = $(DIRS_REALCLEAN_2:%%=%) -DIRS_REALCLEAN_4 = $(DIRS_REALCLEAN_3:%%=%) -DIRS_REALCLEAN = $(DIRS_REALCLEAN_4:%=.RealClean ) - -realclean: $(DIRS_REALCLEAN) - -# We use an extra level of make recursion to ensure the current directory is -# automatically restored when the sub-directory is finished. -$(DIRS_REALCLEAN): - @echo Cleaning directory $(<:.RealClean=) - @$(MAKE) $(MAKE_FLAGS) -f&&! -all: - @cd $(<:.RealClean=) - $(MAKE) $(MAKE_FLAGS) -fMakefile.bor realclean -! - -# This ugliness is to remove extra spaces from between the items in the list. -DIRS_INSTALL_1 = $(DIRS) $(BLANK_SPACE) -DIRS_INSTALL_2 = $(DIRS_INSTALL_1: =%) -DIRS_INSTALL_3 = $(DIRS_INSTALL_2:%%=%) -DIRS_INSTALL_4 = $(DIRS_INSTALL_3:%%=%) -DIRS_INSTALL = $(DIRS_INSTALL_4:%=.Install ) - -install: $(DIRS_INSTALL) - -# We use an extra level of make recursion to ensure the current directory is -# automatically restored when the sub-directory is finished. -$(DIRS_INSTALL): - @echo Installing directory $(<:.Install=) - @$(MAKE) $(MAKE_FLAGS) -f&&! -all: - @cd $(<:.Install=) - $(MAKE) $(MAKE_FLAGS) -fMakefile.bor install -! - -!endif - -!ifdef MAKEFILES - -# This ugliness is to remove extra spaces from between the items in the list. -MAKEFILES_ALL_1 = $(MAKEFILES) $(BLANK_SPACE) -MAKEFILES_ALL_2 = $(MAKEFILES_ALL_1: =%) -MAKEFILES_ALL_3 = $(MAKEFILES_ALL_2:%%=%) -MAKEFILES_ALL_4 = $(MAKEFILES_ALL_3:%%=%) -MAKEFILES_ALL = $(MAKEFILES_ALL_4:%=.All ) - -all: $(MAKEFILES_ALL) - -$(MAKEFILES_ALL): - $(MAKE) $(MAKE_FLAGS) -f$(<:.All=) - -# This ugliness is to remove extra spaces from between the items in the list. -MAKEFILES_CLEAN_1 = $(MAKEFILES) $(BLANK_SPACE) -MAKEFILES_CLEAN_2 = $(MAKEFILES_CLEAN_1: =%) -MAKEFILES_CLEAN_3 = $(MAKEFILES_CLEAN_2:%%=%) -MAKEFILES_CLEAN_4 = $(MAKEFILES_CLEAN_3:%%=%) -MAKEFILES_CLEAN = $(MAKEFILES_CLEAN_4:%=.Clean ) - -clean: $(MAKEFILES_CLEAN) - -$(MAKEFILES_CLEAN): - $(MAKE) $(MAKE_FLAGS) -f$(<:.Clean=) clean - -# This ugliness is to remove extra spaces from between the items in the list. -MAKEFILES_REALCLEAN_1 = $(MAKEFILES) $(BLANK_SPACE) -MAKEFILES_REALCLEAN_2 = $(MAKEFILES_REALCLEAN_1: =%) -MAKEFILES_REALCLEAN_3 = $(MAKEFILES_REALCLEAN_2:%%=%) -MAKEFILES_REALCLEAN_4 = $(MAKEFILES_REALCLEAN_3:%%=%) -MAKEFILES_REALCLEAN = $(MAKEFILES_REALCLEAN_4:%=.RealClean ) - -realclean: $(MAKEFILES_REALCLEAN) - -$(MAKEFILES_REALCLEAN): - $(MAKE) $(MAKE_FLAGS) -f$(<:.RealClean=) realclean - -# This ugliness is to remove extra spaces from between the items in the list. -MAKEFILES_INSTALL_1 = $(MAKEFILES) $(BLANK_SPACE) -MAKEFILES_INSTALL_2 = $(MAKEFILES_INSTALL_1: =%) -MAKEFILES_INSTALL_3 = $(MAKEFILES_INSTALL_2:%%=%) -MAKEFILES_INSTALL_4 = $(MAKEFILES_INSTALL_3:%%=%) -MAKEFILES_INSTALL = $(MAKEFILES_INSTALL_4:%=.Install ) - -install: $(MAKEFILES_INSTALL) - -$(MAKEFILES_INSTALL): - $(MAKE) $(MAKE_FLAGS) -f$(<:.Install=) install - -!endif - -!ifdef NAMES - -# This macro may be defined in the environment (e.g. the nightly build -# scripts) so we need to remove it. -!undef NAME - -# Multi-target recursion assumes Makefile.bor. For multiple targets in -# makefiles with other names, you must set the MAKEFILE variable to the -# name of the file. -!ifndef MAKEFILE -MAKEFILE = Makefile.bor -!endif - -# This ugliness is to remove extra spaces from between the items in the list. -NAMES_ALL_1 = $(NAMES) $(BLANK_SPACE) -NAMES_ALL_2 = $(NAMES_ALL_1: =%) -NAMES_ALL_3 = $(NAMES_ALL_2:%%=%) -NAMES_ALL_4 = $(NAMES_ALL_3:%%=%) -NAMES_ALL = $(NAMES_ALL_4:%=.All ) - -all: $(NAMES_ALL) - -$(NAMES_ALL): - $(MAKE) $(MAKE_FLAGS) -f$(MAKEFILE) -DTARGET_NAME=$(<:.All=) - -# This ugliness is to remove extra spaces from between the items in the list. -NAMES_CLEAN_1 = $(NAMES) $(BLANK_SPACE) -NAMES_CLEAN_2 = $(NAMES_CLEAN_1: =%) -NAMES_CLEAN_3 = $(NAMES_CLEAN_2:%%=%) -NAMES_CLEAN_4 = $(NAMES_CLEAN_3:%%=%) -NAMES_CLEAN = $(NAMES_CLEAN_4:%=.Clean ) - -clean: $(NAMES_CLEAN) - -$(NAMES_CLEAN): - $(MAKE) $(MAKE_FLAGS) -f$(MAKEFILE) -DTARGET_NAME=$(<:.Clean=) clean - -# This ugliness is to remove extra spaces from between the items in the list. -NAMES_REALCLEAN_1 = $(NAMES) $(BLANK_SPACE) -NAMES_REALCLEAN_2 = $(NAMES_REALCLEAN_1: =%) -NAMES_REALCLEAN_3 = $(NAMES_REALCLEAN_2:%%=%) -NAMES_REALCLEAN_4 = $(NAMES_REALCLEAN_3:%%=%) -NAMES_REALCLEAN = $(NAMES_REALCLEAN_4:%=.RealClean ) - -realclean: $(NAMES_REALCLEAN) - -$(NAMES_REALCLEAN): - $(MAKE) $(MAKE_FLAGS) -f$(MAKEFILE) -DTARGET_NAME=$(<:.RealClean=) realclean - -# This ugliness is to remove extra spaces from between the items in the list. -NAMES_INSTALL_1 = $(NAMES) $(BLANK_SPACE) -NAMES_INSTALL_2 = $(NAMES_INSTALL_1: =%) -NAMES_INSTALL_3 = $(NAMES_INSTALL_2:%%=%) -NAMES_INSTALL_4 = $(NAMES_INSTALL_3:%%=%) -NAMES_INSTALL = $(NAMES_INSTALL_4:%=.Install ) - -install: $(NAMES_INSTALL) - -$(NAMES_INSTALL): - $(MAKE) $(MAKE_FLAGS) -f$(MAKEFILE) -DTARGET_NAME=$(<:.Install=) install - -!endif - -!else -# This is a multi-target sub-make ... - -# Set the name of the current target. -NAME = $(TARGET_NAME) - -!endif diff --git a/include/makeinclude/rules.bin.GNU b/include/makeinclude/rules.bin.GNU deleted file mode 100644 index 4a0f71f1bb0..00000000000 --- a/include/makeinclude/rules.bin.GNU +++ /dev/null @@ -1,68 +0,0 @@ -# -*- Makefile -*- - -#---------------------------------------------------------------------------- -# $Id$ -# -# Build binaries -# GNU version -# Requires GNU make -#---------------------------------------------------------------------------- - -ifdef BIN - VBIN = $(BIN:%=%$(VAR)) - # VBIN always depends on idl_stubs and libraries, if they exist. - ifdef IDL_SRC - $(VBIN): $(IDL_SRC) - endif - ifdef VLIBS - $(VBIN): $(LIB_INSTALL) $(VLIBS) - endif -else # !BIN - ifndef BIN_UNCHECKED - @echo Warning: rules.bin.GNU included, but no BIN targets detected. - endif # !BIN_UNCHECKED -endif # BIN - -VOBJS = $(addsuffix .$(OBJEXT),$(addprefix $(VDIR),$(basename $(SRC)))) - -ifneq ($(IDL_SRC),) - $(VBIN): $(IDL_SRC) -endif - -# Needed for depend. -PSRC += $(addsuffix .cpp, $(CLEANUP_BIN)) - -CLEANUP_INSTALL += $(CLEANUP_BIN:%=$(INSBIN)/%$(VAR)$(EXEEXT)) - -CHORUSLINK ?= -VXWORKSLINK ?= -using_aix_vacpp ?= - -ifeq ($(VXWORKSLINK),true) -$(BIN): $(DEFAULTRULE) - mv $(DEFAULTRULE) $@ -else # !VXWORKSLINK -ifeq ($(CHORUSLINK),true) -$(BIN): %: $(VDIR)%.$(OBJEXT) $(VOBJS) - $(LINK.cc) $(CC_OUTPUT_FLAG) $@ $(sort $(VDIR)$@.$(OBJEXT) $(VOBJS)) $(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 # !CHORUSLINK - ifeq (1,$(using_aix_vacpp)) -$(BIN): %: %.icc $(SRC) - vacbld_r $< -severitylevel=warning - else # !using_aix_vacpp - ifdef kylix -$(BIN): %: $(VDIR)%.$(OBJEXT) $(VOBJS) - $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $(VLDLIBS) $(BORINITEXEOBJ) $(POSTLINK) $(sort $(VDIR)$@.$(OBJEXT) $(VOBJS)) , $@,, - else # !kylix -$(BIN): %: $(VDIR)%.$(OBJEXT) $(VOBJS) - $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $(sort $(VDIR)$@.$(OBJEXT) $(VOBJS)) $(VLDLIBS) $(POSTLINK) - endif # kylix - endif # using_aix_vacpp -endif -endif diff --git a/include/makeinclude/rules.common.GNU b/include/makeinclude/rules.common.GNU deleted file mode 100644 index 765f774006b..00000000000 --- a/include/makeinclude/rules.common.GNU +++ /dev/null @@ -1,20 +0,0 @@ -# -*- Makefile -*- - -#---------------------------------------------------------------------------- -# $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_idl_stubs: clean_idl_stubs.nested clean_idl_stubs.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 -idl_stubs: idl_stubs.nested idl_stubs.local diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU deleted file mode 100644 index c2748db8de5..00000000000 --- a/include/makeinclude/rules.lib.GNU +++ /dev/null @@ -1,224 +0,0 @@ -# -*- Makefile -*- -#---------------------------------------------------------------------------- -# $Id$ -# -# Build libraries (i.e., contain no binary executables) -# GNU version -# Requires GNU make -#---------------------------------------------------------------------------- - -#--------------------------------------------------------------------------- -# Library versioning -#--------------------------------------------------------------------------- - -ifeq ($(versioned_so),1) - # Turn on symbol versioning. The scheme that we follow is to allow - # applications dependent on libraries, with same version numbers (major, - # minor and beta) to run, but applications with dependencies on libraries - # with different minor or major or beta versions to fail. - # - # Version number of the libraries - # - ifeq ($(SOVERSION),) - SOVERSION = .$(ACE_MAJOR_VERSION).$(ACE_MINOR_VERSION).$(ACE_BETA_VERSION) - endif # SOVERSION - - # Name that will be written into the dynamic library - # - ifeq ($(SONAME),) - SONAME = $(SHLIB)$(SOVERSION) - endif # SONAME -endif # versioned_so - - -#---------------------------------------------------------------------------- -# The following targets arrange to build both unshared and shared libraries -#---------------------------------------------------------------------------- - -LIB ?= -VLIB = $(LIB:%.$(LIBEXT)=%$(VAR).$(LIBEXT)) -CLEANUP_VLIB = $(CLEANUP_LIB:%.$(LIBEXT)=%$(VAR).$(LIBEXT)) - -# Add VLIB to VLIBS if building static_libs. -ifdef static_libs - VLIBS += $(VLIB) -endif - -SHLIB ?= -# Setup shared library variables, including versions. -VSHLIB_NO_VER = $(SHLIB:%.$(SOEXT)=%$(VAR).$(SOEXT)) -CLEANUP_VSHLIB_NO_VER = $(CLEANUP_SHLIB:%.$(SOEXT)=%$(VAR).$(SOEXT)) -VSHLIB = $(VSHLIB_NO_VER:%=%$(SOVERSION)) -CLEANUP_VSHLIB = $(CLEANUP_VSHLIB_NO_VER:%=%$(SOVERSION)) - -SHLIBA ?= -VSHLIBA = $(SHLIBA:%.$(LIBEXT)=%$(VAR).$(LIBEXT)) - -# Add VSHLIB if we're building shared_libs. -ifdef shared_libs - VLIBS += $(VSHLIB) $(VSHLIBA) -endif - -# Warn if no libs found -ifeq ($(VLIBS),) - LIB_WARNING = 0 - ifndef LIB_UNCHECKED - LIB_WARNING = 1 - endif # !LIB_CHECKED - ifndef SHLIB_UNCHECKED - LIB_WARNING = 1 - endif # !SHLIB_UNCHECKED - ifeq ($(LIB_WARNING),1) - @echo Warning: rules.lib.GNU included, but no library targets detected. - endif # LIB_WARNING -else # VLIBS - # Libraries always depend on idl_stubs, if they exist. - IDL_SRC ?= - ifeq ($(IDL_SRC),) - $(VLIBS): $(IDL_SRC) - endif # IDL_SRC -endif # !VLIBS - -VLOBJS = $(addprefix $(VDIR),$(foreach var, $(addsuffix .$(OBJEXT), $(basename $(LSRC)) $(RESOURCES)), $(if $(findstring ../,$(var)),$(notdir $(var)),$(var)))) -ifdef LSRC2 - LSRC += $(LSRC2) -endif - -VSHOBJS = $(addprefix $(VSHDIR),$(foreach var, $(addsuffix .$(OBJEXT), $(basename $(LSRC)) $(RESOURCES)), $(if $(findstring ../,$(var)),$(notdir $(var)),$(var)))) - -ifneq ($(IDL_SRC),) - $(VLOBJS) $(VSHOBJS): $(IDL_SRC) -endif - -ifdef static_libs - LIB_INSTALL += $(VLIB:%=$(INSLIB)/%) - CLEANUP_INSTALL += $(CLEANUP_VLIB:%=$(INSLIB)/%) -endif # static_libs - -ifdef shared_libs - LIB_INSTALL += $(VSHLIB:%=$(INSLIB)/%) - CLEANUP_INSTALL += $(CLEANUP_VSHLIB:%=$(INSLIB)/%) - CLEANUP_INSTALL += $(CLEANUP_VSHLIB_NO_VER:%=$(INSLIB)/%*) - ifdef SHLIBA - LIB_INSTALL += $(VSHLIBA:%=$(INSLIB)/%) - CLEANUP_INSTALL += $(CLEANUP_SHLIBA:%=$(INSLIB)/%) - endif -endif # shared_libs - -ace_lib_prelink ?= 0 -aix_build ?= 0 - -$(VLIB): $(VLOBJS) - -ifeq (1,$(repo)) - ifneq (,$(ACELIB)) - #### With repo, link in all of the ace object files to the lib. - #### This avoids multiple instantiations. We haven't found it to - #### be necessary with shared libs, so just do it for static libs. - vpath %.$(OBJEXT) $(ACE_ROOT)/ace/$(VDIR) - - $(VLIB): $(ACE_ROOT)/ace/$(VDIR)*.$(OBJEXT) - endif # ! ACELIB -endif # repo - -ifdef PRELIB - $(PRELIB) -endif -ifeq (1,$(ace_lib_prelink)) - #### Attempt a link (which will fail), to add template instantiations - #### to lib files, for example. - ifeq (1,$(VXWORKS)) - #### In VxWorks builds we would like to see the output here. - -$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $? $(LDFLAGS) - else - -$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $? $(LDFLAGS) $(ACE_NUL_STDERR) - endif -endif # ace_lib_prelink - echo $(TMPINCDIR:%=%/*.o) $(filter %.o, $?) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA) -ifdef ibmcxx_build -# This is required to get AIX IBM C/C++ to instantiate and compile the needed -# templates. - if test -s ./$(TEMPINCDIR)/*.C; \ - then \ - $(LINK.cc) $(LINK_OUTPUT_FLAG) dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(ACE_SHLIBS) $(LIBS); \ - $(RM) dummy; \ - $(AR) $(ARFLAGS) $@ $(TEMPINCDIR)/*.$(OBJEXT); \ - 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) -# -# The AIX shr.o build is out here to keep it away from the SOVERSION stuff. -# The SOVERSION transform is applied after building the library file. -ifeq (1,$(aix_build)) -shr.o: $(VSHOBJS) - $(SHR_FILTER) $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(ACE_SHLIBS) $(LIBS) - -.INTERMEDIATE: shr.o -endif # aix_build - -ifeq ($(VXWORKSLINK),true) -$(VSHLIB): $(basename $(notdir $(PRJ_FILE))).out - -$(RM) $@ - -$(LN_S) $(PROJECT_OUT) $@ - -$(POST_BUILD_RULE) -else # !VXWORKSLINK - ifeq (1,$(aix_build)) -$(VSHLIB): shr.o - $(AR) $(ARFLAGS) $@ $? - ifneq (,$(RANLIB)) - -$(RANLIB) $@ - endif # RANLIB - else # ! aix_build -$(VSHLIB): $(VSHOBJS) - ifdef PRELIB - $(PRELIB) - endif # PRELIB - ifdef ibmcxx_build - # This is required to get AIX IBM C/C++ to instantiate and compile the needed - # templates before building the library. - if test -s ./$(TEMPINCDIR)/*.C; \ - then \ - $(LINK.cc) $(LINK_OUTPUT_FLAG) dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(ACE_SHLIBS) $(LIBS); \ - $(RM) dummy; \ - fi - endif # ibmcxx_build - ifdef SHLIBBUILD - $(SHLIBBUILD) - else # ! SHLIBBUILD - ifdef ibmcxx_build - if test -s ./$(TEMPINCDIR)/*.$(OBJEXT); \ - then \ - $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(TEMPINCDIR)/*.$(OBJEXT) $(LDFLAGS) $(ACE_SHLIBS) $(LIBS); \ - else \ - $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(ACE_SHLIBS) $(LIBS); \ - fi - else # !ibmcxx_build - ifdef kylix - $(SOLINK.cc) $(LDFLAGS) $^, $@,, $(ACE_SHLIBS) $(LIBS) $(BORINITSHAREDOBJ) - else # ! kylix - ifeq (1,$(ace_lib_prelink)) - #### Attempt a link (which will fail), to add template instantiations - #### to lib files, for example. - -$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $^ $(LDFLAGS) $(ACE_NUL_STDERR) - endif # ace_lib_prelink - ifeq ($(split),1) - $(SHR_FILTER) $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $(VSHDIR)/*.$(OBJEXT) $(LDFLAGS) $(ACE_SHLIBS) $(LIBS) - else # ! split - $(SHR_FILTER) $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(ACE_SHLIBS) $(LIBS) - endif # split - endif # kylix - endif # ibmcxx_build - endif # SHLIBBUILD - endif # aix_build -endif # VXWORKSLINK -ifneq ($(SOVERSION),) - -$(RM) $(VSHLIB_NO_VER) - -$(LN_S) $@ $(VSHLIB_NO_VER) -endif - -chmod a+rx $@ diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU deleted file mode 100644 index a276e5b5e2e..00000000000 --- a/include/makeinclude/rules.local.GNU +++ /dev/null @@ -1,482 +0,0 @@ -# -*- Makefile -*- -#---------------------------------------------------------------------------- -# $Id$ -# -# Local targets -# GNU version -# Requires GNU make -#---------------------------------------------------------------------------- - - -CLEANUP_OBJDIRS = -CLEANUP_DIRS = - -ifdef CLEANUP_BIN - CLEANUP_OBJDIRS = $(VDIR) -else # ! CLEANUP_BIN - ifdef CLEANUP_LIB - CLEANUP_OBJDIRS = $(VDIR) - endif # CLEANUP_LIB -endif # CLEANUP_BIN - -ifdef CLEANUP_SHLIB - CLEANUP_OBJDIRS += $(VSHDIR) -endif # CLEANUP_VSHLIB - -ifdef TEMPINCDIR - CLEANUP_DIRS += $(TEMPINCDIR) -endif - -ifdef sun - CLEANUP_DIRS += SunWS_cache -endif - -vxworks_ntbuild ?= 0 - -#### TEMPLATE_REPOSITORY can be set in individual platform files -#### to create template repository directories. See -#### platform_sunos5_sunc++.GNU for an example. -ifdef TEMPLATE_REPOSITORY -CLEANUP_DIRS += $(TEMPLATE_REPOSITORY) -endif - -ifneq ($(mingw32),1) -makefile_name.local: - @echo - @echo GNUmakefile: $(shell pwd)/$(MAKEFILE) MAKEFLAGS=$(MAKEFLAGS) - @echo -else -makefile_name.local: - @echo - @echo GNUmakefile: $(call PWD)/$(MAKEFILE) - @echo -endif - -all.local: makefile_name.local $(split_target) build.objdirs build.local install.local - -#---------------------------------------------------------------------------- -# C/C++ compilation targets -#---------------------------------------------------------------------------- - - -IDL_SRC ?= -VLIBS ?= -BUILD ?= -BIN ?= -VBIN ?= $(BIN:%=%$(VAR)) -ifneq ($(VBIN),) - $(VBIN): $(VLIBS) -endif - -# Always build the V* targets in this order. We control assignment to them -# elsewhere. We add the existing $(BUILD) targets to the end to allow the -# caller to set additional ones, e.g., when defining multiple targets in a -# single makefile--note that we filter out any that are already present. -VBUILD = $(IDL_SRC) $(VLIBS) $(VBIN) $(filter-out $(IDL_SRC) $(VLIBS) $(VBIN), $(BUILD)) - -build.local: $(VBUILD) - -# By setting SUFFIXES to nothing, we turn off all implicit rules, and force -# make to only use the explicit ones we define. -.SUFFIXES: - -# C++ related targets - -STATIC_LINK_FLAG ?= -static_link ?= 0 -ifeq ($(static_link),1) - LDFLAGS += $(STATIC_LINK_FLAG) -endif # static_link = 1 - -OS ?= - -$(VDIR)%.o: %.c $(VDIR)%.creation_stamp - $(COMPILE.c) $(CC_OUTPUT_FLAG) $@ $< - ${MVCMD} - -$(VDIR)%.o: %.cpp $(VDIR)%.creation_stamp - $(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $< - ${MVCMD} - -$(VDIR)%.o: %.C $(VDIR)%.creation_stamp - $(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $< - ${MVCMD} - -$(VDIR)%.o: %.cc $(VDIR)%.creation_stamp - $(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $< - ${MVCMD} - -$(VDIR)%.o: %.cxx $(VDIR)%.creation_stamp - $(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $< - ${MVCMD} - - ifneq (,$(COMPILE.rc)) -$(VDIR)%.rc.o: %.rc $(VDIR)%.creation_stamp - $(COMPILE.rc) $< $@ - ${MVCMD} - endif # COMPILE.rc - -# If SOLINK is defined, then the .$(SOEXT) file is built from the -# .$(OBJEXT) file via separate rules in the same directory. -# Otherwise, the .$(SOEXT) and .$(OBJEXT) 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 $(VSHDIR)%.creation_stamp - $(ESOBUILD) - else # ! ESOBUILD -$(VSHDIR)%.$(SOEXT): %.cpp $(VSHDIR)%.creation_stamp - $(SOBUILD) - endif # ESOBUILD - - ifeq ($(split), 1) -$(VSHDIR)%.$(OBJEXT): %.cpp $(VSHDIR)%.creation_stamp - $(COMPILE.cc) $(PIC) SPLIT/`echo $< | sed "s/.cpp/_S\*/"` - mv *.$(OBJEXT) $(VSHDIR) - else # ! split - -$(VSHDIR)%.$(OBJEXT): %.cpp $(VSHDIR)%.creation_stamp - $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $< - - endif # split - -$(VSHDIR)%.$(OBJEXT): %.cc $(VSHDIR)%.creation_stamp - $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $< - -$(VSHDIR)%.$(OBJEXT): %.C $(VSHDIR)%.creation_stamp - $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $< - -$(VSHDIR)%.$(OBJEXT): %.cxx $(VSHDIR)%.creation_stamp - $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $< - -$(VSHDIR)%.$(OBJEXT): %.c $(VSHDIR)%.creation_stamp - $(COMPILE.c) $(PIC) $(CC_OUTPUT_FLAG) $@ $< - - ifneq (,$(COMPILE.rc)) -$(VSHDIR)%.rc.$(OBJEXT): %.rc $(VSHDIR)%.creation_stamp - $(COMPILE.rc) $< $@ - endif # COMPILE.rc - -$(VSHDIR)%.$(SOEXT): $(VSHDIR)%.$(OBJEXT) $(VSHDIR)%.creation_stamp - $(SOLINK) -endif # SOLINK - -ifeq ($(vxworks_ntbuild),1) -$(VDIR)%.creation_stamp: - @if not exist $(dir $@) $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) - @echo > $@ -else -.PHONY: $(VDIR)%.creation_stamp -$(VDIR)%.creation_stamp: - @-test -d $(dir $@) || $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) -endif - -ifneq ($(VDIR),$(VSHDIR)) - ifeq ($(vxworks_ntbuild),1) -$(VSHDIR)%.creation_stamp: - @if not exist $(dir $@) $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) - @echo > $@ - else -.PHONY: $(VSHDIR)%.creation_stamp -$(VSHDIR)%.creation_stamp: - @-test -d $(dir $@) || $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) - endif -endif - -#---------------------------------------------------------------------------- -# Library generation targets -#---------------------------------------------------------------------------- - -#### 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 -#---------------------------------------------------------------------------- - -# Always add LIB_INSTALL to INSTALL, so libs will get installed even no BIN -# is built. LIB_INSTALL is a dependency for BIN, so libs are installed prior -# to use. Also, make LIB_INSTALL depend on VLIBS, so libs get built prior to -# installation. -ifdef LIB_INSTALL - INSTALL ?= $(LIB_INSTALL) - $(LIB_INSTALL): $(VLIBS) -endif - -INSTALL ?= -install.local: $(INSTALL) - -deinstall.local: -ifdef CLEANUP_INSTALL - ifneq ($(CLEANUP_INSTALL),) - $(RM) $(CLEANUP_INSTALL) - endif # CLEANUP_INSTALL -endif # CLEANUP_INSTALL - -ifndef LN_S - ifndef COMSPEC - ifdef ComSpec - #### ACE+TAO use COMSPEC, but ComSpec is defined. - COMSPEC = $(ComSpec) - endif # ComSpec - endif # ! COMPSPEC - - 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)$(EXEEXT) \ -$(INSINC)/ace% \ -$(INSLIB)/% \ -$(INSMAN)/man1/% \ -$(INSMAN)/man2/% \ -$(INSMAN)/man3/% \ -$(INSMAN)/man4/% \ -$(INSMAN)/man5/% \ -$(INSMAN)/man6/% \ -$(INSMAN)/man7/% \ -$(INSMAN)/man8/% \ -$(INSMAN)/manl/% \ -$(INSMAN)/mann/% : -ifeq ($(vxworks_ntbuild),1) - @if exist $@ echo "$(@F) already installed" - @if not exist $@ echo "Installing $(@F:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)) to $(@D)" && \ - $(RM) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)) && \ - $(LN_S) $(shell pwd)/$(@F) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)) && \ - echo "Installing $(@F) to $(@D)" && \ - $(RM) $@ && \ - $(LN_S) $(shell pwd)/$(@F) $@ -else -ifneq ($(mingw32),1) - @if test $(shell pwd) != $(@D) -o -n "$(SOVERSION)" ; then \ - if test -s $@ ; then \ - echo "$(@F) already installed" ; \ - else \ - echo "Installing $(@F:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)) -> $(@D)" ; \ - $(RM) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)); \ - $(LN_S) $(shell pwd)/$(@F) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)); \ - echo "Installing $(@F) -> $(@D)" ; \ - $(RM) $@; \ - $(LN_S) $(shell pwd)/$(@F) $@; \ - fi ; \ - fi -else - @if test $(call PWD) != $(@D) -o -n "$(SOVERSION)" ; then \ - if test -s $@ ; then \ - echo "$(@F) already installed" ; \ - else \ - echo "Installing $(@F:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)) -> $(@D)" ; \ - $(RM) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)); \ - $(LN_S) $(call PWD)/$(@F) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)); \ - echo "Installing $(@F) -> $(@D)" ; \ - $(RM) $@; \ - $(LN_S) $(call PWD)/$(@F) $@; \ - fi ; \ - fi -endif -endif -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_idl_stubs.local: makefile_name.local -ifdef IDL_FILES - -$(RM) $(foreach ext, $(IDL_EXT), $(addsuffix $(ext), $(IDL_FILES))) -endif - -CLEANUP_BIN ?= -ifneq ($(CLEANUP_BIN),) - DO_CLEANUP = 1 - REALCLEAN_FILES = $(CLEANUP_BIN:%=%$(EXEEXT)) $(CLEANUP_BIN:%=%_debug$(EXEEXT)) $(CLEANUP_BIN:%=%_profile$(EXEEXT)) $(CLEANUP_BIN:%=%_optimize$(EXEEXT)) -endif # !CLEANUP_BIN - -ifdef static_libs - CLEANUP_LIB ?= - ifneq ($(CLEANUP_LIB),) - DO_CLEANUP = 1 - REALCLEAN_FILES += $(CLEANUP_LIB:%=%) $(CLEANUP_LIB:%=%_debug) $(CLEANUP_LIB:%=%_profile) $(CLEANUP_LIB:%=%_optimize) - endif # !CLEANUP_LIB -endif # static_libs - -ifdef shared_libs - CLEANUP_SHLIB ?= - ifneq ($(CLEANUP_SHLIB),) - DO_CLEANUP = 1 - REALCLEAN_FILES += $(CLEANUP_VSHLIB:%=%) $(CLEANUP_VSHLIB_NO_VER:%=%*) $(CLEANUP_VSHLIB_NO_VER:%=%_debug) $(CLEANUP_VSHLIB_NO_VER:%=%_profile) $(CLEANUP_VSHLIB_NO_VER:%=%_optimize) - endif # !CLEANUP_SHLIB -endif # shared_libs - -CLEANUP_OBJS += $(addsuffix .o, $(addprefix $(VDIR),$(CLEANUP_BIN))) - -ifdef OBJS - CLEANUP_OBJS += $(addprefix $(VDIR), $(OBJS)) -endif # OBJS -ifneq ($(CLEANUP_BIN),) - CLEANUP_OBJS += $(addsuffix .$(OBJEXT),$(addprefix $(VDIR),$(basename $(CLEANUP_BIN)))) -endif # CLEANUP_BIN -ifdef VSHOBJS - CLEANUP_OBJS += $(VSHOBJS) -endif # VSHOBJS - -clean.local: makefile_name.local -ifdef DO_CLEANUP - -$(RM) -r \ - *.$(OBJEXT) *~ *.bak *.rpo *.sym lib*.*_pure_* \ - GNUmakefile.old core-r $(CLEANUP_DIRS) \ - cxx_repository ptrepository ti_files \ - gcctemp.c gcctemp so_locations *.ics \ - templateregistry templateregistry.* ir.out core.* *.core $(CLEANUP_OBJS) -endif # DO_CLEANUP - -realclean.local: clean.local deinstall.local clean_idl_stubs.local -ifdef DO_CLEANUP - -$(RM) -r $(REALCLEAN_FILES) $(sort $(CLEANUP_OBJDIRS)) -endif # DO_CLEANUP - - -#---------------------------------------------------------------------------- -# Dependency generation target -#---------------------------------------------------------------------------- - -MAKEFILE ?= GNUmakefile -DEPENDENCY_FILE ?= $(MAKEFILE) - -TAO_ROOT ?= $(ACE_ROOT)/TAO - -# If no libraries are build in the current directory (actually, if -# rules.lib.GNU isn't included), then SOEXT might not be set. -SOEXT ?= so - -ORIGdepend.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" \ - $(ACE_DEPEND_SED_CMD) \ - -e '/$$(ACE_ROOT)\/ace\/config[^\.]*\.h/d' \ - -e "s; /[-a-zA-Z0-9_./]*\.h;;g" \ - -e "s;\([-a-zA-Z0-9._]*\)\.$(OBJEXT):;.obj/\1.$(OBJEXT) .obj/\1.$(SOEXT) $(VSHDIR)\1.$(OBJEXT) $(VSHDIR)\1.$(SOEXT):;" \ - > $(MAKEFILE).new - @cat $(MAKEFILE).new >$(MAKEFILE) - @$(RM) $(MAKEFILE).new - @if cmp -s $(MAKEFILE) $(MAKEFILE).old ;\ - then echo "GNUmakefile dependencies unchanged." ;\ - else \ - echo "GNUmakefile dependencies updated." ;\ - fi ;\ - $(RM) $(MAKEFILE).old ; - -ifneq ($(MAKEFILE),$(DEPENDENCY_FILE)) -$(DEPENDENCY_FILE): -ifeq ($(vxworks_ntbuild),1) - copy NUL "$(DEPENDENCY_FILE)" -else - touch $(DEPENDENCY_FILE) -endif -depend.local: $(DEPENDENCY_FILE) --include $(DEPENDENCY_FILE) -endif - -DEPGEN ?= $(ACE_ROOT)/bin/depgen.pl - -# Use findstring just in case the script was preceded by /usr/bin/perl -ifeq ($(findstring depgen.pl, $$(notdir $(DEPGEN))), depgen.pl) - DEPEND_CMD_ARGS += -i - ifeq ($(inline), 0) - DEPEND_CMD_ARGS += -n - endif -endif - -depend.local: $(MAKEFILE) idl_stubs.local - @$(RM) $(DEPENDENCY_FILE).old - @cp $(DEPENDENCY_FILE) $(DEPENDENCY_FILE).old - ACE_PLATFORM_CONFIG=$(ACE_PLATFORM_CONFIG) \ - ACE_DEPEND_SED_CMD="$(ACE_DEPEND_SED_CMD)" \ - $(DEPGEN) -A $(DEPEND_CMD_ARGS) -e config.h -f $(DEPENDENCY_FILE) $(CPPFLAGS) \ - -DMAKEDEPEND $(CCFLAGS) $(LSRC) $(SRC) $(PSRC) - @if cmp -s $(DEPENDENCY_FILE) $(DEPENDENCY_FILE).old ;\ - then echo "GNUmakefile dependencies unchanged." ;\ - else \ - echo "GNUmakefile dependencies updated." ;\ - fi ;\ - $(RM) $(DEPENDENCY_FILE).old ; - -#---------------------------------------------------------------------------- -# RCS info target -#---------------------------------------------------------------------------- - -IDL_FILES ?= -IDL_CLIENT_HDR_EXT ?= - -idl_stubs.local: $(foreach file, $(IDL_FILES), $(file)$(IDL_CLIENT_HDR_EXT)) - -ifdef $(TAO_IDL_DEP) -$(TAO_IDL_DEP): - @if test ! -s $(TAO_IDL_DEP); then \ - echo " ***"; \ - echo " *** ERROR: $(TAO_IDL_DEP) not found."; \ - echo " ***"; \ - echo; /bin/false; fi -endif # TAO_IDL_DEP - -#---------------------------------------------------------------------------- -# RCS info target -#---------------------------------------------------------------------------- - -rcs_info.local: - @rcs info - -#---------------------------------------------------------------------------- -# Variant targets and conditional macros -#---------------------------------------------------------------------------- - -build.objdirs: $(CLEANUP_DIRS) - -ifeq ($(MKDIR_NTSTYLE),1) -$(CLEANUP_DIRS): - @if not exist $@ $(MKDIR) $@ $(ACE_NUL_STDERR) -else -$(CLEANUP_DIRS): - @test -d $@ || $(MKDIR) $@ $(ACE_NUL_STDERR) -endif - -#--------------------------------------------------------------------------- -# Source file splitting -#--------------------------------------------------------------------------- -SPLIT: - @echo "Splitting source files..." - @$(ACE_ROOT)/bin/split-cpp -s Svc_Conf_l.cpp -s Svc_Conf_y.cpp $(LSRC) - @echo "done." diff --git a/include/makeinclude/rules.nested.GNU b/include/makeinclude/rules.nested.GNU deleted file mode 100644 index d248105628d..00000000000 --- a/include/makeinclude/rules.nested.GNU +++ /dev/null @@ -1,43 +0,0 @@ -# -*- Makefile -*- - -#---------------------------------------------------------------------------- -# $Id$ -# -# Nested directory targets makefile definitions -#---------------------------------------------------------------------------- - -# If the client makefile is not called "Makefile", the MAKEFILE -# variable must be set to its actual name before including this -# file to allow the recursive MAKE to work properly. - -MAKEFILE ?= GNUmakefile -SUBDIR_MAKEFILE ?= $(MAKEFILE) - -# Make sure that we build directories with DIRS= in sequence instead of in -# parallel, unless DIRS_PARALLEL is set, in which case they may be built -# in parallel if enabled by the proper flags and not disabled elsewhere. -DIRS_PARALLEL ?= - -ifeq ($(DIRS_PARALLEL),) -.NOTPARALLEL: -endif - -# A rule to build DIR.subdir from DIR by calling MAKE again, with -# DIR as the new directory, SUBDIR_TARGET as the target to build, and -# "GNUmakefile" as the makefile to use in the new directory. - -# Triggered by the $(TARGETS_NESTED) target, below. - -%.subdir: % - cd $< && $(MAKE) -f $(SUBDIR_MAKEFILE) $(SUBDIR_TARGET) - -# Build FOO.nested by calling MAKE again, this time with DIRS (with -# ".subdir" appended to each) as the targets, and passing FOO as the -# real target to build in the SUBDIR_TARGET variable. - -$(TARGETS_NESTED): -ifdef DIRS - ifneq ($(DIRS),) - $(MAKE) -f $(MAKEFILE) SUBDIR_TARGET=$(@:.nested=) $(addsuffix .subdir, $(DIRS)) - endif # DIRS -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 631514f5796..00000000000 --- a/include/makeinclude/wrapper_macros.GNU +++ /dev/null @@ -1,838 +0,0 @@ -# -*- Makefile -*- - -#---------------------------------------------------------------------------- -# $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). -# include_env Enable usage of CORBA::Environment parameters that is -# compatible with TAO versions before 1.2.2. Default: -# disabled. Has no effect when building with exceptions=0 -# minimum_corba Enable minimumCORBA support. (Documented here, but -# implemented in TAO/rules.TAO.GNU.) -# fast Enable -fast option, e.g., with Sun C++. -# inline Enable ACE inlining. Some platforms enable inlining by -# default, others do not. If platform_macros.GNU does not -# set this, inline is enabled. -# templates Type of template instantiation to perform. Can be one of -# automatic, used, explicit. Defaults to automatic if the -# platform/compiler combination supports it, otherwise is -# set to explicit. -# optimize Enable optimization; see OCFLAGS and OCCFLAGS. -# 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. -# static_link Link only static libs to executables, e.g., uses "-static" -# flag with the GNU ld linker. -# threads Build with thread support. -# ace_for_tao Build "ace_for_tao" subset. Primarily useful for -# reducing the size of the ACE shared library when -# using TAO. -# xt Build with Xt (X11 Toolkit) support. -# fl Build with FlTk (Fast Light Toolkit) support. -# tk Build with Tk (Tcl/Tk) support. -# qt Build with Qt (Trolltech Qt) support. -# ssl Build with OpenSSL support. -# rapi Build with RAPI -# stlport Build with STLPort support -# rwho Build with rwho, this results in building apps/drwho -# pipes Build with pipe support, resulting in adding -pipe to the -# compiler options. -# split Build the library by first splitting up the ACE source -# to several files, with one object code entity for each -# source file. This allows an application that is linked -# with ACE to extract _exactly_ what it needs from the -# library, resulting in a smaller executable. -# Setting this to 1 overrides debug to 0. -# sctp Build support for TAO SCIOP and for ACE SCTP -# wrapper-facades. The sctp macro should be set to a string -# value representing a particular SCTP implementation. -# Recognized values include: openss7 -# -# versioned_so Add versioning to libraries. Defaults to 1 (true). If 0, -# no version number is appended to shared library names. -# If versioned_so is 1 (enabled), the SOVERSION make -# variable can also be set to specify the version info -# to append to the name - it should have a leading '.' - -# else it defaults to .ACE_MAJOR.ACE_MINOR.ACE_BETA. -# wfmo Build with wfmo support (Win32 only) -# winregistry Build with windows registry support (Win32 only) -# -# 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 -# RC Resource compiler command -# COMPILE.c Flags for compiling with C -# COMPILE.cc Flags for compiling with C++ -# COMPILE.rc Flags for compiling with the resource compiler -# 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 -# TEMPLATES_FLAG -# Flag to pass to the compiler to control the instantiation of -# templates. -# 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 -# 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 -# PLATFORM_SSL_CPPFLAGS -# Platform CPP options for OpenSSL (may need -I...) -# PLATFORM_SSL_LDFLAGS -# Platform LD options for OpenSSL (may need -L...) -# PLATFORM_SSL_LIBS -# Platform libraries required with OpenSSL -# PLATFORM_RAPI_CPPFLAGS -# Platform CPP options for RAPI -# PLATFORM_RAPI_LDFLAGS -# Platform LD options for RAPI -# PLATFORM_RAPI_LIBS -# Platform libraries required with RAPI -# PLATFORM_SCTP_CPPFLAGS -# Platform CPP options required for SCTP -# PLATFORM_SCTP_LDFLAGS -# Platform LD options required for SCTP -# PLATFORM_SCTP_LIBS -# Platform libraries required for SCTP -# 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. -# PWD Command to get the current working directory -# PTDIRS Pathnames of directories containing template code -# RM Name of program to use to remove files -# ACE_MKDIR Name of program to (recursively) create directories -# 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). -#---------------------------------------------------------------------------- - -# Set the cleanup targets. These targets are used by realclean even if -# the component isn't being built, i.e., the decision to build it was based -# on components built in another makefile and written a file (that might no -# longer be available) and accessed by $(ACE_ROOT)/bin/ace_components. -# -# If a component should always be built, just use the normal BIN, LIB, or -# SHLIB variables. If it's dependent on a component, use the BIN2 or -# BIN_UNCHECKED variety, then assign that to BIN if the required component -# is available. - -BIN_UNCHECKED ?= -CLEANUP_BIN ?= -ifdef BIN - CLEANUP_BIN = $(BIN) -endif # !BIN -ifdef BIN2 - CLEANUP_BIN += $(BIN2) -endif # !BIN2 -ifneq ($(BIN_UNCHECKED),) - CLEANUP_BIN += $(BIN_UNCHECKED) -endif # !BIN_UNCHECKED - -LIB_UNCHECKED ?= -CLEANUP_LIB ?= -ifdef LIB - CLEANUP_LIB = $(LIB) -endif # !LIB -ifdef LIB2 - CLEANUP_LIB += $(LIB2) -endif # !LIB2 -ifneq ($(LIB_UNCHECKED),) - CLEANUP_LIB = $(LIB_UNCHECKED) -endif # !LIB_UNCHECKED - -SHLIB_UNCHECKED ?= -CLEANUP_SHLIB ?= -ifdef SHLIB - CLEANUP_SHLIB = $(SHLIB) -endif # !SHLIB -ifdef SHLIB2 - CLEANUP_SHLIB += $(SHLIB2) -endif # SHLIB2 -ifneq ($(SHLIB_UNCHECKED),) - CLEANUP_SHLIB += $(SHLIB_UNCHECKED) -endif # ! SHLIB_UNCHECKED - -SHLIBA_UNCHECKED ?= -CLEANUP_SHLIBA ?= -ifdef SHLIBA - CLEANUP_SHLIBA = $(SHLIBA) -endif # SHLIBA -ifdef SHLIBA2 - CLEANUP_SHLIBA = $(SHLIBA2) -endif # SHLIB2A -ifneq ($(SHLIBA_UNCHECKED),) - CLEANUP_SHLIBA = $(SHLIBA_UNCHECKED) -endif # SHLIBA_UNCHECKED - -#### Default to building shared libraries only. Set it here to give the -#### platform a chance to override. -ifndef shared_libs - shared_libs = 1 -endif # shared_libs -ifndef static_libs - static_libs = 0 -endif # static_libs - -#### Set up the build ACE version in case the platform_macros.GNU wants it. -ifeq (cmd,$(findstring cmd,$(SHELL))) -ACE_MAJOR_VERSION := $(shell awk "/ACE_MAJOR_VERSION/ { print $$3}" ${ACE_ROOT}/ace/Version.h) -ACE_MINOR_VERSION := $(shell awk "/ACE_MINOR_VERSION/ { print $$3}" ${ACE_ROOT}/ace/Version.h) -ACE_BETA_VERSION := $(shell awk "/ACE_BETA_VERSION/ { print $$3}" ${ACE_ROOT}/ace/Version.h) -else -ACE_MAJOR_VERSION := $(shell awk '/ACE_MAJOR_VERSION/ { print $$3}' ${ACE_ROOT}/ace/Version.h) -ACE_MINOR_VERSION := $(shell awk '/ACE_MINOR_VERSION/ { print $$3}' ${ACE_ROOT}/ace/Version.h) -ACE_BETA_VERSION := $(shell awk '/ACE_BETA_VERSION/ { print $$3}' ${ACE_ROOT}/ace/Version.h) -endif - -# Define some variables to silence warnings -SHR_FILTER ?= - -# Include this before the below variables to make it possible for -# platform_macros.GNU to set default values for them. -include $(ACE_ROOT)/include/makeinclude/platform_macros.GNU - -# Define some variables to silence warnings -GHS ?= -CHORUS ?= -AIX_TEMPLATE_HACK ?= - -# $(ACE_PLATFORM_CONFIG) is used in dependency rules and corresponds to the -# platform dependent config-*.h file included in config.h, and can be set -# in your platform_*.GNU file or platform_macros.GNU. -ACE_PLATFORM_CONFIG ?= config.h - -ifeq ($(threads),0) - ifneq ($(findstring -DACE_MT_SAFE=0,$(CPPFLAGS)),-DACE_MT_SAFE=0) - CPPFLAGS += -DACE_MT_SAFE=0 - endif # -DACE_MT_SAFE=0 -endif # threads - -#### -#### Defaults are exceptions on (1), fast off (0), rtti on (1), and -#### versioned_so on (1). -#### -exceptions ?= 1 -fast ?= 0 -rtti ?= 1 -versioned_so ?= 1 -use_dep_libs ?= 1 - -SOVERSION ?= -SONAME ?= - -ifeq ($(PWD),) - PWD=$(shell pwd) -endif - -ifeq ($(ACE_MKDIR),) - MKDIR = mkdir -p -else - MKDIR = $(ACE_MKDIR) -endif - -#---------------------------------------------------------------------------- -# Platform-independent macro definitions -#---------------------------------------------------------------------------- - -INCLDIRS ?= -DEFFLAGS ?= - -CPPFLAGS += $(DEFFLAGS) $(INCLDIRS) - -# Define default extensions for IDL-generated files -IDL_CLIENT_HDR_EXT ?= C.h -IDL_CLIENT_INL_EXT ?= C.inl -IDL_CLIENT_SRC_EXT ?= C.cpp -IDL_SERVER_HDR_EXT ?= S.h -IDL_SERVER_INL_EXT ?= S.inl -IDL_SERVER_SRC_EXT ?= S.cpp -IDL_SERVER_THDR_EXT ?= S_T.h -IDL_SERVER_TINL_EXT ?= S_T.inl -IDL_SERVER_TSRC_EXT ?= S_T.cpp - -ifeq (,$(findstring -I$(ACE_ROOT),$(INCLDIRS))) - INCLDIRS += -I$(ACE_ROOT) -endif -INSINC ?= $(ACE_ROOT)/ace -INSLIB ?= $(ACE_ROOT)/lib -INSMAN ?= $(ACE_ROOT)/man - -ifeq (,$(findstring -L$(ACE_ROOT)/ace,$(LDFLAGS))) - LDFLAGS += -L$(ACE_ROOT)/ace -L./ -endif - -ifeq (default,$(origin LEX)) -LEX = flex -endif - -EXEEXT ?= - -ifndef COMSPEC - ifdef ComSpec - #### ACE+TAO use COMSPEC, but ComSpec is defined. - COMSPEC = $(ComSpec) - endif # ComSpec -endif # ! COMPSPEC - -ifdef COMSPEC - #### Assume we're on a WIN32 host. - ACE_NUL = nul -else # ! WIN32 - ACE_NUL = /dev/null -endif # ! WIN32 - -#### Redirect stderr to nul device, and mask exit status. -ACE_NUL_STDERR = 2>$(ACE_NUL) || true -PCFLAGS += #### set in platform_macros.GNU file, e.g., -p -PCCFLAGS += #### set in platform_macros.GNU file, e.g., -p -VAR = - -# Let users override the default VDIR directories -VDIR ?= .obj/ -VSHDIR ?= .shobj/ - -ACELIB ?= -lACE - -# NOTE: VLDLIBS is defined below, in case it is overridden for static- -# or shared-only builds. -ifeq (default,$(origin YACC)) -YACC = bison -endif - -#---------------------------------------------------------------------------- -# Platform-dependent macros that require platform_macros.GNU. -#---------------------------------------------------------------------------- - -ifeq ($(findstring g++,$(CXX)),g++) - ifndef ACE_HAS_GNUG_PRE_2_8 - ACE_HAS_GNUG_PRE_2_8 := \ - $(shell \ - if $(CXX) -dumpversion 2>/dev/null | egrep '^(cygnus-)?2\.[0-7]' \ - >/dev/null; then echo 1; else echo 0; fi) - endif # ! ACE_HAS_GNUG_PRE_2_8 -endif # g++ - -OBJEXT ?= o -SOEXT ?= so -LIBEXT ?= a - -CC_OUTPUT_FLAG ?= -o -SO_OUTPUT_FLAG ?= -o -LINK_OUTPUT_FLAG ?= -o - -#---------------------------------------------------------------------------- -# make flags -#---------------------------------------------------------------------------- - -ifeq ($(optimize),0) - override optimize = -endif # optimize - -ifneq ($(optimize),) - CFLAGS += $(OCFLAGS) - CCFLAGS += $(OCCFLAGS) -endif # optimize - -split ?= 0 -ifeq ($(split),0) - override split = -endif # split - -ifneq ($(split),) - override split_target = SPLIT - override debug = 0 - CPPFLAGS += -DACE_IS_SPLITTING -else - override split_target = -endif # split - -ifeq ($(debug),0) - override debug = -endif # debug - -ifeq ($(debug),) - CPPFLAGS += -DACE_NDEBUG -# Disable the RCSID for release/non-debug builds. - ifeq (,$(findstring ACE_USE_RCSID,$(CPPFLAGS))) - CPPFLAGS += -DACE_USE_RCSID=0 - endif -else - CFLAGS += $(DCFLAGS) - CCFLAGS += $(DCCFLAGS) -endif # debug - -ifeq ($(threads),0) - override threads = -endif # threads - -# ace_for_tao subsetting is disabled by default. -ace_for_tao ?= -ifeq ($(ace_for_tao),0) - override ace_for_tao = -endif # ace_for_tao - -ifneq ($(ace_for_tao),) - ACE_MAKE_OPTIONS += ace_for_tao -endif # ace_for_tao - - -ifeq ($(xt),0) - override xt = -endif # xt - -ifneq ($(xt),) - override x11=1 - override xt=1 - override ace_xtreactor=1 - override tao_xtresource=1 - ACE_MAKE_OPTIONS += xt -endif # xt - -fl ?= -ifeq ($(fl),0) - override fl = -endif # fl - -ifneq ($(fl),) - override x11=1 - override gl=1 - override ace_flreactor=1 - override tao_flresource=1 - ACE_MAKE_OPTIONS += fl -endif # fl - -tk ?= -ifeq ($(tk),0) - override tk = -endif # tk - -ifneq ($(tk),) - override x11=1 - override tk=1 - override ace_tkreactor=1 - override tao_tkresource=1 - ACE_MAKE_OPTIONS += tk -endif # tk - -qt ?= -ifeq ($(qt),0) - override qt = -endif # qt - -ifneq ($(qt),) - override qt=1 - override ace_qtreactor=1 - override tao_qtresource=1 - ACE_MAKE_OPTIONS += qt -endif # qt -gtk_reactor ?= - -ifeq ($(gtk_reactor),0) - override gtk_reactor = -endif # gtk_reactor - -ifneq ($(gtk_reactor),) - override ace_with_gtk=1 - CPPFLAGS += -DACE_HAS_GTK $(PLATFORM_GTK_CPPFLAGS) - LIBS += $(PLATFORM_GTK_LIBS) - LDFLAGS += $(PLATFORM_GTK_LDFLAGS) - ACE_MAKE_OPTIONS += gtk_reactor -endif # gtk_reactor - -QTDIR ?= -ifneq ($(QTDIR),) - MOC = ${QTDIR}/bin/moc -else - MOC = moc -endif - -rapi ?= -ifeq ($(rapi),0) - override rapi = -endif #rapi - -ifneq ($(rapi),) - CPPFLAGS += -DACE_HAS_RAPI $(PLATFORM_RAPI_CPPFLAGS) - LIBS += $(PLATFORM_RAPI_LIBS) - LDFLAGS += $(PLATFORM_RAPI_LDFLAGS) - ACE_MAKE_OPTIONS += rapi -endif # rapi - -sctp ?= -ifeq ($(sctp),0) - override sctp = -endif #rapi - -# if any sctp implementation is present then add -ifneq ($(sctp),) - CPPFLAGS += -DACE_HAS_SCTP $(PLATFORM_SCTP_CPPFLAGS) - LDFLAGS += $(PLATFORM_SCTP_LDFLAGS) - LIBS += $(PLATFORM_SCTP_LIBS) - ACE_MAKE_OPTIONS += sctp -endif - -gl ?= -ifeq ($(gl),0) - override gl = -endif # gl - -ifneq ($(gl),) - ACE_MAKE_OPTIONS += gl -endif # gl - -ssl ?= -ifeq ($(ssl),0) - override ssl = -else - ifneq ($(SSL_ROOT),) - # Don't do a thing.. - else - CPPFLAGS += $(PLATFORM_SSL_CPPFLAGS) - LDFLAGS += $(PLATFORM_SSL_LDFLAGS) - LIBS += $(PLATFORM_SSL_LIBS) - ACE_MAKE_OPTIONS += ssl - endif -endif -ec_typed_events ?= 1 - -ifeq ($(exceptions),0) - ifeq ($(ACE_HAS_GNUG_PRE_2_8),0) - #### Disable the default exception handling of g++ >= 2.8.0. - ifneq ($(ACE_GNUG_ON_UNIXWARE),) - CCFLAGS += -fcheck-new - else - CCFLAGS += -fno-exceptions -fcheck-new - endif # ! ACE_GNUG_ON_UNIXWARE - endif # ! ACE_HAS_GNUG_PRE_2_8 -else # exceptions - CPPFLAGS += -DACE_HAS_EXCEPTIONS - ifndef include_env - include_env ?= - endif - ifeq ($(include_env),1) - CPPFLAGS += -DACE_ENV_BKWD_COMPAT - endif - 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. -# CCFLAGS += -Wno-uninitialized -# endif # g++ > 2.8.0 - endif # ! ACE_HAS_GNUG_PRE_2_8 - ACE_MAKE_OPTIONS += exceptions -endif # exceptions - -profile ?= -ifeq ($(profile),0) - override profile = -endif # profile - -ifneq ($(profile),) - CFLAGS += $(PCFLAGS) - CCFLAGS += $(PCCFLAGS) -endif # profile - -inline ?= 1 -ifeq ($(inline),0) - CPPFLAGS += -DACE_NO_INLINE -else -ifeq ($(inline),1) - CPPFLAGS += -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 - -shared_libs_only ?= -ifeq ($(shared_libs_only),0) - override shared_libs_only = -endif # shared_libs_only - -static_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 - -ifdef shared_libs - ifndef static_libs - override shared_libs_only = 1 - endif - ACE_MAKE_OPTIONS += shared_libs -endif - -ifdef static_libs - ifndef shared_libs - override static_libs_only = 1 - endif - ACE_MAKE_OPTIONS += static_libs -endif - -ACE_SHLIBS ?= - -ifdef shared_libs - ifdef SHLIBA - LDLIBS := $(LDLIBS:-l%=-l%shr) - ACE_SHLIBS := $(ACE_SHLIBS:-l%=-l%shr) - endif # SHLIBA -else # ! shared_libs - ifdef static_libs - #### Don't build shared libs. - PIC = - SHLIB = - SOEXT = o - VSHDIR = $(VDIR) - VLDLIBS = $(LDLIBS:%.so=%.o) - endif # static_libs -endif # shared_libs - -ifdef kylix - LDLIBS := $(LDLIBS:-l%=lib%.$(SOEXT)) - LIBS := $(LIBS:-l%=lib%.$(SOEXT)) - ACELIB := $(ACELIB:-l%=lib%.$(SOEXT)) - ACE_SHLIBS := $(ACE_SHLIBS:-l%=lib%.$(SOEXT)) -endif # kylix - -VLDLIBS = $(LDLIBS) $(ACELIB) $(LIBS) - -probe ?= -ifeq ($(probe),0) - override probe = -endif # probe - -ifeq ($(probe),1) - CPPFLAGS += -DACE_COMPILE_TIMEPROBES -endif # probe - -purify ?= -ifeq ($(purify),0) - override purify = -endif # purify - -ifdef purify -PURE_CACHE_BASE_DIR = /tmp/purifycache -PURE_CACHE_DIR = $(PURE_CACHE_BASE_DIR)-$(LOGNAME)-$(notdir $(CXX) ) - - #### 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. - PURELINK += purify -best-effort -cache-dir=$(PURE_CACHE_DIR) \ - -chain-length=20 -fds-inuse-at-exit=no \ - -inuse-at-exit -max_threads=100 - CPPFLAGS += -DACE_HAS_PURIFY -I$(ACE_PURIFY_DIR) -endif # purify - -quantify ?= -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 - CPPFLAGS += -DACE_HAS_QUANTIFY -I$(ACE_QUANTIFY_DIR) - - ifeq ($(shell uname -p),sparc) - PRELINK += -record-register-window-traps - endif # sparc -endif # quantify - -repo ?= -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 - CPPFLAGS += -DACE_HAS_GNU_REPO -# ace_lib_prelink := 1 -endif # repo - -# If pipes is not set, we default to 0 -pipes ?= 0 - -# If pipes is set to 1 then add the compiler flag -pipe. This uses pipe instead -# of intermediate files. This can be disabled by setting pipes to 0 in the -# platform_macros.GNU file. -ifeq ($(pipes),1) - CFLAGS += -pipe -endif # pipes - -# RMCast is turned on by default -rmcast ?= 1 -ifeq ($(rmcast),1) - ACE_MAKE_OPTIONS += rmcast -endif - -# If not explicitly is set that we don't have rwho, assume we have it. -rwho ?= 1 - -# If not explicitly is set that we don't have stlport, assume we -# don't have it. -stlport ?= 0 -ifeq ($(stlport),1) - CPPFLAGS += -DACE_HAS_STLPORT $(PLATFORM_STLPORT_CPPFLAGS) - LDFLAGS += $(PLATFORM_STLPORT_LDFLAGS) - LIBS += $(PLATFORM_STLPORT_LIBS) -endif - -# If not explicitly is set that we have wfmo, assume we don't have it. -wfmo ?= 0 - -# If not explicitly is set that we have winregistry, assume we don't have it. -winregistry ?= 0 - -# In MPC, these are now features that are enabled by default. -ace_other ?= 1 -ace_codecs ?= 1 -ace_token ?= 1 -ace_svcconf ?= 1 -ace_uuid ?= 1 -ace_filecache ?= 1 -acexml ?= 1 -xerces ?= 1 - -#---------------------------------------------------------------------------- -# Conditional macro definitions -#---------------------------------------------------------------------------- - -PTDIRS ?= -PRELINK ?= -POSTLINK ?= -PURELINK ?= -TEMPLATES_FLAG ?= -MVCMD ?= - -COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c -COMPILE.cc = $(CXX) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS) -c -RC ?= - -COMPILE.rc = $(RC) $(RCFLAGS) -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) |