diff options
| author | venkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-18 14:31:58 +0000 |
|---|---|---|
| committer | venkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-18 14:31:58 +0000 |
| commit | c933a9616c2e3cd26c73bfbec789fa61fc771622 (patch) | |
| tree | 3929760115db39bbf83ef7a4b2c6907918605bc4 | |
| parent | 09a189be12d2a96962aa5f536daba4515095d0b5 (diff) | |
| download | ATCD-c933a9616c2e3cd26c73bfbec789fa61fc771622.tar.gz | |
Sat Oct 18 09:30:40 2003 Venkita Subramonian <venkita@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/RTCosScheduling/Makefile | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc | 41 |
3 files changed, 31 insertions, 24 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 40e5ed83f56..f199cb5163d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Sat Oct 18 09:30:40 2003 Venkita Subramonian <venkita@cs.wustl.edu> + + * orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc: + * orbsvcs/tests/RTCosScheduling/Makefile: Fixed a build dependency + problem. + Sat Oct 18 08:52:15 2003 Venkita Subramonian <venkita@cs.wustl.edu> * orbsvcs/tests/Notify/lib/Peer_T.cpp: Fixed compile error for diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Makefile b/TAO/orbsvcs/tests/RTCosScheduling/Makefile index ef513e4c210..590736c1e36 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/Makefile +++ b/TAO/orbsvcs/tests/RTCosScheduling/Makefile @@ -20,15 +20,15 @@ endif %.tgt0: ifeq ($(KEEP_GOING),1) - -@$(MAKE) -f Makefile.RTCosScheduling_Client -C . $(*); + -@$(MAKE) -f Makefile.commonlib -C . $(*); else - @$(MAKE) -f Makefile.RTCosScheduling_Client -C . $(*); + @$(MAKE) -f Makefile.commonlib -C . $(*); endif %.tgt1: %.tgt0 ifeq ($(KEEP_GOING),1) - -@$(MAKE) -f Makefile.commonlib -C . $(*); + -@$(MAKE) -f Makefile.RTCosScheduling_Client -C . $(*); else - @$(MAKE) -f Makefile.commonlib -C . $(*); + @$(MAKE) -f Makefile.RTCosScheduling_Client -C . $(*); endif %.tgt2: %.tgt0 %.tgt1 ifeq ($(KEEP_GOING),1) diff --git a/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc b/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc index 90bc5f9edaa..01b98729ef5 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc +++ b/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc @@ -1,22 +1,4 @@ -project(commonlib): rtcosscheduling, orbsvcslib { - requires += interceptors - sharedname = testSched_Common - idlflags += -Wb,export_macro=testSched_Export \ - -Wb,export_include=testSched_export.h - - dynamicflags += TESTSCHED_BUILD_DLL - tagchecks += testSched_Common - - IDL_Files { - testSched.idl - } - Source_Files { - testSchedC.cpp - testSchedS.cpp - } -} - -project(*server): rtcosscheduling, rt_server, orbsvcsexe { +project(RTCosScheduling_Server): rtcosscheduling, rt_server, orbsvcsexe { after += commonlib libs += testSched_Common libpaths += . @@ -28,8 +10,9 @@ project(*server): rtcosscheduling, rt_server, orbsvcsexe { } } -project(*client): rtcosscheduling, rt_client, orbsvcsexe { +project(RTCosScheduling_Client): rtcosscheduling, rt_client, orbsvcsexe { after += commonlib + after += RTCosScheduling_Server libs += testSched_Common libpaths += . exename = client @@ -38,3 +21,21 @@ project(*client): rtcosscheduling, rt_client, orbsvcsexe { client.cpp } } + +project(commonlib): rtcosscheduling, orbsvcslib { + requires += interceptors + sharedname = testSched_Common + idlflags += -Wb,export_macro=testSched_Export \ + -Wb,export_include=testSched_export.h + + dynamicflags += TESTSCHED_BUILD_DLL + tagchecks += testSched_Common + + IDL_Files { + testSched.idl + } + Source_Files { + testSchedC.cpp + testSchedS.cpp + } +} |