summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>1999-04-13 13:23:59 +0000
committerSteve Huston <shuston@riverace.com>1999-04-13 13:23:59 +0000
commit8dc03c63e8e511513fbd9455732cf9a6b7de407d (patch)
tree17979b5331a8d03c028b60b7a1ecc6b0379ed777 /include
parent2f6a7e9f913d3eb3ffda3c62ce18949feea6c3c9 (diff)
downloadATCD-8dc03c63e8e511513fbd9455732cf9a6b7de407d.tar.gz
Added mt_orbix make option to control use of MT vs. non-MT Orbix.
Diffstat (limited to 'include')
-rw-r--r--include/makeinclude/platform_sunos5_sunc++.GNU9
-rw-r--r--include/makeinclude/platform_sunos5_sunc++_orbix.GNU1
2 files changed, 8 insertions, 2 deletions
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index 3e61ee551f7..ea8cad74def 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -85,8 +85,13 @@ LD = $(CXX)
ifdef orbix
LDFLAGS += $(PIC) -L$(ORBIX_ROOT)/corba2/lib \
-R $(ACE_ROOT)/ace -R./ -R $(ORBIX_ROOT)/corba2/lib
- LIBS += -lITinimt -liiopmt -lorbixmt -lsocket -ldl -lnsl \
- -lthread -lgen -lposix4
+ifeq ($(mt_orbix),1)
+ LIBS += -lITinimt -liiopmt -lorbixmt
+else
+ LIBS += -lITini -liiop -lorbix
+endif
+
+ LIBS += -lsocket -ldl -lnsl -lthread -lgen -lposix4
CPPFLAGS += -I$(ORBIX_ROOT)/corba2/include
else
ifeq ($(distrib),0)
diff --git a/include/makeinclude/platform_sunos5_sunc++_orbix.GNU b/include/makeinclude/platform_sunos5_sunc++_orbix.GNU
index 2fa129d576d..001576f06f1 100644
--- a/include/makeinclude/platform_sunos5_sunc++_orbix.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++_orbix.GNU
@@ -1,6 +1,7 @@
# $Id$
orbix=1
+mt_orbix=1
exceptions=1
include $(ACE_ROOT)/include/makeinclude/platform_sunos5_sunc++.GNU