diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ace/TMCast/Makefile | 12 | ||||
| -rw-r--r-- | ace/TMCast/TMCast.mpc | 2 | ||||
| -rw-r--r-- | protocols/ace/TMCast/Makefile | 12 | ||||
| -rw-r--r-- | protocols/ace/TMCast/TMCast.mpc | 2 |
5 files changed, 29 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 6fa6cb6759c..0537b9c1425 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Feb 14 09:22:25 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * ace/TMCast/Makefile: + * ace/TMCast/TMCast.mpc: + + Needs threads=1 to compile. + Sat Feb 14 08:48:10 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * ace/TMCast/Group.cpp: diff --git a/ace/TMCast/Makefile b/ace/TMCast/Makefile index 87f6d1964ba..240e5f23161 100644 --- a/ace/TMCast/Makefile +++ b/ace/TMCast/Makefile @@ -5,8 +5,8 @@ #---------------------------------------------------------------------------- MAKEFILE = Makefile -LIB = libTMCast.a -SHLIB = libTMCast.$(SOEXT) +LIB_UNCHECKED = libTMCast.a +SHLIB_UNCHECKED = libTMCast.$(SOEXT) FILES= Group Protocol @@ -22,6 +22,14 @@ LSRC = $(addsuffix .cpp,$(FILES)) include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU + +ifeq ($(exceptions),1) + ifeq ($(threads),1) + LIB=$(LIB_UNCHECKED) + SHLIB=$(SHLIB_UNCHECKED) + endif # rt_corba +endif # minimum_corba + include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU diff --git a/ace/TMCast/TMCast.mpc b/ace/TMCast/TMCast.mpc index 0899982dd09..290360050ea 100644 --- a/ace/TMCast/TMCast.mpc +++ b/ace/TMCast/TMCast.mpc @@ -2,7 +2,7 @@ // $Id$ project : acelib, core { - requires += exceptions + requires += exceptions, threads sharedname = TMCast dynamicflags += TMCAST_BUILD_DLL } diff --git a/protocols/ace/TMCast/Makefile b/protocols/ace/TMCast/Makefile index 87f6d1964ba..240e5f23161 100644 --- a/protocols/ace/TMCast/Makefile +++ b/protocols/ace/TMCast/Makefile @@ -5,8 +5,8 @@ #---------------------------------------------------------------------------- MAKEFILE = Makefile -LIB = libTMCast.a -SHLIB = libTMCast.$(SOEXT) +LIB_UNCHECKED = libTMCast.a +SHLIB_UNCHECKED = libTMCast.$(SOEXT) FILES= Group Protocol @@ -22,6 +22,14 @@ LSRC = $(addsuffix .cpp,$(FILES)) include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU + +ifeq ($(exceptions),1) + ifeq ($(threads),1) + LIB=$(LIB_UNCHECKED) + SHLIB=$(SHLIB_UNCHECKED) + endif # rt_corba +endif # minimum_corba + include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU diff --git a/protocols/ace/TMCast/TMCast.mpc b/protocols/ace/TMCast/TMCast.mpc index 0899982dd09..290360050ea 100644 --- a/protocols/ace/TMCast/TMCast.mpc +++ b/protocols/ace/TMCast/TMCast.mpc @@ -2,7 +2,7 @@ // $Id$ project : acelib, core { - requires += exceptions + requires += exceptions, threads sharedname = TMCast dynamicflags += TMCAST_BUILD_DLL } |