diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-09-08 18:40:16 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-09-08 18:40:16 +0000 |
| commit | 4a6ef540ebe97a4524fb0572b3447e0544831059 (patch) | |
| tree | 37a1248384b798214fdad99731178e821e377ec8 /TAO/tests/Collocation | |
| parent | bc17bb2aa98ea22fad9f8b587c2952709d169c39 (diff) | |
| download | ATCD-4a6ef540ebe97a4524fb0572b3447e0544831059.tar.gz | |
ChangeLogTag:Fri Sep 8 11:34:59 2000 Christopher Kohlhoff <chris@kohlhoff.com>
Diffstat (limited to 'TAO/tests/Collocation')
| -rw-r--r-- | TAO/tests/Collocation/Coll_Test_Stubs.bor | 12 | ||||
| -rw-r--r-- | TAO/tests/Collocation/Collocation.bor | 13 | ||||
| -rw-r--r-- | TAO/tests/Collocation/Diamond.bor | 15 |
3 files changed, 32 insertions, 8 deletions
diff --git a/TAO/tests/Collocation/Coll_Test_Stubs.bor b/TAO/tests/Collocation/Coll_Test_Stubs.bor index 47af7ff8008..0adc7b46042 100644 --- a/TAO/tests/Collocation/Coll_Test_Stubs.bor +++ b/TAO/tests/Collocation/Coll_Test_Stubs.bor @@ -11,9 +11,15 @@ TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gd \ OBJFILES = \ $(OBJDIR)\DiamondC.obj -CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) -DMY_Stub_HAS_DLL=1 -DMY_Stub_BUILD_DLL=1 - -LIBFILES = $(ACE_LIB) $(TAO_LIB) +CFLAGS = \ + $(ACE_CFLAGS) \ + $(TAO_CFLAGS) \ + -DMY_Stub_HAS_DLL=1 \ + -DMY_Stub_BUILD_DLL=1 + +LIBFILES = \ + $(ACE_LIB) \ + $(TAO_LIB) CPPDIR = . diff --git a/TAO/tests/Collocation/Collocation.bor b/TAO/tests/Collocation/Collocation.bor index bcfee5209ad..9aca9e99633 100644 --- a/TAO/tests/Collocation/Collocation.bor +++ b/TAO/tests/Collocation/Collocation.bor @@ -8,9 +8,18 @@ OBJFILES = \ $(OBJDIR)\Coll_Tester.obj \ $(OBJDIR)\main.obj -CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) -DDiamond_HAS_DLL=1 -DMY_Stub_HAS_DLL=1 +CFLAGS = \ + $(ACE_CFLAGS) \ + $(TAO_CFLAGS) \ + $(TAO_PORTABLESERVER_CFLAGS) \ + -DDiamond_HAS_DLL=1 \ + -DMY_Stub_HAS_DLL=1 -LIBFILES = $(ACE_LIB) $(TAO_LIB) $(BINDIR)\Diamond$(LIB_DECORATOR).lib \ +LIBFILES = \ + $(ACE_LIB) \ + $(TAO_LIB) \ + $(TAO_PORTABLESERVER_LIB) \ + $(BINDIR)\Diamond$(LIB_DECORATOR).lib \ $(BINDIR)\Coll_Test_Stubs$(LIB_DECORATOR).lib CPPDIR = . diff --git a/TAO/tests/Collocation/Diamond.bor b/TAO/tests/Collocation/Diamond.bor index 069d266ac00..cd01b42e746 100644 --- a/TAO/tests/Collocation/Diamond.bor +++ b/TAO/tests/Collocation/Diamond.bor @@ -12,9 +12,18 @@ OBJFILES = \ $(OBJDIR)\DiamondS.obj \ $(OBJDIR)\Diamond_i.obj -CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) -DDiamond_HAS_DLL=1 -DDiamond_BUILD_DLL=1 - -LIBFILES = $(ACE_LIB) $(TAO_LIB) $(BINDIR)\Coll_Test_Stubs$(LIB_DECORATOR).lib +CFLAGS = \ + $(ACE_CFLAGS) \ + $(TAO_CFLAGS) \ + $(TAO_PORTABLESERVER_CFLAGS) \ + -DDiamond_HAS_DLL=1 \ + -DDiamond_BUILD_DLL=1 + +LIBFILES = \ + $(ACE_LIB) \ + $(TAO_LIB) \ + $(TAO_PORTABLESERVER_LIB) \ + $(BINDIR)\Coll_Test_Stubs$(LIB_DECORATOR).lib CPPDIR = . |