diff options
author | venkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-17 16:37:52 +0000 |
---|---|---|
committer | venkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-17 16:37:52 +0000 |
commit | bdfef6f067f4071c966db35de34c0481764248b9 (patch) | |
tree | 94ac13603827a1eaf656bb5591366804c9955343 /TAO/examples | |
parent | 68c5cbe35a1bcb142cd1df55b706088dd387a507 (diff) | |
download | ATCD-bdfef6f067f4071c966db35de34c0481764248b9.tar.gz |
Fri Oct 17 11:33:10 2003 Venkita Subramonian <venkita@cs.wustl.edu>
Diffstat (limited to 'TAO/examples')
5 files changed, 23 insertions, 22 deletions
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile index 73187c602fe..a602bb952cc 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile @@ -20,15 +20,15 @@ endif %.tgt0: ifeq ($(KEEP_GOING),1) - -@$(MAKE) -f Makefile.mif_server -C . $(*); + -@$(MAKE) -f Makefile.mif_client -C . $(*); else - @$(MAKE) -f Makefile.mif_server -C . $(*); + @$(MAKE) -f Makefile.mif_client -C . $(*); endif -%.tgt1: +%.tgt1: %.tgt0 ifeq ($(KEEP_GOING),1) - -@$(MAKE) -f Makefile.mif_client -C . $(*); + -@$(MAKE) -f Makefile.mif_server -C . $(*); else - @$(MAKE) -f Makefile.mif_client -C . $(*); + @$(MAKE) -f Makefile.mif_server -C . $(*); endif diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile index 507c1dd256d..52e744dd3c1 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile @@ -20,15 +20,15 @@ endif %.tgt0: ifeq ($(KEEP_GOING),1) - -@$(MAKE) -f Makefile.muf_server -C . $(*); + -@$(MAKE) -f Makefile.muf_client -C . $(*); else - @$(MAKE) -f Makefile.muf_server -C . $(*); + @$(MAKE) -f Makefile.muf_client -C . $(*); endif -%.tgt1: +%.tgt1: %.tgt0 ifeq ($(KEEP_GOING),1) - -@$(MAKE) -f Makefile.muf_client -C . $(*); + -@$(MAKE) -f Makefile.muf_server -C . $(*); else - @$(MAKE) -f Makefile.muf_client -C . $(*); + @$(MAKE) -f Makefile.muf_server -C . $(*); endif diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.muf_client b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.muf_client index ea4aff48aaa..b1b4f008287 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.muf_client +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.muf_client @@ -20,7 +20,7 @@ ifndef CIAO_ROOT CIAO_ROOT = $(TAO_ROOT)/CIAO endif -TAO_IDL = $(ACE_ROOT)/bin/tao_idl +TAO_IDL = ../../../../bin/tao_idl IDL_FILES = test IDL_SRC = $(foreach ext, C.cpp S.cpp, $(foreach file, $(IDL_FILES), $(file)$(ext))) @@ -31,7 +31,7 @@ FILES = \ #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- -LDLIBS = -lKokyu_DSRT_Schedulers -lKokyu -lTAO_RTCORBA -lTAO -lACE +LDLIBS = -lTAO_Svc_Utils -lKokyu_DSRT_Schedulers -lTAO_RTScheduler -lKokyu -lTAO_RTCORBA -lTAO -lACE include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU ## We don't need the ACELIB setting from wrapper_macros.GNU ACELIB = @@ -75,7 +75,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU include $(TAO_ROOT)/taoconfig.mk -CPPFLAGS += -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers -I$(ACE_ROOT)/Kokyu -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(ACE_ROOT) +CPPFLAGS += -I../../../examples/Kokyu_dsrt_schedulers -I../../../../Kokyu -I../../../orbsvcs -I../../.. -I../../../tao -I../../../.. ifeq ($(static_libs),1) ifneq ($(LIB),) CPPFLAGS += -DTAO_AS_STATIC_LIBS -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS @@ -83,7 +83,7 @@ ifeq ($(static_libs),1) endif -LDFLAGS += -L$(ACE_ROOT)/lib +LDFLAGS += -L../../../../lib TAO_IDLFLAGS += -Ge 1 -Sc -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h #---------------------------------------------------------------------------- @@ -93,8 +93,8 @@ require_warning: @echo This project will not be built due to one of the following missing features: @echo rt_corba -$(ACE_ROOT)/lib: - -@mkdir -p "$(ACE_ROOT)/lib" +../../../../lib: + -@mkdir -p "../../../../lib" ADDITIONAL_IDL_TARGETS = diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.muf_server b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.muf_server index 5c799b9b4e5..dcc0f5da157 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.muf_server +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.muf_server @@ -20,7 +20,7 @@ ifndef CIAO_ROOT CIAO_ROOT = $(TAO_ROOT)/CIAO endif -TAO_IDL = $(ACE_ROOT)/bin/tao_idl +TAO_IDL = ../../../../bin/tao_idl IDL_FILES = test IDL_SRC = $(foreach ext, C.cpp S.cpp, $(foreach file, $(IDL_FILES), $(file)$(ext))) @@ -33,7 +33,7 @@ FILES = \ #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- -LDLIBS = -lKokyu_DSRT_Schedulers -lKokyu -lTAO_RTCORBA -lTAO_PortableServer -lTAO_IORInterceptor -lTAO_Valuetype -lTAO_ObjRefTemplate -lTAO -lACE +LDLIBS = -lKokyu_DSRT_Schedulers -lTAO_RTScheduler -lKokyu -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 = @@ -76,7 +76,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU include $(TAO_ROOT)/taoconfig.mk -CPPFLAGS += -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers -I$(ACE_ROOT)/Kokyu -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(ACE_ROOT) +CPPFLAGS += -I../../../examples/Kokyu_dsrt_schedulers -I../../../../Kokyu -I../../.. -I../../../tao -I../../../.. ifeq ($(static_libs),1) ifneq ($(LIB),) CPPFLAGS += -DTAO_AS_STATIC_LIBS -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS @@ -84,7 +84,7 @@ ifeq ($(static_libs),1) endif -LDFLAGS += -L$(ACE_ROOT)/lib +LDFLAGS += -L../../../../lib TAO_IDLFLAGS += -Gv -Ge 1 -Sc -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h #---------------------------------------------------------------------------- @@ -94,8 +94,8 @@ require_warning: @echo This project will not be built due to one of the following missing features: @echo rt_corba -$(ACE_ROOT)/lib: - -@mkdir -p "$(ACE_ROOT)/lib" +../../../../lib: + -@mkdir -p "../../../../lib" ADDITIONAL_IDL_TARGETS = diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc index c6256212220..01d7e8ff9e5 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc @@ -8,6 +8,7 @@ project(muf_server): kokyu_dsrt_scheduler_server { project(muf_client): orbsvcsexe, kokyu_dsrt_scheduler_client { exename = muf_client + libs += TAO_Svc_Utils Source_Files { testC.cpp client.cpp |