diff options
| author | venkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-17 23:44:02 +0000 |
|---|---|---|
| committer | venkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-17 23:44:02 +0000 |
| commit | c9d90e9ad62fb7e49ed9e86eeef8fea4990271d9 (patch) | |
| tree | 140c776f09cdee9375fe7dd4977404582e0efa5e | |
| parent | e8b14dc3a7732e6b5b7278af3f5c344aced8b2d8 (diff) | |
| download | ATCD-c9d90e9ad62fb7e49ed9e86eeef8fea4990271d9.tar.gz | |
Fri Oct 17 18:41:14 2003 Venkita Subramonian <venkita@cs.wustl.edu>
3 files changed, 8 insertions, 4 deletions
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Makefile.RTCosScheduling_Client b/TAO/orbsvcs/tests/RTCosScheduling/Makefile.RTCosScheduling_Client index 466ece44885..bf0bac12f9b 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/Makefile.RTCosScheduling_Client +++ b/TAO/orbsvcs/tests/RTCosScheduling/Makefile.RTCosScheduling_Client @@ -32,7 +32,7 @@ FILES = \ #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- -LDLIBS = -lTAO_RTCosScheduling -lTAO_RTPortableServer -lTAO_RTCORBA -lTAO_PortableServer -lTAO_IORInterceptor -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO -lACE +LDLIBS = -ltestSched_Common -lTAO_RTCosScheduling -lTAO_RTPortableServer -lTAO_RTCORBA -lTAO_PortableServer -lTAO_IORInterceptor -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO -lACE include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU ## We don't need the ACELIB setting from wrapper_macros.GNU ACELIB = @@ -84,7 +84,7 @@ ifeq ($(static_libs),1) endif -LDFLAGS += -L../../../../lib +LDFLAGS += -L. -L../../../../lib TAO_IDLFLAGS += -Ge 1 -Sc -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Gv #---------------------------------------------------------------------------- diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Makefile.RTCosScheduling_Server b/TAO/orbsvcs/tests/RTCosScheduling/Makefile.RTCosScheduling_Server index c3c9aa48af7..99ee55de95a 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/Makefile.RTCosScheduling_Server +++ b/TAO/orbsvcs/tests/RTCosScheduling/Makefile.RTCosScheduling_Server @@ -33,7 +33,7 @@ FILES = \ #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- -LDLIBS = -lTAO_RTCosScheduling -lTAO_RTPortableServer -lTAO_RTCORBA -lTAO_PortableServer -lTAO_IORInterceptor -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO -lACE +LDLIBS = -ltestSched_Common -lTAO_RTCosScheduling -lTAO_RTPortableServer -lTAO_RTCORBA -lTAO_PortableServer -lTAO_IORInterceptor -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO -lACE include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU ## We don't need the ACELIB setting from wrapper_macros.GNU ACELIB = @@ -85,7 +85,7 @@ ifeq ($(static_libs),1) endif -LDFLAGS += -L../../../../lib +LDFLAGS += -L. -L../../../../lib TAO_IDLFLAGS += -Ge 1 -Sc -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Gv #---------------------------------------------------------------------------- diff --git a/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc b/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc index c44970204be..90bc5f9edaa 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc +++ b/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc @@ -18,6 +18,8 @@ project(commonlib): rtcosscheduling, orbsvcslib { project(*server): rtcosscheduling, rt_server, orbsvcsexe { after += commonlib + libs += testSched_Common + libpaths += . exename = server comps = Source_Files { @@ -28,6 +30,8 @@ project(*server): rtcosscheduling, rt_server, orbsvcsexe { project(*client): rtcosscheduling, rt_client, orbsvcsexe { after += commonlib + libs += testSched_Common + libpaths += . exename = client comps = Source_Files { |