summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-04-14 15:18:43 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-04-14 15:18:43 +0000
commit43277dfb9e7e7455d8b6f369c71f3f4c56634386 (patch)
tree50217a1435d335c5e95216ab23824aa561bbb1b9
parent5f8434c76b6193e02040d92471e2b73cb79e6fec (diff)
downloadATCD-43277dfb9e7e7455d8b6f369c71f3f4c56634386.tar.gz
Fri Apr 14 08:16:02 2000 Carlos O'Ryan <coryan@uci.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a7
-rw-r--r--TAO/orbsvcs/orbsvcs/Makefile.CosEvent3
-rw-r--r--TAO/orbsvcs/orbsvcs/Makefile.RTEvent2
3 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 701900a6777..38c13497277 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Fri Apr 14 08:16:02 2000 Carlos O'Ryan <coryan@uci.edu>
+
+ * orbsvcs/orbsvcs/Makefile.CosEvent:
+ * orbsvcs/orbsvcs/Makefile.RTEvent:
+ The DU C++ compiler needs to have the templates in a directory
+ accessible through the -I flags.
+
Fri Apr 14 09:12:24 2000 David L. Levine <levine@cs.wustl.edu>
* orbsvcs/orbsvcs/Makefile: don't build LifeCycle Service with
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosEvent b/TAO/orbsvcs/orbsvcs/Makefile.CosEvent
index 1c55db3cbb0..09ddbd406ee 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.CosEvent
+++ b/TAO/orbsvcs/orbsvcs/Makefile.CosEvent
@@ -82,7 +82,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
#----------------------------------------------------------------------------
LDFLAGS += -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/orbsvcs
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/Event
+CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs/ESF
.PRECIOUS: $(foreach file, $(IDL_SRCS), $(foreach ext, $(IDL_EXT), $(file)$(ext))))
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTEvent b/TAO/orbsvcs/orbsvcs/Makefile.RTEvent
index a8a630613ae..ac5cbda8e5f 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.RTEvent
+++ b/TAO/orbsvcs/orbsvcs/Makefile.RTEvent
@@ -121,7 +121,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
LDFLAGS += -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/orbsvcs
CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
- -I$(TAO_ROOT)/orbsvcs/orbsvcs/Event
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs/ESF
#
# Extra dependencies not caught by make depend.