diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-09-11 15:33:53 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-09-11 15:33:53 +0000 |
| commit | 94ca5bc9e6ad10e0e086721cdf62e004dbb7a583 (patch) | |
| tree | ca5876d7832e323059bc564dc03cf863ccad6fe4 | |
| parent | 535970152f9f94cff707718d51f264832099dcc7 (diff) | |
| download | ATCD-94ca5bc9e6ad10e0e086721cdf62e004dbb7a583.tar.gz | |
ChangeLogTag:Thu Sep 11 08:32:00 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile | 6 | ||||
| -rw-r--r-- | TAO/examples/RTScheduling/MIF_Scheduler/Makefile | 7 |
3 files changed, 14 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 8abdafcebbc..80acfe7b2a4 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Sep 11 08:32:00 2003 Ossama Othman <ossama@dre.vanderbilt.edu> + + * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile: + * examples/RTScheduling/MIF_Scheduler/Makefile: + + Removed duplicate library instances in link command. Addresses + link errors showing up statically linked builds. + Wed Sep 10 17:49:10 2003 George Edwards <g.edwards@vanderbilt.edu> Added files: diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile index 5169579eee6..63ed75e7042 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LIBS = -lTAO_RTScheduler -lTAO_RTCORBA -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_ObjRefTemplate -lTAO_Valuetype -lTAO_IORInterceptor +TEST_LIBS = -lTAO_RTScheduler -lTAO_RTCORBA -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable BIN_UNCHECKED = test Starter IDL_FILES = ../Synch \ @@ -57,10 +57,10 @@ override TAO_IDLFLAGS += -o ../ \ .PRECIOUS: $(foreach ext, $(IDL_EXT), ../Job$(ext) ../Synch$(ext)) test: $(addprefix $(VDIR),$(FP_TEST_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_CLNT_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TEST_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK) Starter: $(addprefix $(VDIR),$(STARTER_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_CLNT_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TEST_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK) realclean: clean -$(RM) $(foreach ext, $(IDL_EXT), Job$(ext)) diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile index e89ef9a5672..bdaf2fedd70 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile +++ b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LIBS = -lTAO_RTScheduler -lTAO_RTCORBA -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO_ObjRefTemplate -lTAO_Valuetype -lTAO_IORInterceptor +TEST_LIBS = -lTAO_RTScheduler -lTAO_RTCORBA -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable BIN_UNCHECKED = test Starter IDL_FILES = ../Synch \ @@ -50,7 +50,6 @@ include $(TAO_ROOT)/taoconfig.mk override TAO_IDLFLAGS += -o ../ \ -I$(TAO_ROOT) - #---------------------------------------------------------------------------- # Local targets #---------------------------------------------------------------------------- @@ -58,10 +57,10 @@ override TAO_IDLFLAGS += -o ../ \ .PRECIOUS: $(foreach ext, $(IDL_EXT), ../Job$(ext) ../Synch$(ext)) test: $(addprefix $(VDIR),$(MIF_TEST_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_CLNT_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TEST_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK) Starter: $(addprefix $(VDIR),$(STARTER_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_CLNT_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TEST_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK) realclean: clean -$(RM) $(foreach ext, $(IDL_EXT), Job$(ext)) |