diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-12-10 12:13:36 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-12-10 12:13:36 +0000 |
| commit | 3b1791e70784eae8546e6707eda484d03c3ec88a (patch) | |
| tree | 5986ff59f2d431658f03f81f81a58fec72b2cf01 | |
| parent | ada67d61ced25598a14b82260c9383f64fc8db22 (diff) | |
| download | ATCD-3b1791e70784eae8546e6707eda484d03c3ec88a.tar.gz | |
ChangeLogTag:Wed Dec 10 06:12:26 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.Bug_1395_Client | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.Bug_1395_Server | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9d05bac0250..c141cc346fe 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,4 +1,11 @@ -Wed Dec 10 11:42:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> +Wed Dec 10 06:12:26 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * orbsvcs/tests/Bug_1395_Regression/Makefile.Bug_1395_Client: + * orbsvcs/tests/Bug_1395_Regression/Makefile.Bug_1395_Server: + + Fixed the link lines in the Makefiles. + +Wed Dec 10 11:42:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Bug_1330_Regression/Bug_1330_Client.dsp: Fixed release configuration, this should be the last for the diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.Bug_1395_Client b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.Bug_1395_Client index cde63e1bc2c..08d58761c07 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.Bug_1395_Client +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.Bug_1395_Client @@ -11,8 +11,6 @@ endif IDL_FILES = Test IDL_SRC = $(foreach ext, C.cpp S.cpp, $(foreach file, $(IDL_FILES), $(file)$(ext))) - - FILES = \ TestC \ client diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.Bug_1395_Server b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.Bug_1395_Server index d55fc6b9a97..7481659c251 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.Bug_1395_Server +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.Bug_1395_Server @@ -48,8 +48,6 @@ endif LDFLAGS += -L$(TAO_ROOT)/tao/PortableServer -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace TAO_IDLFLAGS += -Ge 1 -Sc -LDLIBS = -lTAO_PortableServer -lTAO - #---------------------------------------------------------------------------- # Local targets #---------------------------------------------------------------------------- @@ -65,7 +63,7 @@ all: idl_stubs .PRECIOUS: $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext))) $(BIN): $(addprefix $(VDIR), $(OBJS)) - $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(TAO_SRVR_LIBS) $(VLDLIBS) $(POSTLINK) realclean: clean -$(RM) $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext))) |