diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-07-13 03:25:13 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-07-13 03:25:13 +0000 |
| commit | dd2566a3d84a18d4edb3fd83bc9542c4c5a7c7f7 (patch) | |
| tree | 4d992d246af574059c8727764fce607839a0a686 | |
| parent | a853862e2b636caafe374884d084343188c5aa50 (diff) | |
| download | ATCD-dd2566a3d84a18d4edb3fd83bc9542c4c5a7c7f7.tar.gz | |
ChangeLogTag:Thu Jul 12 20:21:36 2001 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 10 | ||||
| -rw-r--r-- | TAO/docs/tutorials/Quoter/Makefile | 34 | ||||
| -rw-r--r-- | TAO/docs/tutorials/Quoter/Simple/Makefile | 25 |
3 files changed, 52 insertions, 17 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index a53710464b4..9656a690b9f 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,13 @@ +Thu Jul 12 20:21:36 2001 Ossama Othman <ossama@uci.edu> + + * docs/tutorials/Quoter/Makefile (DIRS): + * docs/tutorials/Quoter/Simple/Makefile (DIRS): + + Do not build certain directories if AMI is disabled or if + Minimum CORBA is enabled. Some tutorials require AMI, or + features that are not available in the minimum CORBA + configuration. + Thu Jul 12 19:45:06 2001 Ossama Othman <ossama@uci.edu> * orbsvcs/Naming_Service/NT_Naming_Server.cpp (ConsoleHandler): diff --git a/TAO/docs/tutorials/Quoter/Makefile b/TAO/docs/tutorials/Quoter/Makefile index 65d588a4456..ebad8067f5f 100644 --- a/TAO/docs/tutorials/Quoter/Makefile +++ b/TAO/docs/tutorials/Quoter/Makefile @@ -24,13 +24,29 @@ include $(ACE_ROOT)/include/makeinclude/macros.GNU ifeq ($(exceptions),1) -DIRS = idl \ - Simple \ - AMI \ - Naming_Service \ - On_Demand_Activation \ - Event_Service \ - RT_Event_Service +DIRS = \ + idl \ + Simple \ + Naming_Service + + # The AMI and On_Demand_Activation tutorials both require AMI support. + ifeq ($(ami),1) + DIRS += \ + AMI + endif # ami + + # Event_Service, RT_Event_Service directories require the + # PortableServer::POA::ImplicitActivationPolicy, which is not in + # available in the minimum CORBA configuration. + # + # On_Demand_Activation requires ServantLocators and AMI, neither of + # which is available in the minimum CORBA configuration. + ifeq ($(minimum_corba),0) + DIRS += \ + On_Demand_Activation \ + Event_Service \ + RT_Event_Service + endif # minimum_corba include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU @@ -39,8 +55,8 @@ else $(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" + @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 diff --git a/TAO/docs/tutorials/Quoter/Simple/Makefile b/TAO/docs/tutorials/Quoter/Simple/Makefile index b713eec016e..c1705b5b7ec 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Makefile +++ b/TAO/docs/tutorials/Quoter/Simple/Makefile @@ -10,11 +10,23 @@ # Local macros #---------------------------------------------------------------------------- -DIRS = Client \ - Server \ - ImprovedServer \ - Persistent \ - Impl-Repo +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(TAO_ROOT)/rules.tao.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU + +DIRS = \ + Client \ + Server \ + Persistent \ + Impl-Repo + + # ImprovedServer directory requires the + # PortableServer::POA::ImplicitActivationPolicy, which is not in + # available in the minimum CORBA configuration. + ifeq ($(minimum_corba),0) + DIRS += \ + ImprovedServer + endif # minimum_corba ifndef TAO_ROOT @@ -25,9 +37,6 @@ endif # Include macros and targets #---------------------------------------------------------------------------- -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(TAO_ROOT)/rules.tao.GNU -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 |