summaryrefslogtreecommitdiff
path: root/TAO/examples
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>1999-07-30 02:06:46 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>1999-07-30 02:06:46 +0000
commit087342b1b293089b9b5edca65a0d54b0100cf0b5 (patch)
tree3e2c882684410a82591424b6d095394469cd2b1b /TAO/examples
parent3a393ef3a8e4b8ee5dde4d69d28d61d28986d77b (diff)
downloadATCD-087342b1b293089b9b5edca65a0d54b0100cf0b5.tar.gz
When compiling with minimum CORBA support, disable certain ORB
services, examples and tests that rely on CORBA features that are not supported in the minimum CORBA specification.
Diffstat (limited to 'TAO/examples')
-rw-r--r--TAO/examples/Makefile9
-rw-r--r--TAO/examples/POA/Makefile42
2 files changed, 39 insertions, 12 deletions
diff --git a/TAO/examples/Makefile b/TAO/examples/Makefile
index 73f9ead9771..ffc594c62ef 100644
--- a/TAO/examples/Makefile
+++ b/TAO/examples/Makefile
@@ -13,7 +13,6 @@
DIRS = Callback_Quoter \
POA \
Logging \
- Quoter \
Simple \
Event_Comm \
OBV
@@ -23,6 +22,14 @@ DIRS = Callback_Quoter \
#----------------------------------------------------------------------------
include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+
+ifndef minimum_corba
+
+# No POA forwarding in minimum CORBA
+ DIRS += Quoter
+
+endif # minimum_corba
+
include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
diff --git a/TAO/examples/POA/Makefile b/TAO/examples/POA/Makefile
index 5baca8405f4..a9ed07ed639 100644
--- a/TAO/examples/POA/Makefile
+++ b/TAO/examples/POA/Makefile
@@ -11,19 +11,9 @@
#----------------------------------------------------------------------------
DIRS = Generic_Servant \
- Adapter_Activator \
- DSI \
- Default_Servant \
- Explicit_Activation \
- FindPOA \
- Forwarding \
- Loader \
- NewPOA \
- On_Demand_Activation \
On_Demand_Loading \
RootPOA \
- Reference_Counted_Servant \
- TIE
+ Reference_Counted_Servant
# The following test hasn't been updated yet
# Demux_Test
@@ -35,6 +25,36 @@ DIRS = Generic_Servant \
#----------------------------------------------------------------------------
include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+
+ifndef minimum_corba
+
+# No AdapterActivator in minimum CORBA
+ DIRS += Adapter_Activator
+
+# Some POA policies and NVList unavailable in minimum CORBA
+ DIRS += DSI
+
+# Some POA policies and default servants unavailable in minimum CORBA
+ DIRS += Default_Servant
+
+# Some POA policies unavailable in minimum CORBA
+ DIRS += Explicit_Activation
+
+# No AdapterActivator in minimum CORBA
+ DIRS += FindPOA
+
+# No servant managers in minimum CORBA
+ DIRS += Forwarding
+ DIRS += Loader
+ DIRS += On_Demand_Activation
+
+# Some POA policies unavailable in minimum CORBA
+ DIRS += NewPOA
+ DIRS += TIE
+
+endif # minimum_corba
+
+
include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU