diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-08-13 14:58:33 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-08-13 14:58:33 +0000 |
commit | 46a81be9cca54fd4aad0b7768f0bf231fae4282a (patch) | |
tree | 00d26e40d897202e34fac0f8b59bd7c1322d4a7f | |
parent | 9352ec6d9e372d5d172142d7dba8731d87763a07 (diff) | |
download | ATCD-46a81be9cca54fd4aad0b7768f0bf231fae4282a.tar.gz |
ChangeLogTag:Tue Aug 13 07:54:39 2002 Ossama Othman <ossama@uci.edu>
-rw-r--r-- | TAO/ChangeLog | 16 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/CosLoadBalancing.bor | 21 |
2 files changed, 31 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c639fe98558..44c295e811e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,19 @@ +Tue Aug 13 07:54:39 2002 Ossama Othman <ossama@uci.edu> + + * orbsvcs/orbsvcs/CosLoadBalancing.bor: + + Fixed IDL file compile rules. One still referred to the IDL for + the old Load Balancer, and the other for LB_ORT.idl was + missing. + + (OBJFILES): + + Added stub and skeleton sources to the list of object files to + build. + + Thanks to Johnny Willemsen for explaining what was wrong with + this Borland Makefile. + Mon Aug 12 20:03:09 2002 Ossama Othman <ossama@uci.edu> * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.cpp (loads): diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.bor b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.bor index 2427226d254..8b422b81147 100644 --- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.bor +++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.bor @@ -11,9 +11,7 @@ NAME = TAO_CosLoadBalancing !endif TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \ - -I..\.. -Ge 1 -GC -Gv -DCORBA3 \ - -Wb,export_macro=TAO_LoadBalancing_Export \ - -Wb,export_include=LoadBalancing/LoadBalancing_export.h \ + -I..\.. -Ge 1 \ -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h IDLFILES = \ @@ -40,7 +38,10 @@ OBJFILES = \ $(OBJDIR)\LB_ObjectReferenceFactory.obj \ $(OBJDIR)\LB_ORBInitializer.obj \ $(OBJDIR)\LB_Component.obj \ - $(OBJDIR)\LB_CPU_Monitor.obj + $(OBJDIR)\LB_CPU_Monitor.obj \ + $(OBJDIR)\CosLoadBalancingC.obj \ + $(OBJDIR)\CosLoadBalancingS.obj \ + $(OBJDIR)\LB_ORTC.obj RESOURCE = $(OBJDIR)\LoadBalancing.res @@ -64,6 +65,9 @@ LIBFILES = \ $(ACE_LIB) \ $(TAO_LIB) \ $(TAO_PORTABLESERVER_LIB) + $(TAO_MESSAGING_LIB) \ + $(TAO_NAMING_LIB) \ + $(TAO_PORTABLEGROUP_LIB) all: idl_src_files @@ -76,5 +80,10 @@ all: idl_src_files idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp) -$(IDLDIR)\LoadBalancingC.cpp $(IDLDIR)\LoadBalancingS.cpp: $(IDLDIR)\LoadBalancing.idl - $(TAO_IDL) $** +$(IDLDIR)\CosLoadBalancingC.cpp $(IDLDIR)\CosLoadBalancingS.cpp: $(IDLDIR)\CosLoadBalancing.idl + $(TAO_IDL) $** -GC \ + -Wb,export_macro=TAO_LoadBalancing_Export \ + -Wb,export_include=LoadBalancing/LoadBalancing_export.h + +$(IDLDIR)\LB_ORTC.cpp: $(IDLDIR)\LB_ORT.idl + $(TAO_IDL) $** -Gv -DCORBA3 |