diff options
| author | huangming <huangminghuang@users.noreply.github.com> | 2003-10-17 22:39:49 +0000 |
|---|---|---|
| committer | huangming <huangminghuang@users.noreply.github.com> | 2003-10-17 22:39:49 +0000 |
| commit | 4b2b804ee28c7228a9e14e58b63be2ce423071b5 (patch) | |
| tree | fbb8ab374cd797236e85c1b877e86ab2ef779fb7 | |
| parent | 97cf1edc952ca4939891efb48772b633a69126be (diff) | |
| download | ATCD-4b2b804ee28c7228a9e14e58b63be2ce423071b5.tar.gz | |
Fri Oct 17 17:37:05 2003 Huang-Ming Huang <hh1@cse.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.RTCosScheduling | 17 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc | 6 |
3 files changed, 20 insertions, 10 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 632b20ee3cc..45f8918c720 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Fri Oct 17 17:37:05 2003 Huang-Ming Huang <hh1@cse.wustl.edu> + + * orbsvcs/orbsvcs/Makefile.RTCosScheduling: + * orbsvcs/orbsvcs/RTCosScheduling.mpc: Fixed dependency problem + for RH71 Static build - Moved directory RTScheduling after + RTSchedulingC(S).cpp in Source_Files section. + Fri Oct 17 21:17:03 UTC 2003 Kevin Bryan <bryank@cs.uri.edu> * orbsvcs/tests/RTCosScheduling/README * orbsvcs/tests/RTCosScheduling/RTCosScheduling_Client.dsp diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTCosScheduling b/TAO/orbsvcs/orbsvcs/Makefile.RTCosScheduling index 6a45cc636d6..ec81787c5dd 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.RTCosScheduling +++ b/TAO/orbsvcs/orbsvcs/Makefile.RTCosScheduling @@ -26,11 +26,11 @@ IDL_FILES = RTCosScheduling IDL_SRC = $(foreach ext, C.cpp S.cpp, $(foreach file, $(IDL_FILES), $(file)$(ext))) RTCosScheduling = \ + RTCosSchedulingC \ + RTCosSchedulingS \ RTCosScheduling/RTCosScheduling_ClientScheduler_i \ RTCosScheduling/RTCosScheduling_PCP_Manager \ - RTCosScheduling/RTCosScheduling_ServerScheduler_i \ - RTCosSchedulingC \ - RTCosSchedulingS + RTCosScheduling/RTCosScheduling_ServerScheduler_i ifndef ORBSVCS_COMPONENTS ORBSVCS_COMPONENTS = \ @@ -126,14 +126,14 @@ all: idl_stubs # This rule forces make to run the idl_stubs # target before building any of the source files. -RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp RTCosScheduling/RTCosScheduling_PCP_Manager.cpp RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp RTCosSchedulingC.cpp RTCosSchedulingS.cpp: idl_stubs +RTCosSchedulingC.cpp RTCosSchedulingS.cpp RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp RTCosScheduling/RTCosScheduling_PCP_Manager.cpp RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp: idl_stubs endif include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -INSTALL_CHECK = ../../../ace +INSTALL_CHECK = ../../../lib ifeq ($(INSTALL_CHECK),.) INSLIB = $(PWD) else @@ -144,7 +144,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU include $(TAO_ROOT)/taoconfig.mk -CPPFLAGS += -I../../orbsvcs -I../.. -I../../tao -I../../.. +CPPFLAGS += -I../../orbsvcs/orbsvcs -I../../orbsvcs -I../.. -I../../tao -I../../.. ifeq ($(shared_libs),1) ifneq ($(SHLIB),) CPPFLAGS += -DTAO_RTCOSSCHEDULING_BUILD_DLL @@ -157,7 +157,7 @@ ifeq ($(static_libs),1) endif -LDFLAGS += -L../../../ace +LDFLAGS += -L../../../lib TAO_IDLFLAGS += -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=RTCosScheduling/RTCosScheduling_export.h -Gv -I../.. -I../../orbsvcs -Ge 1 -Sc -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h #---------------------------------------------------------------------------- @@ -167,6 +167,9 @@ require_warning: @echo This project will not be built due to one of the following missing features: @echo interceptors rt_corba +../../../lib: + -@mkdir -p "../../../lib" + .PHONY: ORBSVCS_COMPONENTS ORBSVCS_COMPONENTS: diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc b/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc index 5e34099a45c..2756c897ccc 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc @@ -1,18 +1,18 @@ -project : orbsvcslib, rtportableserver { +project(RTCosScheduling) : orbsvcslib, rtportableserver { requires += interceptors sharedname = TAO_RTCosScheduling idlflags += -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=RTCosScheduling/RTCosScheduling_export.h dynamicflags += TAO_RTCOSSCHEDULING_BUILD_DLL tagchecks += RTCosScheduling - + IDL_Files { RTCosScheduling.idl } Source_Files(ORBSVCS_COMPONENTS) { RTCosScheduling { - RTCosScheduling RTCosSchedulingC.cpp RTCosSchedulingS.cpp + RTCosScheduling } } Template_Files { |