diff options
| author | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-08-23 07:01:29 +0000 |
|---|---|---|
| committer | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-08-23 07:01:29 +0000 |
| commit | 3665363cd0c6d2774ac276e62162c195c0e3d9fa (patch) | |
| tree | 2e1f025a6220f15500ec3361957ae610b91359c8 /TAO | |
| parent | b3578d2410e59d9e1d4ae38a76667aa8f0c0424c (diff) | |
| download | ATCD-3665363cd0c6d2774ac276e62162c195c0e3d9fa.tar.gz | |
ChangeLogTag:Thu Aug 23 01:54:42 2001 Christopher Kohlhoff <chris@kohlhoff.com>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/tests/DLL_ORB/Test_Client_Module.bor | 10 | ||||
| -rw-r--r-- | TAO/tests/DLL_ORB/Test_Server_Module.bor | 17 | ||||
| -rw-r--r-- | TAO/tests/DLL_ORB/client.bor | 4 | ||||
| -rw-r--r-- | TAO/tests/DLL_ORB/server.bor | 6 |
5 files changed, 29 insertions, 16 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index d097edf4e9c..7890508a505 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Thu Aug 23 01:54:42 2001 Christopher Kohlhoff <chris@kohlhoff.com> + + * tests/DLL_ORB/Test_Client_Module.bor: + * tests/DLL_ORB/Test_Server_Module.bor: + * tests/DLL_ORB/client.bor: + * tests/DLL_ORB/server.bor: + Fixed Borland makefiles to build the DLL_ORB test correctly. + Wed Aug 22 17:20:06 2001 Carlos O'Ryan <coryan@uci.edu> * orbsvcs/orbsvcs/Event/EC_Default_Factory.h: diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.bor b/TAO/tests/DLL_ORB/Test_Client_Module.bor index 2e324e958f1..1bacaff1d55 100644 --- a/TAO/tests/DLL_ORB/Test_Client_Module.bor +++ b/TAO/tests/DLL_ORB/Test_Client_Module.bor @@ -2,23 +2,25 @@ # Makefile for building the test_client_module # -NAME = test_client_module +NAME = Test_Client_Module TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 OBJFILES = \ - $(OBJDIR)\testC.obj + $(OBJDIR)\testC.obj \ + $(OBJDIR)\Test_Client_Module.obj CFLAGS = \ $(ACE_CFLAGS) \ - $(TAO_CFLAGS) + $(TAO_CFLAGS) \ + -DTEST_CLIENT_MODULE_BUILD_DLL=1 LIBFILES = \ $(ACE_LIB) \ $(TAO_LIB) IDLFILES = \ - $(IDLDIR)\test.idl + $(IDLDIR)\test.idl CPPDIR = . diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.bor b/TAO/tests/DLL_ORB/Test_Server_Module.bor index 9435c20f1e1..6a7c862100b 100644 --- a/TAO/tests/DLL_ORB/Test_Server_Module.bor +++ b/TAO/tests/DLL_ORB/Test_Server_Module.bor @@ -2,25 +2,28 @@ # Makefile for building the test_server_module # -NAME = test_server_module +NAME = Test_Server_Module TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 OBJFILES = \ - $(OBJDIR)\testC.obj \ - $(OBJDIR)\testS.obj + $(OBJDIR)\testC.obj \ + $(OBJDIR)\testS.obj \ + $(OBJDIR)\Test_Server_Module.obj \ + $(OBJDIR)\Test_i.obj CFLAGS = \ $(ACE_CFLAGS) \ - $(TAO_CFLAGS) + $(TAO_CFLAGS) \ + -DTEST_SERVER_MODULE_BUILD_DLL=1 LIBFILES = \ $(ACE_LIB) \ - $(TAO_LIB) \ - $(TAO_PORTABLESERVER_LIB) + $(TAO_LIB) \ + $(TAO_PORTABLESERVER_LIB) IDLFILES = \ - $(IDLDIR)\test.idl + $(IDLDIR)\test.idl CPPDIR = . diff --git a/TAO/tests/DLL_ORB/client.bor b/TAO/tests/DLL_ORB/client.bor index 04f268212ca..c311c9d3da8 100644 --- a/TAO/tests/DLL_ORB/client.bor +++ b/TAO/tests/DLL_ORB/client.bor @@ -13,8 +13,8 @@ CFLAGS = \ LIBFILES = \ $(ACE_LIB) \ - $(TAO_LIB) \ - $(BINDIR)\test_client_module$(LIB_DECORATOR) + $(TAO_LIB) \ + $(CORE_BINDIR)\Test_Client_Module$(LIB_DECORATOR) CPPDIR = . diff --git a/TAO/tests/DLL_ORB/server.bor b/TAO/tests/DLL_ORB/server.bor index 33e2b35c86d..6b749e33075 100644 --- a/TAO/tests/DLL_ORB/server.bor +++ b/TAO/tests/DLL_ORB/server.bor @@ -9,12 +9,12 @@ OBJFILES = \ CFLAGS = \ $(ACE_CFLAGS) \ - $(TAO_CFLAGS) + $(TAO_CFLAGS) LIBFILES = \ $(ACE_LIB) \ - $(TAO_LIB) \ - $(BINDIR)\test_server_module$(LIB_DECORATOR) + $(TAO_LIB) \ + $(CORE_BINDIR)\Test_Server_Module$(LIB_DECORATOR) CPPDIR = . |