ChangeLogTag: Tue Feb 8 13:17:55 UTC 2011 Olli Savia <ops@iki.fi>

4 files changed, 24 insertions, 57 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 1c9be2ed5d2..8d24a4db7ea 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,11 @@
+Tue Feb  8 13:17:55 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * include/makeinclude/platform_cygwin32.GNU:
+        * include/makeinclude/platform_gnuwin32_common.GNU:
+        * include/makeinclude/platform_mingw32.GNU:
+          Moved some common setting from Cygwin/MinGW config files to
+          platform_gnuwin32_common.GNU.
+
 Fri Feb  4 20:04:13 UTC 2011  Olli Savia  <ops@iki.fi>
 
         * tests/OS_Test.cpp:
diff --git a/ACE/include/makeinclude/platform_cygwin32.GNU b/ACE/include/makeinclude/platform_cygwin32.GNU
index ed9c9823ad0..39ace7f693e 100644
--- a/ACE/include/makeinclude/platform_cygwin32.GNU
+++ b/ACE/include/makeinclude/platform_cygwin32.GNU
@@ -1,30 +1,12 @@
+# -*- Makefile -*-
 # $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/ACE/include/makeinclude/platform_gnuwin32_common.GNU b/ACE/include/makeinclude/platform_gnuwin32_common.GNU
index de63c2ff896..9927776f827 100644
--- a/ACE/include/makeinclude/platform_gnuwin32_common.GNU
+++ b/ACE/include/makeinclude/platform_gnuwin32_common.GNU
@@ -1,6 +1,20 @@
 # -*- Makefile -*-
 # $Id$
 
+# Choose 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
+
+# Cygwin/MinGW doesn't allow to add the version number of ACE to the dll name
+# because ace.dll.6.0.1 isn't a valid dll name
+versioned_so = 0
+
+# Disable auto-import warnings. The Cygwin/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
+
 ifneq ($(mingw32),1)
   ifneq ($(cygwin32),1)
     fail := \
diff --git a/ACE/include/makeinclude/platform_mingw32.GNU b/ACE/include/makeinclude/platform_mingw32.GNU
index dddc715073a..499e2399e0e 100644
--- a/ACE/include/makeinclude/platform_mingw32.GNU
+++ b/ACE/include/makeinclude/platform_mingw32.GNU
@@ -1,43 +1,11 @@
 # -*- Makefile -*-
 # $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
+# This file should allow to build ACE for mingw32 with mingw tools.
 #
-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
 
@@ -48,11 +16,6 @@ winregistry ?= 1
 # We can use the QoS support
 qos ?= 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))
 
 ifeq (cmd,$(findstring cmd,$(SHELL)))