diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-29 13:43:16 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-29 13:43:16 +0000 |
| commit | 70200b3d05a615008ec5204609e1b1aacb0886b5 (patch) | |
| tree | ec758c3bc56203a94d7cd8c8fb7363203ec7087d | |
| parent | f4d77dd63b6c670310ee3776c0ae06584d997792 (diff) | |
| download | ATCD-70200b3d05a615008ec5204609e1b1aacb0886b5.tar.gz | |
ChangeLogTag: Sat Jul 29 08:41:48 2000 David L. Levine <levine@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 | ||||
| -rw-r--r-- | tests/Makefile | 16 |
4 files changed, 33 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 0e240a6c6c9..c06d288b27f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jul 29 08:41:48 2000 David L. Levine <levine@cs.wustl.edu> + + * tests/Makefile: don't build CDR_Array_Test with + ACE_HAS_GNUG_PRE_2_8. Build it on LynxOS >= 3.1.0. + Fri Jul 28 15:58:37 2000 Joe Hoffert <joeh@cs.wustl.edu> * bin/pace_components: @@ -7,7 +12,7 @@ Fri Jul 28 15:58:37 2000 Joe Hoffert <joeh@cs.wustl.edu> * bin/ace_components: Adding commands for pace. - * include/makeinclude/wrapper_macros.GNU: + * include/makeinclude/wrapper_macros.GNU: For PACE, modified so that it doesn't include the PACE library if we are inlining. diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 0e240a6c6c9..c06d288b27f 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Sat Jul 29 08:41:48 2000 David L. Levine <levine@cs.wustl.edu> + + * tests/Makefile: don't build CDR_Array_Test with + ACE_HAS_GNUG_PRE_2_8. Build it on LynxOS >= 3.1.0. + Fri Jul 28 15:58:37 2000 Joe Hoffert <joeh@cs.wustl.edu> * bin/pace_components: @@ -7,7 +12,7 @@ Fri Jul 28 15:58:37 2000 Joe Hoffert <joeh@cs.wustl.edu> * bin/ace_components: Adding commands for pace. - * include/makeinclude/wrapper_macros.GNU: + * include/makeinclude/wrapper_macros.GNU: For PACE, modified so that it doesn't include the PACE library if we are inlining. diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 0e240a6c6c9..c06d288b27f 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Sat Jul 29 08:41:48 2000 David L. Levine <levine@cs.wustl.edu> + + * tests/Makefile: don't build CDR_Array_Test with + ACE_HAS_GNUG_PRE_2_8. Build it on LynxOS >= 3.1.0. + Fri Jul 28 15:58:37 2000 Joe Hoffert <joeh@cs.wustl.edu> * bin/pace_components: @@ -7,7 +12,7 @@ Fri Jul 28 15:58:37 2000 Joe Hoffert <joeh@cs.wustl.edu> * bin/ace_components: Adding commands for pace. - * include/makeinclude/wrapper_macros.GNU: + * include/makeinclude/wrapper_macros.GNU: For PACE, modified so that it doesn't include the PACE library if we are inlining. diff --git a/tests/Makefile b/tests/Makefile index a539b1cf5cf..f0d57eb9f24 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -20,7 +20,6 @@ BIN = Aio_Platform_Test \ Cached_Accept_Conn_Test \ Cached_Conn_Test \ Capabilities_Test \ - CDR_Array_Test \ CDR_File_Test \ CDR_Test \ Collection_Test \ @@ -123,6 +122,21 @@ PSRC=$(addsuffix .cpp,$(BIN)) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU + +ifneq ($(ACE_HAS_GNUG_PRE_2_8),1) + ifeq ($(LYNXTARGET),) + BIN += CDR_Array_Test + BUILD += CDR_Array_Test + else + #### LynxOS: but only with 3.1.0 or later. (Pre-3.0.0 has + #### ACE_GNUG_PRE_2_8 == 1.) + ifneq ($(VERSION),3.0.0) + BIN += CDR_Array_Test + BUILD += CDR_Array_Test + endif # > 3.0.0 + endif +endif + include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU |