diff options
| author | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-26 02:05:52 +0000 |
|---|---|---|
| committer | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-26 02:05:52 +0000 |
| commit | 1674e64be295cc6f036db836147fd885ed34d971 (patch) | |
| tree | 90eefe2b6a06702757de725a70ca0709706917b5 | |
| parent | dae0a5979b9055c82defc0aac3c7d4b63c538574 (diff) | |
| download | ATCD-1674e64be295cc6f036db836147fd885ed34d971.tar.gz | |
ChangeLogTag:Tue Nov 25 20:01:39 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile | 49 |
2 files changed, 33 insertions, 24 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 0796cc8a593..db25ab8a856 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Tue Nov 25 20:01:39 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/Makefile: + + Lots of libraries depend on CosNaming. CosNaming depends on + corba_messaging. This means that most of the orbsvcs cannot be + built without corba_messaging. + Tue Nov 25 18:17:55 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * examples/Simulator/Event_Supplier/Makefile: diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile index 2911a52c9ea..fdbdd00e772 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile +++ b/TAO/orbsvcs/orbsvcs/Makefile @@ -26,12 +26,14 @@ include $(TAO_ROOT)/taoconfig.mk ifndef TAO_ORBSVCS #### Please see docs/configurations.html#orbsvcs for documentation of #### TAO_ORBSVCS. - TAO_ORBSVCS = Naming \ - Time \ - Property \ - RTSched + TAO_ORBSVCS = Property \ + Concurrency ifeq ($(corba_messaging),1) + TAO_ORBSVCS += Naming \ + Time \ + RTSched + TAO_ORBSVCS += RTEvent \ NativeCosEvent \ CosEvent \ @@ -41,12 +43,11 @@ ifndef TAO_ORBSVCS CosEventLog \ RTEventLog \ NotifyLog - endif #corba_messaging - TAO_ORBSVCS += Concurrency \ - Trader \ + TAO_ORBSVCS += Trader \ AV \ Log + endif #corba_messaging ifeq ($(minimum_corba),0) ifneq (Compilers 4.2,$(findstring Compilers 4.2,$(CC_VERSION))) @@ -61,33 +62,31 @@ ifndef TAO_ORBSVCS # Trader uses DynAny which is disabled when compiling with minimum # CORBA support. LifeCycle, Log, AV and Notify depend on Trader # so don't build them either, with minimum CORBA. - - TAO_ORBSVCS += LifeCycle - ifeq ($(corba_messaging),1) + TAO_ORBSVCS += LifeCycle TAO_ORBSVCS += FaultTolerance TAO_ORBSVCS += FTORB TAO_ORBSVCS += RTCORBAEvent - endif #corba_messaging - # The PortableGroup library requires several methods in the POA, - # which are disabled by Minimum CORBA. Further it also needs AMI - # support - ifeq ($(ami),1) - TAO_ORBSVCS += PortableGroup - ifeq ($(interceptors),1) - # The Load Balancer requires AMI and Interceptor support. - TAO_ORBSVCS += CosLoadBalancing - endif #interceptors - endif #ami + # The PortableGroup library requires several methods in the POA, + # which are disabled by Minimum CORBA. Further it also needs AMI + # support + ifeq ($(ami),1) + TAO_ORBSVCS += PortableGroup + ifeq ($(interceptors),1) + # The Load Balancer requires AMI and Interceptor support. + TAO_ORBSVCS += CosLoadBalancing + endif #interceptors + endif #ami + endif #corba_messaging - TAO_ORBSVCS += ImplRepo + TAO_ORBSVCS += ImplRepo # This is for Craig R endif # minimum_corba ifeq ($(interceptors),1) TAO_ORBSVCS += RTCosScheduling - endif + endif #RTCosScheduling ifeq ($(ssl),1) ifeq ($(corba_messaging),1) @@ -97,7 +96,9 @@ ifndef TAO_ORBSVCS endif #corba_messaging endif # ssl - TAO_ORBSVCS += Notify + ifeq ($(corba_messaging),1) + TAO_ORBSVCS += Notify + endif # corba_messaging ifeq ($(rt_corba),1) TAO_ORBSVCS += RT_Notify |