diff options
| author | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-02-26 10:47:18 +0000 |
|---|---|---|
| committer | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-02-26 10:47:18 +0000 |
| commit | 486b0c3093998fc644a4018042e61ee875bbe986 (patch) | |
| tree | fa10ce01c57ddc32bc4a4d8e628ffa1b38a59833 /ACE/include/makeinclude/platform_linux_common.GNU | |
| parent | 5d678ce9f055584e142e9a556c86a38b7363ee0a (diff) | |
| download | ATCD-486b0c3093998fc644a4018042e61ee875bbe986.tar.gz | |
ChangeLogTag: Thu Feb 26 10:45:58 UTC 2009 Olli Savia <ops@iki.fi>
Diffstat (limited to 'ACE/include/makeinclude/platform_linux_common.GNU')
| -rw-r--r-- | ACE/include/makeinclude/platform_linux_common.GNU | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/ACE/include/makeinclude/platform_linux_common.GNU b/ACE/include/makeinclude/platform_linux_common.GNU index 53f680644d2..47c272d0e02 100644 --- a/ACE/include/makeinclude/platform_linux_common.GNU +++ b/ACE/include/makeinclude/platform_linux_common.GNU @@ -10,6 +10,9 @@ optimize ?= 1 threads ?= 1 insure ?= 0 +LSB_RELEASE_ID := $(shell lsb_release -i) +LSB_RELEASE_RELEASE := $(shell lsb_release -r) + PLATFORM_XT_CPPFLAGS= PLATFORM_XT_LIBS=-lXt PLATFORM_XT_LDFLAGS= @@ -43,13 +46,24 @@ PLATFORM_BOOST_CPPFLAGS ?= PLATFORM_BOOST_LDLAGS ?= PLATFORM_BOOST_UTF_LIBS ?= -lboost_unit_test_framework -PLATFORM_TCL_CPPFLAGS= -PLATFORM_TCL_LIBS=-ltcl -PLATFORM_TCL_LDFLAGS= +ifeq (Ubuntu, $(findstring Ubuntu,$(LSB_RELEASE_ID))) + PLATFORM_TK_CPPFLAGS=$(shell . /usr/lib/tk*/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC $$TK_DEFS) + PLATFORM_TK_LIBS=$(shell . /usr/lib/tk*/tkConfig.sh && echo -n $$TK_LIB_FLAG) + PLATFORM_TK_LDFLAGS= + + PLATFORM_TCL_CPPFLAGS= + PLATFORM_TCL_LIBS=-ltcl8.4 + PLATFORM_TCL_LDFLAGS= +else + 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_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_TCL_CPPFLAGS= + PLATFORM_TCL_LIBS=-ltcl + PLATFORM_TCL_LDFLAGS= +endif PLATFORM_QT_CPPFLAGS ?= -I$(QTDIR)/include PLATFORM_QT_LIBS ?= -lqt-mt @@ -85,9 +99,6 @@ ifeq ($(nptl),0) CPPFLAGS += -DACE_LACKS_LINUX_NPTL endif -LSB_RELEASE_ID := $(shell lsb_release -i) -LSB_RELEASE_RELEASE := $(shell lsb_release -r) - ssl ?= 0 ifeq ($(ssl),1) # Some Linux OpenSSL installations compile in Kerberos support. Add @@ -113,4 +124,3 @@ PIC = -fPIC AR ?= ar ARFLAGS = rsuv RANLIB = @true - |