From 5009b291af9784ab4ebb30d73eaf6c6cabc953aa Mon Sep 17 00:00:00 2001 From: venkita Date: Wed, 22 Oct 2003 11:04:27 +0000 Subject: ChangeLogTag: Wed Oct 22 05:59:16 2003 Venkita Subramonian --- TAO/ChangeLog | 10 +++++++++ .../Makefile.RTCosScheduling_Client | 25 ---------------------- .../Makefile.RTCosScheduling_Server | 25 ---------------------- .../tests/RTCosScheduling/RTCosScheduling.mpc | 4 ++++ 4 files changed, 14 insertions(+), 50 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index fd8bf07cb4b..e1ca65dee78 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Wed Oct 22 05:59:16 2003 Venkita Subramonian + + * orbsvcs/tests/RTCosScheduling/Makefile.RTCosScheduling_Server: + * orbsvcs/tests/RTCosScheduling/Makefile.RTCosScheduling_Client: + * orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc: + Made the IDL_Files section empty for client and server + projects. If we did not do this, the stub and skeleton files + were getting compiled once with building the commonlib file and + again while buidling the server and client. + Tue Oct 21 12:13:34 2003 Balachandran Natarajan * tao/ORB.h: Removed virtual qualifiers that went in as part of diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Makefile.RTCosScheduling_Client b/TAO/orbsvcs/tests/RTCosScheduling/Makefile.RTCosScheduling_Client index bf0bac12f9b..cfdd2dc325a 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/Makefile.RTCosScheduling_Client +++ b/TAO/orbsvcs/tests/RTCosScheduling/Makefile.RTCosScheduling_Client @@ -20,13 +20,7 @@ ifndef CIAO_ROOT CIAO_ROOT = $(TAO_ROOT)/CIAO endif -TAO_IDL = ../../../../bin/tao_idl -IDL_FILES = testSched -IDL_SRC = $(foreach ext, C.cpp S.cpp, $(foreach file, $(IDL_FILES), $(file)$(ext))) - FILES = \ - testSchedC \ - testSchedS \ client #---------------------------------------------------------------------------- @@ -61,14 +55,6 @@ endif OBJS = $(addsuffix .o, $(notdir $(FILES))) SRC = $(addsuffix .cpp, $(FILES)) -ifneq ($(BIN),) -all: idl_stubs - -# This rule forces make to run the idl_stubs -# target before building any of the source files. -testSchedC.cpp testSchedS.cpp client.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 @@ -86,7 +72,6 @@ endif LDFLAGS += -L. -L../../../../lib -TAO_IDLFLAGS += -Ge 1 -Sc -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Gv #---------------------------------------------------------------------------- # Local targets #---------------------------------------------------------------------------- @@ -98,15 +83,6 @@ require_warning: -@mkdir -p "../../../../lib" -ADDITIONAL_IDL_TARGETS = -# IDL File Directory: . - -ifneq ($(ADDITIONAL_IDL_TARGETS),) -idl_stubs: $(ADDITIONAL_IDL_TARGETS) -endif - -.PRECIOUS: $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext))) - ifndef kylix $(BIN): $(addprefix $(VDIR), $(OBJS)) $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK) @@ -116,7 +92,6 @@ $(BIN): $(addprefix $(VDIR), $(OBJS)) endif realclean: clean - -$(RM) $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext))) ifneq ($(GENERATED_DIRTY),) -$(RM) -r $(GENERATED_DIRTY) endif diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Makefile.RTCosScheduling_Server b/TAO/orbsvcs/tests/RTCosScheduling/Makefile.RTCosScheduling_Server index 99ee55de95a..d2ebed7d319 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/Makefile.RTCosScheduling_Server +++ b/TAO/orbsvcs/tests/RTCosScheduling/Makefile.RTCosScheduling_Server @@ -20,13 +20,7 @@ ifndef CIAO_ROOT CIAO_ROOT = $(TAO_ROOT)/CIAO endif -TAO_IDL = ../../../../bin/tao_idl -IDL_FILES = testSched -IDL_SRC = $(foreach ext, C.cpp S.cpp, $(foreach file, $(IDL_FILES), $(file)$(ext))) - FILES = \ - testSchedC \ - testSchedS \ Object1_i \ server @@ -62,14 +56,6 @@ endif OBJS = $(addsuffix .o, $(notdir $(FILES))) SRC = $(addsuffix .cpp, $(FILES)) -ifneq ($(BIN),) -all: idl_stubs - -# This rule forces make to run the idl_stubs -# target before building any of the source files. -testSchedC.cpp testSchedS.cpp Object1_i.cpp server.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 @@ -87,7 +73,6 @@ endif LDFLAGS += -L. -L../../../../lib -TAO_IDLFLAGS += -Ge 1 -Sc -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Gv #---------------------------------------------------------------------------- # Local targets #---------------------------------------------------------------------------- @@ -99,15 +84,6 @@ require_warning: -@mkdir -p "../../../../lib" -ADDITIONAL_IDL_TARGETS = -# IDL File Directory: . - -ifneq ($(ADDITIONAL_IDL_TARGETS),) -idl_stubs: $(ADDITIONAL_IDL_TARGETS) -endif - -.PRECIOUS: $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext))) - ifndef kylix $(BIN): $(addprefix $(VDIR), $(OBJS)) $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK) @@ -117,7 +93,6 @@ $(BIN): $(addprefix $(VDIR), $(OBJS)) endif realclean: clean - -$(RM) $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext))) ifneq ($(GENERATED_DIRTY),) -$(RM) -r $(GENERATED_DIRTY) endif diff --git a/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc b/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc index 01b98729ef5..0c49c0e8a8b 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc +++ b/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc @@ -8,6 +8,8 @@ project(RTCosScheduling_Server): rtcosscheduling, rt_server, orbsvcsexe { Object1_i.cpp server.cpp } + IDL_Files { + } } project(RTCosScheduling_Client): rtcosscheduling, rt_client, orbsvcsexe { @@ -20,6 +22,8 @@ project(RTCosScheduling_Client): rtcosscheduling, rt_client, orbsvcsexe { Source_Files { client.cpp } + IDL_Files { + } } project(commonlib): rtcosscheduling, orbsvcslib { -- cgit v1.2.1