summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-05-01 16:58:33 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-05-01 16:58:33 +0000
commit4a3f497b2a004bbf35d0a36d511222862a5f391b (patch)
tree384ea114f81b57da3e10b5235b7e05459d9a24fe
parentd8e821571d63e5f89b8ba22d5fac1416c3cff089 (diff)
downloadATCD-4a3f497b2a004bbf35d0a36d511222862a5f391b.tar.gz
ChangeLogTag: Tue May 01 11:56:58 2001 Irfan Pyarali <irfan@cs.wustl.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a6
-rw-r--r--TAO/tests/POA/Etherealization/Makefile20
2 files changed, 18 insertions, 8 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index bd838193019..7ccf81c9f00 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Tue May 01 11:56:58 2001 Irfan Pyarali <irfan@cs.wustl.edu>
+
+ * tests/POA/Etherealization/Makefile: This test should only be
+ complied for non-minimum CORBA cases since it uses Servant
+ Managers.
+
Tue May 01 08:50:11 2001 Ossama Othman <ossama@uci.edu>
* tao/GIOP_Message_Generator_Parser.h (write_reply_header):
diff --git a/TAO/tests/POA/Etherealization/Makefile b/TAO/tests/POA/Etherealization/Makefile
index 3ecd5147401..fc6d353c416 100644
--- a/TAO/tests/POA/Etherealization/Makefile
+++ b/TAO/tests/POA/Etherealization/Makefile
@@ -22,22 +22,26 @@ LSRC = $(PROG_SRCS)
SVR_OBJS = testC.o testS.o Etherealization.o
-BIN = Etherealization
+BIN_UNCHECKED = Etherealization
TAO_IDLFLAGS += -Ge 1
+
#----------------------------------------------------------------------------
# Include macros and targets
#----------------------------------------------------------------------------
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
+ifeq ($(minimum_corba),0)
+ BIN = $(BIN_UNCHECKED)
+endif # minimum_corba
+
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
.PRECIOUS: testC.h testC.i testC.cpp testS.h testS.i testS.cpp testS_T.h testS_T.i testS_T.cpp