summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-11-14 04:43:15 +0000
committerdhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-11-14 04:43:15 +0000
commit8a54ebf6484aa25a909e00621edd642af6d55a03 (patch)
treebf509b4cd2e7fd96ff4a3bd1a2bbeb4daf8977aa
parentf3c2d965f56b8b9640ed481e5014e56ae53364a6 (diff)
downloadATCD-8a54ebf6484aa25a909e00621edd642af6d55a03.tar.gz
ChangeLogTag:Fri Nov 14 04:53:28 UTC 2003 Don Hinton <dhinton@dresystems.com>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile6
2 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 59d102b1b89..05c54de2b90 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Fri Nov 14 04:53:28 UTC 2003 Don Hinton <dhinton@dresystems.com>
+
+ * tests/RTScheduling/Scheduling_Interceptor/Makefile:
+ Moved the testC.o and testS.o objects in from of the
+ test_client.o and test_server.o objects in the CLIENT_OBJS and
+ SERVER_OBJS lists to force them to get created first.
+
Fri Nov 14 03:47:33 UTC 2003 Don Hinton <dhinton@dresystems.com>
* orbsvcs/examples/RtEC/Kokyu/Makefile:
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile b/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile
index 0f92e9b3358..5524a06e1d1 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile
@@ -13,14 +13,14 @@ ifndef TAO_ROOT
endif # ! TAO_ROOT
IDL_FILES = test
-IDL_SRC = testC.cpp testS.cpp
+IDL_SRC = testC.cpp testS.cpp
LIBS = -lTAO_RTScheduler
BIN_UNCHECKED = Scheduler_Interceptor_Client Scheduler_Interceptor_Server
SRC = $(IDL_SRC) ../Scheduler.cpp
-CLIENT_OBJS = test_client.o testC.o ../Scheduler.o
-SERVER_OBJS = test_server.o testC.o testS.o ../Scheduler.o
+CLIENT_OBJS = testC.o test_client.o ../Scheduler.o
+SERVER_OBJS = testC.o testS.o test_server.o ../Scheduler.o
BUILD = $(BIN)
VBIN = $(BIN:%=%$(VAR))