ChangeLogTag: Thu Feb 17 19:26:57 UTC 2011 Olli Savia <ops@iki.fi>

17 files changed, 39 insertions, 20 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 7b9c59453ef..100f02dbbff 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,26 @@
+Thu Feb 17 19:26:57 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * include/makeinclude/platform_g++_common.GNU:
+          Added pipes ?= 1
+
+        * include/makeinclude/platform_freebsd.GNU:
+        * include/makeinclude/platform_gnuwin32_common.GNU:
+        * include/makeinclude/platform_linux.GNU:
+        * include/makeinclude/platform_lynxos.GNU:
+        * include/makeinclude/platform_macosx.GNU:
+        * include/makeinclude/platform_macosx_common.GNU:
+        * include/makeinclude/platform_macosx_panther.GNU:
+        * include/makeinclude/platform_netbsd.GNU:
+        * include/makeinclude/platform_openbsd.GNU:
+        * include/makeinclude/platform_qnx_neutrino.GNU:
+        * include/makeinclude/platform_rtems.x_g++.GNU:
+        * include/makeinclude/platform_sunos5_g++.GNU:
+        * include/makeinclude/platform_win32_dmc.GNU:
+        * include/makeinclude/platform_win32_icc.GNU:
+        * include/makeinclude/platform_win32_interix.GNU:
+          Removed setting of pipes variable.
+          It now set in platform_g++_common.GNU.
+
 Thu Feb 17 18:53:07 UTC 2011  Olli Savia  <ops@iki.fi>
 
         * include/makeinclude/platform_aix_g++.GNU:
diff --git a/ACE/include/makeinclude/platform_freebsd.GNU b/ACE/include/makeinclude/platform_freebsd.GNU
index 8cf500095b2..771b61c1324 100644
--- a/ACE/include/makeinclude/platform_freebsd.GNU
+++ b/ACE/include/makeinclude/platform_freebsd.GNU
@@ -12,7 +12,6 @@ versioned_so ?= 1
 threads ?= 1
 debug ?= 1
 optimize ?= 1
-pipes ?= 1
 
 CC              = gcc
 CXX             = g++
diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU
index 19249b18abd..d1eb3b3bd61 100644
--- a/ACE/include/makeinclude/platform_g++_common.GNU
+++ b/ACE/include/makeinclude/platform_g++_common.GNU
@@ -201,4 +201,6 @@ ifeq ($(minimaltoc),1)
   FLAGS_C_CC += -mminimal-toc
 endif
 
+pipes ?= 1
+
 FLAGS_C_CC += -Wall -W -Wpointer-arith
diff --git a/ACE/include/makeinclude/platform_gnuwin32_common.GNU b/ACE/include/makeinclude/platform_gnuwin32_common.GNU
index e0be759e12a..3cb5c07613d 100644
--- a/ACE/include/makeinclude/platform_gnuwin32_common.GNU
+++ b/ACE/include/makeinclude/platform_gnuwin32_common.GNU
@@ -34,7 +34,6 @@ winsock2 ?= 1
 debug ?= 1
 optimize ?= 1
 threads ?= 1
-pipes ?= 1
 
 cpumodelflag ?= 0
 tunemodelflag ?= 1
diff --git a/ACE/include/makeinclude/platform_linux.GNU b/ACE/include/makeinclude/platform_linux.GNU
index 271c7017607..5e2d22403da 100644
--- a/ACE/include/makeinclude/platform_linux.GNU
+++ b/ACE/include/makeinclude/platform_linux.GNU
@@ -11,9 +11,6 @@ else
   CXX_FOR_VERSION_TEST ?= g++
 endif
 
-# fix this
-pipes ?= 1
-
 CXX_FULL_VERSION := $(shell $(CXX_FOR_VERSION_TEST) --version)
 CXX_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion)
 
diff --git a/ACE/include/makeinclude/platform_lynxos.GNU b/ACE/include/makeinclude/platform_lynxos.GNU
index 05afd593595..9086f3204f7 100644
--- a/ACE/include/makeinclude/platform_lynxos.GNU
+++ b/ACE/include/makeinclude/platform_lynxos.GNU
@@ -1,5 +1,6 @@
+# -*- Makefile -*-
 # $Id$
-#
+
 # LynxOS with g++.  Defaults to LynxOS Version 4.0.0.  For Version 4.2.0,
 # for example, add "VERSION=4.2.0" to your make invocation.
 
@@ -39,7 +40,6 @@ PLATFORM_TK_LDFLAGS=$(PLATFORM_X11_LDFLAGS)
 shared_libs ?= 1
 optimize ?= 1
 debug ?= 1
-pipes ?= 1
 threads ?= 1
 
 ifeq ($(threads),1)
diff --git a/ACE/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU
index 960e8f3680f..53155adcb3d 100644
--- a/ACE/include/makeinclude/platform_macosx.GNU
+++ b/ACE/include/makeinclude/platform_macosx.GNU
@@ -1,4 +1,6 @@
+# -*- Makefile -*-
 # $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
@@ -9,7 +11,6 @@ threads ?= 1
 debug ?= 1
 optimize ?= 0
 versioned_so ?= 0
-pipes ?= 1
 with_ld = macosx
 
 CC              = gcc
diff --git a/ACE/include/makeinclude/platform_macosx_common.GNU b/ACE/include/makeinclude/platform_macosx_common.GNU
index ecdcf891d63..d3ef69ef516 100644
--- a/ACE/include/makeinclude/platform_macosx_common.GNU
+++ b/ACE/include/makeinclude/platform_macosx_common.GNU
@@ -1,4 +1,6 @@
+# -*- Makefile -*-
 # $Id$
+
 # platform_macosx.GNU
 # support for Mac OS X 10.4 (Tiger)
 # By default, this uses the default compiler selected using gcc_select.
@@ -23,10 +25,6 @@ endif
 
 with_ld = macosx
 
-pipes ?= 1
-
-CFLAGS  += $(FLAGS_C_CC)
-
 CC              ?= gcc
 CXX             ?= g++
 
diff --git a/ACE/include/makeinclude/platform_macosx_panther.GNU b/ACE/include/makeinclude/platform_macosx_panther.GNU
index 364624a014c..26a4587a4e8 100644
--- a/ACE/include/makeinclude/platform_macosx_panther.GNU
+++ b/ACE/include/makeinclude/platform_macosx_panther.GNU
@@ -1,4 +1,6 @@
+# -*- Makefile -*-
 # $Id$
+
 # platform_macosx.GNU
 # support for Mac OS X 10.3 (Panther)
 
@@ -8,8 +10,6 @@ optimize ?= 0
 versioned_so ?= 0
 with_ld = macosx
 
-pipes ?= 1
-
 CC              = gcc
 CXX             = g++
 CFLAGS          += -Wno-long-double
diff --git a/ACE/include/makeinclude/platform_netbsd.GNU b/ACE/include/makeinclude/platform_netbsd.GNU
index 26811121943..9416c9c88af 100644
--- a/ACE/include/makeinclude/platform_netbsd.GNU
+++ b/ACE/include/makeinclude/platform_netbsd.GNU
@@ -1,3 +1,4 @@
+# -*- Makefile -*-
 # $Id$
 
 # platform_netbsd.GNU
@@ -7,7 +8,6 @@ versioned_so = 1
 debug ?= 1
 optimize ?= 1
 threads ?= 1
-pipes ?= 1
 no_hidden_visibility ?= 1
 
 CC              = gcc
diff --git a/ACE/include/makeinclude/platform_openbsd.GNU b/ACE/include/makeinclude/platform_openbsd.GNU
index 8a52254d2f1..676a4b98bf4 100644
--- a/ACE/include/makeinclude/platform_openbsd.GNU
+++ b/ACE/include/makeinclude/platform_openbsd.GNU
@@ -7,7 +7,6 @@ versioned_so ?= 1
 debug ?= 1
 optimize ?= 1
 threads ?= 1
-pipes ?= 1
 
 CC              = gcc
 CXX		= g++
diff --git a/ACE/include/makeinclude/platform_qnx_neutrino.GNU b/ACE/include/makeinclude/platform_qnx_neutrino.GNU
index 3e2d6a40d61..d649def0edc 100644
--- a/ACE/include/makeinclude/platform_qnx_neutrino.GNU
+++ b/ACE/include/makeinclude/platform_qnx_neutrino.GNU
@@ -1,3 +1,4 @@
+# -*- Makefile -*-
 # $Id$
 
 # QNX 4.25 hosted GNU g++ for Neutrino 2.0
@@ -7,7 +8,7 @@ static_libs_only = 1
 
 debug ?= 1
 optimize ?= 1
-pipes ?= 1
+
 CC      ?= i386-nto-gcc
 CXX     ?= i386-nto-g++
 
diff --git a/ACE/include/makeinclude/platform_rtems.x_g++.GNU b/ACE/include/makeinclude/platform_rtems.x_g++.GNU
index 84665719617..785c1a9d197 100644
--- a/ACE/include/makeinclude/platform_rtems.x_g++.GNU
+++ b/ACE/include/makeinclude/platform_rtems.x_g++.GNU
@@ -8,7 +8,6 @@ CROSS-COMPILE = 1
 debug ?= 1
 optimize ?= 1
 threads ?= 1
-pipes ?= 1
 
 shared_libs =
 static_libs = 1
diff --git a/ACE/include/makeinclude/platform_sunos5_g++.GNU b/ACE/include/makeinclude/platform_sunos5_g++.GNU
index 495d24712a1..d0c2fc5cdbc 100644
--- a/ACE/include/makeinclude/platform_sunos5_g++.GNU
+++ b/ACE/include/makeinclude/platform_sunos5_g++.GNU
@@ -9,7 +9,6 @@
 debug ?= 1
 optimize ?= 1
 threads ?= 1
-pipes ?= 1
 buildbits ?= 32
 
 ifeq ($(buildbits),64)
diff --git a/ACE/include/makeinclude/platform_win32_dmc.GNU b/ACE/include/makeinclude/platform_win32_dmc.GNU
index 63b484aa365..3d752cbc8a7 100644
--- a/ACE/include/makeinclude/platform_win32_dmc.GNU
+++ b/ACE/include/makeinclude/platform_win32_dmc.GNU
@@ -1,3 +1,4 @@
+# -*- Makefile -*-
 # $Id$
 
 # debug = 1
diff --git a/ACE/include/makeinclude/platform_win32_icc.GNU b/ACE/include/makeinclude/platform_win32_icc.GNU
index 80291e34f9a..5e10925ca65 100644
--- a/ACE/include/makeinclude/platform_win32_icc.GNU
+++ b/ACE/include/makeinclude/platform_win32_icc.GNU
@@ -1,3 +1,4 @@
+# -*- Makefile -*-
 # $Id$
 
 # debug = 1
diff --git a/ACE/include/makeinclude/platform_win32_interix.GNU b/ACE/include/makeinclude/platform_win32_interix.GNU
index 3677711fd18..50e1d636695 100644
--- a/ACE/include/makeinclude/platform_win32_interix.GNU
+++ b/ACE/include/makeinclude/platform_win32_interix.GNU
@@ -1,3 +1,4 @@
+# -*- Makefile -*-
 # $Id$
 
 # platform_win32_interix.GNU
@@ -7,7 +8,6 @@ versioned_so ?= 0
 debug ?= 1
 optimize ?= 1
 threads ?= 1
-pipes ?= 1
 
 CC              = gcc
 CXX             = g++