ChangeLogTag: Wed Apr 09 19:13:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>

11 files changed, 49 insertions, 41 deletions

diff --git a/include/makeinclude/platform_cygwin32.GNU b/include/makeinclude/platform_cygwin32.GNU
index 71ee0639793..63ed5d5137e 100644
--- a/include/makeinclude/platform_cygwin32.GNU
+++ b/include/makeinclude/platform_cygwin32.GNU
@@ -26,4 +26,9 @@ endif
 SONAME=
 SOVERSION=
 
+# 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_g++_common.GNU b/include/makeinclude/platform_g++_common.GNU
index 04de1224b65..6a92ba2845f 100644
--- a/include/makeinclude/platform_g++_common.GNU
+++ b/include/makeinclude/platform_g++_common.GNU
@@ -50,8 +50,10 @@ ifneq ($(SONAME),)
   ifeq ($(with_ld),hpux)
     SOFLAGS += -Wl,+h -Wl,$(SONAME)
   else
-    ifneq ($(with_ld),aix)
-      SOFLAGS += -Wl,-h -Wl,$(SONAME)
+    ifneq ($(with_ld),vxworks)
+      ifneq ($(with_ld),aix)
+        SOFLAGS += -Wl,-h -Wl,$(SONAME)
+      endif
     endif
   endif
 endif
diff --git a/include/makeinclude/platform_linux_borland.GNU b/include/makeinclude/platform_linux_borland.GNU
index 7912951ec62..0b9580a7b7c 100644
--- a/include/makeinclude/platform_linux_borland.GNU
+++ b/include/makeinclude/platform_linux_borland.GNU
@@ -2,9 +2,6 @@
 
 # platform_linux_borland.GNU
 
-# debug = 1
-# optimize = 1
-
 ifndef BCB
 BCB = /usr/local/kylix3
 endif
@@ -83,7 +80,7 @@ DCFLAGS = -DNDEBUG
 DCCFLAGS =
 endif
 
-kylix_build = 1
+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)/ace:./
@@ -102,18 +99,16 @@ CFLAGS = $(WARNINGS_CFLAGS) -q -VP -Vx -a8 -b- -k $(DCFLAGS) \
 
 CPPFLAGS += #$(CFLAGS)
 CCFLAGS += $(CFLAGS)
-BORLDFLAGS = -c -L$(LIBPATH):$(ACELIBPATH) -x -Gn -v -L$(LIBPATH):$(ACELIBPATH)
+BORLDFLAGS = -c -L$(LIBPATH):$(ACELIBPATH) -x -Gn -v
 BORINITOBJ = borinitso.o borinit.o crt1.o
 BORSHAREDOBJ += libborcrtl.so libborstl.so libborunwind.so libc.so libm.so libdl.so
 
 PRELINK=
-SOFLAGS= $(BORSHAREDOBJ) borinitso.o -Tpd
-#ACELIB= libACE.so
-#TAO_IDL_FE_LIB= libTAO_IDL_FE_DLL.so
+SOFLAGS= -Tpd
 
-SOLINK.cc = $(LD) $(BORINITOBJ) -Tpd
+SOLINK.cc = $(LD) -Tpd
 LINK.cc = override
-LINK.cc.override = $(LD) $(LDFLAGS) $(VLDLIBS) $(BORINITOBJ) $(BORSHAREDOBJ) $(BORLDFLAGS) $(POSTLINK)
+LINK.cc.override = $(LD) $(LDFLAGS) $(BORINITOBJ) $(BORSHAREDOBJ) $(BORLDFLAGS) $(POSTLINK)
 
 SONAME=
 SOVERSION=
diff --git a/include/makeinclude/platform_mingw32.GNU b/include/makeinclude/platform_mingw32.GNU
index 0d6850458c6..98fda38062d 100644
--- a/include/makeinclude/platform_mingw32.GNU
+++ b/include/makeinclude/platform_mingw32.GNU
@@ -10,16 +10,7 @@
 # See also http://www.mingw.org.
 #
 # You will also need a GNU Make for win32 (so you can actualy
-# USE this file :-). Tested with make/sh from cygwin.
-#
-# Tested with:
-#
-#	mingw-runtime-0.5-20010221
-#	w32api-0.5-20010301
-#	gcc-2.95.2-20001116
-#	binutils-2.10.91-20010114
-#	ld-2.10.91-20010126
-#	libbfd-2.10.91-20010121
+# USE this file :-). Tested with MSYS from MinGW
 #
 # Caveat:
 #
@@ -40,10 +31,16 @@ TCPU = pentiumpro
 #TCPU = i486
 #TCPU = i386
 
+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
 SONAME=
 SOVERSION=
 
-mingw32 = 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
+
 include $(ACE_ROOT)/include/makeinclude/platform_gnuwin32_common.GNU
diff --git a/include/makeinclude/platform_sunos5_ghs.GNU b/include/makeinclude/platform_sunos5_ghs.GNU
index 5c4d2aead4e..6c27f4ce6f2 100644
--- a/include/makeinclude/platform_sunos5_ghs.GNU
+++ b/include/makeinclude/platform_sunos5_ghs.GNU
@@ -9,11 +9,11 @@ threads = 1
 
 # I(kitty) don't know anything about this compiler. Making it explicit.
 #
-templates = "explicit"
+templates = explicit
 
 # Turn on the proper flags for explicit template instantiation.
 #
-ifeq ("$(templates)","explicit")
+ifeq ($(templates),explicit)
   ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied.
     TEMPLATES_FLAG=-tnone
   endif
diff --git a/include/makeinclude/platform_sunos5_kcc.GNU b/include/makeinclude/platform_sunos5_kcc.GNU
index f12e4f031ec..50f8261240b 100644
--- a/include/makeinclude/platform_sunos5_kcc.GNU
+++ b/include/makeinclude/platform_sunos5_kcc.GNU
@@ -9,11 +9,11 @@ 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"
+templates = explicit
 
 # Turn on the proper flags for explicit template instantiation.
 #
-ifeq ("$(templates)","explicit")
+ifeq ($(templates),explicit)
   ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied.
     TEMPLATES_FLAG=
   endif
diff --git a/include/makeinclude/platform_vxworks5.x_diab.GNU b/include/makeinclude/platform_vxworks5.x_diab.GNU
index 931843ae1e9..a0b49fa2137 100644
--- a/include/makeinclude/platform_vxworks5.x_diab.GNU
+++ b/include/makeinclude/platform_vxworks5.x_diab.GNU
@@ -113,7 +113,7 @@ endif
 ifeq ($(SHARED_LIBS),1)
   ACELIB = -L./
   #### There's no difference between non-shared and shared object code.
-  VSHDIR = .obj/
+  VSHDIR = $(VDIR)
 endif # shared_libs
 
 ifeq ($(static_libs),1)
diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU
index 4452ebdc6ac..6406a0b2e87 100644
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ b/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -30,6 +30,9 @@ endif # ! optimize
 ifndef rtti
   rtti = 0
 endif # ! rtti
+ifndef with_ld
+  with_ld = vxworks
+endif # ! with_ld
 
 shared_libs =
 static_libs = 1
@@ -39,11 +42,7 @@ static_libs = 1
 # they are welcome to check the instantiation problem. Overriding it to be
 # explicit.
 #
-templates = "explicit"
-
-# Test for template instantiation.
-#
-include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
+templates = explicit
 
 ifeq (,$(WIND_BASE))
   default:
@@ -97,7 +96,7 @@ endif # default GCC Version
 
 # These variables may be set on the command line if a different ACE_VXWORKS
 # flag is desired.
-                                               
+
 ifeq ($(VXWORKS_VERSION_FLAG),)
    ifeq ($(GCC_VERSION),gcc-2.96)
        VXWORKS_VERSION_FLAG = -DACE_VXWORKS=0x542
@@ -106,7 +105,7 @@ ifeq ($(VXWORKS_VERSION_FLAG),)
        VXWORKS_STDINC_FLAG = -nostdinc
    endif # GCC_VERSION
 endif # VXWORKS_VERSION_FLAG
-   
+
 
 
 ifeq ($(CPU),SH7700)
@@ -177,12 +176,12 @@ else
 ifeq ($(CPU),PENTIUMPRO)
   BINXSYM_NAME = xsymDec
   CFLAGS += -DCPU=PENTIUMPRO
-  TOOLENV = 386
+  TOOLENV = pentium
 else
 ifeq ($(CPU),PENTIUM)
   BINXSYM_NAME = xsymDec
   CFLAGS += -DCPU=PENTIUM
-  TOOLENV = 386
+  TOOLENV = pentium
 else
 ifeq ($(CPU),I80486)
   #### Note: -fno-implicit-templates doesn't seem to work well with g++
@@ -279,6 +278,10 @@ else
 endif # simso
 endif # x86-win32
 
+# Test for template instantiation.
+#
+include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
+
 ifeq ($(shared_libs),1)
   SHARED_LIBS = 1
 endif
@@ -289,7 +292,7 @@ endif
 ifeq ($(SHARED_LIBS),1)
   ACELIB = -L./
   #### There's no difference between non-shared and shared object code.
-  VSHDIR = .obj/
+  VSHDIR = $(VDIR)
 endif # shared_libs
 
 ifeq ($(static_libs),1)
diff --git a/include/makeinclude/rules.bin.GNU b/include/makeinclude/rules.bin.GNU
index 8548c05fb56..b93ad077d5d 100644
--- a/include/makeinclude/rules.bin.GNU
+++ b/include/makeinclude/rules.bin.GNU
@@ -22,7 +22,7 @@ ifeq (1,$(using_aix_vacpp))
 $(BIN): %: %.icc $(SRC)
 	vacbld_r $< -severitylevel=warning
 else
-ifdef kylix_build
+ifdef kylix
 $(BIN): %: $(VDIR)%.$(OBJEXT) $(VOBJS)
 	$(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $(VLDLIBS) $(POSTLINK) $^, $@,,
 else
diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU
index e2f1c9cce0e..346eee4ae36 100644
--- a/include/makeinclude/rules.lib.GNU
+++ b/include/makeinclude/rules.lib.GNU
@@ -118,8 +118,8 @@ ifdef ibmcxx_build
 		$(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $(VSHOBJS1) $(LDFLAGS) $(ACE_SHLIBS) $(LIBS); \
 	fi
 else
-ifdef kylix_build
-	$(SOLINK.cc) $(VSHOBJS1), $@,, $(ACE_SHLIBS) $(LIBS) $(LDFLAGS)
+ifdef kylix
+	$(SOLINK.cc) $(LDFLAGS) $(VSHOBJS1), $@,, $(LDFLAGS) $(ACE_SHLIBS) $(LIBS)
 else
 ifeq (1,$(ace_lib_prelink))
         #### Attempt a link (which will fail), to add template instantiations
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index 8392100bbd1..5d8ab91e145 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -587,6 +587,12 @@ else # ! shared_libs
   endif # ! static_libs
 endif # ! shared_libs
 
+ifdef kylix
+  LDLIBS := $(LDLIBS:-l%=lib%.$(SOEXT))
+  LIBS := $(LIBS:-l%=lib%.$(SOEXT))
+  ACELIB := $(ACELIB:-l%=lib%.$(SOEXT))
+endif # kylix
+
 VLDLIBS = $(LDLIBS) $(ACELIB) $(LIBS)
 
 ifeq ($(probe),0)