summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-05-14 19:31:55 +0000
committermk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-05-14 19:31:55 +0000
commitdce805c482a372ac94d90dec333133e2c10e87fe (patch)
tree2099b2c7bee17d9cfcdbb830c2c3f75bbabc7e51
parent6dd40e7a923066c0c25c2fb37e61d1e1d87b4af0 (diff)
downloadATCD-dce805c482a372ac94d90dec333133e2c10e87fe.tar.gz
Thu May 14 14:34:40 1998 Michael Kircher <mk1@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog-98c5
-rw-r--r--TAO/orbsvcs/orbsvcs/Makefile9
2 files changed, 7 insertions, 7 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 3b21f60e572..be6937024fd 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,8 @@
+Thu May 14 14:34:40 1998 Michael Kircher <mk1@cs.wustl.edu>
+
+ * orbsvcs/orbsvcs/Makefile: CosLifeCycle is now compiled
+ by default.
+
Thu May 14 14:10:40 1998 Michael Kircher <mk1@cs.wustl.edu>
* tests/Quoter/{Factory_Trader.cpp, Factory_Trader.h
diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile
index d29cd5e56d6..265b6857b8a 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile
+++ b/TAO/orbsvcs/orbsvcs/Makefile
@@ -20,6 +20,8 @@ TAO_IDLFLAGS = -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_ex
IDL_FILES = \
CosNamingC \
CosNamingS \
+ CosLifeCycleC \
+ CosLifeCycleS \
CosConcurrencyControlC\
CosConcurrencyControlS\
CosTimeBaseC \
@@ -45,13 +47,6 @@ IDL_FILES += \
Null_MediaCtrlC
endif
-# Lifecycle Service stuff
-ifdef lifecycle
-IDL_FILES += \
- CosLifeCycleS \
- CosLifeCycleC
-endif # lifecycle
-
ifdef trader
IDL_FILES += \