diff options
| author | fhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-06-19 15:15:25 +0000 |
|---|---|---|
| committer | fhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-06-19 15:15:25 +0000 |
| commit | fb7de2aaed5a3369c258bebab9f91c70c171ad9b (patch) | |
| tree | 3874fe81d362dac7329308d883dba3a4d0878f89 | |
| parent | e9bbe74d836ff80d764c457d524d44bcda42e065 (diff) | |
| download | ATCD-fb7de2aaed5a3369c258bebab9f91c70c171ad9b.tar.gz | |
ChangeLogTag: Tue Jun 19 09:46:30 2001 Frank Hunleth <fhunleth@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 14 | ||||
| -rw-r--r-- | TAO/tests/Exposed_Policies/Makefile | 7 |
2 files changed, 17 insertions, 4 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 58e3adeface..b0126b54709 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Tue Jun 19 09:46:30 2001 Frank Hunleth <fhunleth@cs.wustl.edu> + + * tests/Exposed_Policies/Makefile: + + Added guards to Makefile to prevent compilation on + minimum CORBA builds, since this test uses both + RTCORBA and Messaging features. + Tue Jun 19 07:26:59 2001 Chad Elliott <elliott_c@ociweb.com> * docs/tutorials/Quoter/AMI/Stock_i.h: @@ -41,7 +49,7 @@ Mon Jun 18 20:32:07 2001 Balachandran Natarajan <bala@cs.wustl.edu> have this test in the daily builds. * tests/Makefile: Added the above test to the Makefile. - + Mon Jun 18 18:58:00 2001 Craig Rodrigues <crodrigu@bbn.com> * tests/ior_corbaloc/run_test.pl: @@ -51,9 +59,9 @@ Mon Jun 18 18:58:00 2001 Craig Rodrigues <crodrigu@bbn.com> Mon Jun 18 13:01:32 2001 Frank Hunleth <fhunleth@cs.wustl.edu> * tao/Policy_Set.cpp: - + Fixed compile error on Tru64. Thanks to Kitty for - reporting the problem. + reporting the problem. Mon Jun 18 11:32:48 2001 Nanbor Wang <nanbor@cs.wustl.edu> diff --git a/TAO/tests/Exposed_Policies/Makefile b/TAO/tests/Exposed_Policies/Makefile index db949819880..4f8b3b92e1a 100644 --- a/TAO/tests/Exposed_Policies/Makefile +++ b/TAO/tests/Exposed_Policies/Makefile @@ -21,7 +21,7 @@ IDL_SRC = CounterC.cpp CounterS.cpp MISC_TEST_SRC = Policy_Tester Policy_Verifier RT_Properties CLIENT_SRC = client $(MISC_TEST_SRC) SERVER_SRC = server $(MISC_TEST_SRC) -BIN = client server +BIN_UNCHECKED = client server SRC = $(addsuffix .cpp, $(MISC_TEST_SRC) $(BIN)) @@ -38,6 +38,11 @@ TAO_IDLFLAGS += -Ge 1 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU + +ifeq ($(rt_corba),1) +BIN=$(BIN_UNCHECKED) +endif # rt_corba + include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU |