ChangeLogTag:Tue Jul 11 14:51:13 2000 Chris Kohlhoff <chris@kohlhoff.com>

19 files changed, 151 insertions, 3 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index a852222e77e..6ccaab24978 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Tue Jul 11 14:51:13 2000  Chris Kohlhoff <chris@kohlhoff.com>
+
+	* orbsvcs/orbsvcs/*.bor:
+	* tao/Makefile.bor:
+	  Added support for 'make install'.
+
+	* orbsvcs/IFR_Service/*.bor:
+	  Added makefiles for the interface repository service.
+
 Tue Jul 11 13:39:35 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
 	* TAO_IDL/be/be_union.cpp:
@@ -54,12 +63,12 @@ Tue Jul 11 11:51:42 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 	* TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ci.cpp:
 
 	  Added #if defined (_FOO__CI_) guards to the object constructor
-	  from stub, since it is generated at the forward declaration and 
+	  from stub, since it is generated at the forward declaration and
 	  at the definition.
 
 	* TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
 
-	  In _unchecked_narrow(), when the proxy is created with 
+	  In _unchecked_narrow(), when the proxy is created with
 	  ACE_NEW_RETURN, changed the proxy constructor to use the
 	  fully scoped class name. In certain cases of reopened modules,
 	  some compilers were having problems with the name that the
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.bor b/TAO/orbsvcs/IFR_Service/IFR_Service.bor
new file mode 100644
index 00000000000..66e144dec73
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.bor
@@ -0,0 +1,65 @@
+#
+# Makefile for building the IFR Service executable
+# 
+
+NAME = IFR_Service
+
+OBJFILES = \
+	$(OBJDIR)\AliasDef_i.obj \
+	$(OBJDIR)\ArrayDef_i.obj \
+	$(OBJDIR)\AttributeDef_i.obj \
+	$(OBJDIR)\ComponentDef_i.obj \
+	$(OBJDIR)\ComponentRepository_i.obj \
+	$(OBJDIR)\ConstantDef_i.obj \
+	$(OBJDIR)\ConsumesDef_i.obj \
+	$(OBJDIR)\Contained_i.obj \
+	$(OBJDIR)\Container_i.obj \
+	$(OBJDIR)\EmitsDef_i.obj \
+	$(OBJDIR)\EnumDef_i.obj \
+	$(OBJDIR)\EventDef_i.obj \
+	$(OBJDIR)\ExceptionDef_i.obj \
+	$(OBJDIR)\FactoryDef_i.obj \
+	$(OBJDIR)\FinderDef_i.obj \
+	$(OBJDIR)\FixedDef_i.obj \
+	$(OBJDIR)\HomeDef_i.obj \
+	$(OBJDIR)\IDLType_i.obj \
+	$(OBJDIR)\IFR_Server.obj \
+	$(OBJDIR)\IFR_Service.obj \
+	$(OBJDIR)\InterfaceDef_i.obj \
+	$(OBJDIR)\InterfaceS.obj \
+	$(OBJDIR)\IRObject_i.obj \
+	$(OBJDIR)\ModuleDef_i.obj \
+	$(OBJDIR)\NativeDef_i.obj \
+	$(OBJDIR)\OperationDef_i.obj \
+	$(OBJDIR)\Options.obj \
+	$(OBJDIR)\PrimaryKeyDef_i.obj \
+	$(OBJDIR)\PrimitiveDef_i.obj \
+	$(OBJDIR)\ProvidesDef_i.obj \
+	$(OBJDIR)\PublishesDef_i.obj \
+	$(OBJDIR)\Repository_i.obj \
+	$(OBJDIR)\SequenceDef_i.obj \
+	$(OBJDIR)\Servant_Factory.obj \
+	$(OBJDIR)\Servant_Locator.obj \
+	$(OBJDIR)\StringDef_i.obj \
+	$(OBJDIR)\StructDef_i.obj \
+	$(OBJDIR)\tmplinst.obj \
+	$(OBJDIR)\TypedefDef_i.obj \
+	$(OBJDIR)\UnionDef_i.obj \
+	$(OBJDIR)\UsesDef_i.obj \
+	$(OBJDIR)\ValueBoxDef_i.obj \
+	$(OBJDIR)\ValueDef_i.obj \
+	$(OBJDIR)\ValueMemberDef_i.obj \
+	$(OBJDIR)\WstringDef_i.obj
+
+!ifdef STATIC
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SVC_UTILS_CFLAGS) -DTCF_HAS_DLL=0
+!else
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SVC_UTILS_CFLAGS) -DTCF_HAS_DLL=1
+!endif
+        
+LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_SVC_UTILS_LIB)
+
+CPPDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
+
diff --git a/TAO/orbsvcs/IFR_Service/Makefile.bor b/TAO/orbsvcs/IFR_Service/Makefile.bor
new file mode 100644
index 00000000000..586eecd08e9
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/Makefile.bor
@@ -0,0 +1,7 @@
+#
+# Makefile for building the IFR Service executable and library
+#
+
+MAKEFILES = TypeCodeFactory_DLL.bor IFR_Service.bor
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/IFR_Service/TypeCodeFactory_DLL.bor b/TAO/orbsvcs/IFR_Service/TypeCodeFactory_DLL.bor
new file mode 100644
index 00000000000..20d6d3ec7e9
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/TypeCodeFactory_DLL.bor
@@ -0,0 +1,22 @@
+#
+# Makefile for building the TypeCodeFactory_DLL library
+#
+
+NAME = TypeCodeFactory_DLL
+
+OBJFILES = \
+	$(OBJDIR)\TypeCodeFactory_skel.obj \
+	$(OBJDIR)\TypeCodeFactory_i.obj \
+	$(OBJDIR)\TCF_Loader.obj
+
+!ifdef STATIC
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) -DTCF_HAS_DLL=0
+!else
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) -DTCF_HAS_DLL=1 -DTCF_BUILD_DLL
+!endif
+
+CPPDIR = .
+
+LIBFILES = $(ACE_LIB) $(TAO_LIB)
+
+!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/orbsvcs/orbsvcs/AV.bor b/TAO/orbsvcs/orbsvcs/AV.bor
index 1e4d7bea6e3..fa709a38500 100644
--- a/TAO/orbsvcs/orbsvcs/AV.bor
+++ b/TAO/orbsvcs/orbsvcs/AV.bor
@@ -50,6 +50,9 @@ CPPDIR = .;AV
 
 IDLDIR = .
 
+INCDIR_NAME = orbsvcs\AV
+INCLUDES = AV\*.h AV\*.i AV\*_T.cpp
+
 LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_NAMING_LIB) $(TAO_PROPERTY_LIB)
 
 all: idl_src_files av_lib
@@ -72,4 +75,4 @@ $(IDLDIR)\Null_MediaCtrlC.cpp $(IDLDIR)\Null_MediaCtrlS.cpp: $(IDLDIR)\Null_Medi
 	$(TAO_IDL) $**
 
 $(IDLDIR)\sfpC.cpp $(IDLDIR)\sfpS.cpp: $(IDLDIR)\sfp.idl
-	$(TAO_IDL) $**
+       @$(TAO_IDL) $**
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.bor b/TAO/orbsvcs/orbsvcs/CosConcurrency.bor
index 1666e12d98e..61f48d37c1d 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrency.bor
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.bor
@@ -32,6 +32,9 @@ CPPDIR = .;Concurrency
 
 IDLDIR = .
 
+INCDIR_NAME = orbsvcs\Concurrency
+INCLUDES = Concurrency\*.h
+
 LIBFILES = $(ACE_LIB) $(TAO_LIB)
 
 all: idl_src_files concurrency_lib
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.bor b/TAO/orbsvcs/orbsvcs/CosEvent.bor
index 50622c242f3..ca682699d13 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.bor
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.bor
@@ -58,6 +58,9 @@ CPPDIR = .;CosEvent
 
 IDLDIR = .
 
+INCDIR_NAME = orbsvcs\CosEvent
+INCLUDES = CosEvent\*.h CosEvent\*.i
+
 LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_SVC_UTILS_LIB) $(TAO_RTSCHED_LIB) \
   $(TAO_RTEVENT_LIB)
 
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.bor b/TAO/orbsvcs/orbsvcs/CosLifeCycle.bor
index 7cfbfeb6b61..0a58854cf75 100644
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.bor
+++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.bor
@@ -33,6 +33,9 @@ CPPDIR = .;LifeCycle
 
 IDLDIR = .
 
+INCDIR_NAME = orbsvcs\LifeCycle
+INCLUDES = LifeCycle\*.h
+
 LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_NAMING_LIB)
 
 all: idl_src_files lifecycle_lib
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.bor b/TAO/orbsvcs/orbsvcs/CosNaming.bor
index b75ce9dee9c..6c32c836405 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.bor
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.bor
@@ -36,6 +36,9 @@ CPPDIR = .;Naming
 
 IDLDIR = .
 
+INCDIR_NAME = orbsvcs\Naming
+INCLUDES = Naming\*.h Naming\*_T.cpp
+
 LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_SVC_UTILS_LIB)
 
 all: idl_src_files naming_lib
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.bor b/TAO/orbsvcs/orbsvcs/CosNotification.bor
index 8bba40221e2..92ef396f3e0 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.bor
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.bor
@@ -59,6 +59,9 @@ CPPDIR = .;Notify
 
 IDLDIR = .
 
+INCDIR_NAME = orbsvcs\Notify
+INCLUDES = Notify\*.h Notify\*.i Notify\*_T.cpp
+
 LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_SVC_UTILS_LIB) $(TAO_EVENT_LIB) \
 	$(TAO_TRADING_LIB)
 
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.bor b/TAO/orbsvcs/orbsvcs/CosProperty.bor
index e63400f64df..6bea96402eb 100644
--- a/TAO/orbsvcs/orbsvcs/CosProperty.bor
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.bor
@@ -29,6 +29,9 @@ CPPDIR = .;Property
 
 IDLDIR = .
 
+INCDIR_NAME = orbsvcs\Property
+INCLUDES = Property\*.h
+
 LIBFILES = $(ACE_LIB) $(TAO_LIB)
 
 all: idl_src_files property_lib
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.bor b/TAO/orbsvcs/orbsvcs/CosTime.bor
index 7a84e023fb6..f77e40d8317 100644
--- a/TAO/orbsvcs/orbsvcs/CosTime.bor
+++ b/TAO/orbsvcs/orbsvcs/CosTime.bor
@@ -33,6 +33,9 @@ CPPDIR = .;Time
 
 IDLDIR = .
 
+INCDIR_NAME = orbsvcs\Time
+INCLUDES = Time\*.h
+
 LIBFILES = $(ACE_LIB) $(TAO_LIB)
 
 all: idl_src_files time_lib
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.bor b/TAO/orbsvcs/orbsvcs/CosTrading.bor
index 8d10b9f83ba..959b34f9cbe 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.bor
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.bor
@@ -50,6 +50,9 @@ CPPDIR = .;Trader
 
 IDLDIR = .
 
+INCDIR_NAME = orbsvcs\Trader
+INCLUDES = Trader\*.h Trader\*_T.cpp
+
 LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_SVC_UTILS_LIB) $(TAO_NAMING_LIB)
 
 all: idl_src_files trading_lib
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor b/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor
index 970bd2292bb..e4487538359 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor
@@ -38,6 +38,9 @@ CPPDIR = .;Log
 
 IDLDIR = .
 
+INCDIR_NAME = orbsvcs\Log
+INCLUDES = Log\*.h
+
 LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_SVC_UTILS_LIB) $(TAO_TRADING_LIB)
 
 all: idl_src_files log_lib
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing.bor b/TAO/orbsvcs/orbsvcs/LoadBalancing.bor
index 61ab9645e96..354648dcc74 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing.bor
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing.bor
@@ -36,6 +36,9 @@ CPPDIR = .;LoadBalancing
 
 IDLDIR = .
 
+INCDIR_NAME = orbsvcs\LoadBalancing
+INCLUDES = LoadBalancing\*.h LoadBalancing\*.i
+
 LIBFILES = $(ACE_LIB) $(TAO_LIB)
 
 all: idl_src_files loadbalancing_lib
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.bor b/TAO/orbsvcs/orbsvcs/RTEvent.bor
index 115fe65e695..1890b119323 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent.bor
+++ b/TAO/orbsvcs/orbsvcs/RTEvent.bor
@@ -83,6 +83,9 @@ CPPDIR = .;Event
 
 IDLDIR = .
 
+INCDIR_NAME = orbsvcs\Event
+INCLUDES = Event\*.h Event\*.i
+
 LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_SVC_UTILS_LIB) $(TAO_NAMING_LIB) \
 	$(TAO_RTSCHED_LIB)
 
diff --git a/TAO/orbsvcs/orbsvcs/RTSched.bor b/TAO/orbsvcs/orbsvcs/RTSched.bor
index 76e022459a2..772f43e6b51 100644
--- a/TAO/orbsvcs/orbsvcs/RTSched.bor
+++ b/TAO/orbsvcs/orbsvcs/RTSched.bor
@@ -41,6 +41,9 @@ CPPDIR = .;Sched
 
 IDLDIR = .
 
+INCDIR_NAME = orbsvcs\Sched
+INCLUDES = Sched\*.h Sched\*.i Sched\*_T.cpp
+
 LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_SVC_UTILS_LIB) $(TAO_NAMING_LIB)
 
 all: idl_src_files rtsched_lib
diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.bor b/TAO/orbsvcs/orbsvcs/Svc_Utils.bor
index 86d5d8bc43c..17ca67181ca 100644
--- a/TAO/orbsvcs/orbsvcs/Svc_Utils.bor
+++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.bor
@@ -33,6 +33,9 @@ CPPDIR = .
 
 IDLDIR = .
 
+INCDIR_NAME = orbsvcs
+INCLUDES = *.h *.i *_T.cpp
+
 LIBFILES = $(ACE_LIB) $(TAO_LIB)
 
 all: idl_src_files svc_utils_lib
diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor
index f0c48f83b3a..bffcd2a4d13 100644
--- a/TAO/tao/Makefile.bor
+++ b/TAO/tao/Makefile.bor
@@ -181,6 +181,9 @@ CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) -DTAO_BUILD_DLL
 
 CPPDIR = .
 
+INCDIR_NAME = tao
+INCLUDES = *.h *.i *_T.cpp
+
 LIBFILES = $(ACE_LIB)
 
 !include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>