Fri Aug 17 10:43:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 3 insertions, 99 deletions

diff --git a/ACE/include/makeinclude/platform_linux.GNU b/ACE/include/makeinclude/platform_linux.GNU
index cebda1deefa..faf6e6fd36f 100644
--- a/ACE/include/makeinclude/platform_linux.GNU
+++ b/ACE/include/makeinclude/platform_linux.GNU
@@ -4,77 +4,9 @@
 # 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 =
-
-PLATFORM_FOX_CPPFLAGS=
-PLATFORM_FOX_LIBS=-lFOX
-PLATFORM_FOX_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=
-PLATFORM_TCL_LIBS=-ltcl
-PLATFORM_TCL_LDFLAGS=
-
-PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS)
-PLATFORM_TK_LIBS=$(shell . /usr/lib/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
+include $(ACE_ROOT)/include/makeinclude/platform_linux_common.GNU
+
+ifeq ($(insure),0)
   CC  ?= gcc
   CXX ?= g++
 endif
@@ -116,19 +48,6 @@ ifeq ($(optimize),1)
   SOFLAGS += -Wl,-O3
 endif
 
-GNU_LIBPTHREAD_VERSION := $(shell getconf GNU_LIBPTHREAD_VERSION)
-ifeq (NPTL, $(word 1,$(GNU_LIBPTHREAD_VERSION)))
-  CPPFLAGS += -DACE_HAS_LINUX_NPTL
-endif
-
-PLATFORM_QT_CPPFLAGS ?= -I$(QTDIR)/include
-PLATFORM_QT_LIBS ?= -lqt-mt
-PLATFORM_QT_LDFLAGS ?= -L$(QTDIR)/lib
-
-PIC     = -fPIC
-AR      = ar
-ARFLAGS = rsuv
-RANLIB  = @true
 SOFLAGS += $(CPPFLAGS) -shared
 SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<; \
           $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
@@ -159,21 +78,6 @@ ifeq ($(threads),1)
     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: