diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-28 03:35:14 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-28 03:35:14 +0000 |
| commit | 2433c8452fa91e69de386e1a82bc719edbe8c54b (patch) | |
| tree | 610c43ae619f604d18aedf308fc000f95bb7a1e7 | |
| parent | b61ca1c497bdd22453bf6177601e376094ab5c1d (diff) | |
| download | ATCD-2433c8452fa91e69de386e1a82bc719edbe8c54b.tar.gz | |
ChangeLogTag:Tue Mar 27 19:33:57 2001 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | TAO/Makefile | 6 | ||||
| -rw-r--r-- | TAO/docs/tutorials/Quoter/Makefile | 9 |
3 files changed, 17 insertions, 5 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 00792009c12..3cbb6caa9e9 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Tue Mar 27 19:33:57 2001 Carlos O'Ryan <coryan@uci.edu> + + * Makefile: + * docs/tutorials/Quoter/Makefile: + Add the Quoter tutorial to all the builds that support native + exceptions. + Tue Mar 27 19:27:19 2001 Carlos O'Ryan <coryan@uci.edu> * tests/Client_Leaks/run_test.pl: diff --git a/TAO/Makefile b/TAO/Makefile index 360145f3422..97243e4a061 100644 --- a/TAO/Makefile +++ b/TAO/Makefile @@ -25,7 +25,8 @@ DIRS = tao \ orbsvcs \ examples \ performance-tests \ - utils + utils \ + docs/tutorials/Quoter CLONE = Makefile \ tao \ @@ -34,7 +35,8 @@ CLONE = Makefile \ orbsvcs \ examples \ performance-tests \ - utils + utils \ + docs/tutorials/Quoter #---------------------------------------------------------------------------- # Include macros and targets diff --git a/TAO/docs/tutorials/Quoter/Makefile b/TAO/docs/tutorials/Quoter/Makefile index d9f910b8b67..65d588a4456 100644 --- a/TAO/docs/tutorials/Quoter/Makefile +++ b/TAO/docs/tutorials/Quoter/Makefile @@ -20,6 +20,7 @@ endif include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(TAO_ROOT)/rules.tao.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU ifeq ($(exceptions),1) @@ -31,16 +32,18 @@ DIRS = idl \ Event_Service \ RT_Event_Service -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU else -default: +$(TARGETS_LOCAL): @echo "The Quoter tutorial can only be compiled on platforms with" @echo "native C++ exception support, please read ../../../TAO-INSTALL.html" @echo "You may need to recompile ACE+TAO with exceptions=1" +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU + endif # exceptions + +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU |