ChangeLogTag:Sat Apr 15 19:35:57 2000 Darrell Brunsch <brunsch@uci.edu>

5 files changed, 42 insertions, 18 deletions

diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h
index 81d817935df..0866c3214e8 100644
--- a/ace/Basic_Types.h
+++ b/ace/Basic_Types.h
@@ -46,6 +46,7 @@
 
 #ifndef ACE_BASIC_TYPES_H
 # define ACE_BASIC_TYPES_H
+# include "ace/pre.h"
 
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
 #   pragma once
@@ -536,4 +537,5 @@ typedef ACE_UINT16 ACE_USHORT16;
 #   include "ace/Basic_Types.i"
 # endif /* __ACE_INLINE__ */
 
+# include "ace/post.h"
 #endif /* ACE_BASIC_TYPES_H */
diff --git a/ace/Makefile.bor b/ace/Makefile.bor
index 76f4f35879e..6e32bfe3ae6 100644
--- a/ace/Makefile.bor
+++ b/ace/Makefile.bor
@@ -100,6 +100,7 @@ OBJFILES = \
 	$(OBJDIR)\Process.obj \
 	$(OBJDIR)\Process_Manager.obj \
 	$(OBJDIR)\Profile_Timer.obj \
+	$(OBJDIR)\QoS_Manager.obj \
 	$(OBJDIR)\QoS_Session_Factory.obj \
 	$(OBJDIR)\QoS_Session_Impl.obj \
 	$(OBJDIR)\Reactor.obj \
diff --git a/ace/Timer_Queue_Adapters.h b/ace/Timer_Queue_Adapters.h
index c19081646f3..c908e4d1391 100644
--- a/ace/Timer_Queue_Adapters.h
+++ b/ace/Timer_Queue_Adapters.h
@@ -16,6 +16,7 @@
 
 #ifndef ACE_TIMER_QUEUE_ADAPTERS_H
 # define ACE_TIMER_QUEUE_ADAPTERS_H
+# include "ace/pre.h"
 
 # include "ace/Task.h"
 
@@ -211,4 +212,5 @@ private:
 #  pragma implementation ("Timer_Queue_Adapters.cpp")
 # endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+# include "ace/post.h"
 #endif /* ACE_TIMER_QUEUE_ADAPTERS_H */
diff --git a/include/makeinclude/ace_flags.bor b/include/makeinclude/ace_flags.bor
index 1a5f061fe48..69522354058 100644
--- a/include/makeinclude/ace_flags.bor
+++ b/include/makeinclude/ace_flags.bor
@@ -3,28 +3,47 @@
 # with Borland C++Builder
 #
 
-#
-# Compiler flags
-#
 !ifdef STATIC
-ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=0
-TAO_BUILD_CFLAGS =
-TAO_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_HAS_DLL=0
-ORBSVCS_BUILD_CFLAGS =
-ORBSVCS_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_ORBSVCS_HAS_DLL=0
+DLL_FLAG=0
 !else
-ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=1
-TAO_BUILD_CFLAGS = -DTAO_BUILD_DLL
-TAO_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_HAS_DLL=1
-ORBSVCS_BUILD_CFLAGS = -DTAO_ORBSVCS_BUILD_DLL=1
-ORBSVCS_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_ORBSVCS_HAS_DLL=1
+DLL_FLAG=1
 !endif
 
 #
+# Compiler flags
+#
+ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG)
+TAO_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_HAS_DLL=$(DLL_FLAG)
+TAO_SVC_UTILS_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_SVC_UTILS_HAS_DLL=$(DLL_FLAG)
+TAO_AV_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_AV_HAS_DLL=$(DLL_FLAG)
+TAO_CONCURRENCY_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_CONCURRENCY_HAS_DLL=$(DLL_FLAG)
+TAO_EVENT_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_EVENT_HAS_DLL=$(DLL_FLAG)
+TAO_LIFECYCLE_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_LIFECYCLE_HAS_DLL=$(DLL_FLAG)
+TAO_LOG_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_LOG_HAS_DLL=$(DLL_FLAG)
+TAO_NAMING_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_NAMING_HAS_DLL=$(DLL_FLAG)
+TAO_NOTIFY_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_NOTIFY_HAS_DLL=$(DLL_FLAG)
+TAO_PROPERTY_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_PROPERTY_HAS_DLL=$(DLL_FLAG)
+TAO_RTEVENT_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_RTEVENT_HAS_DLL=$(DLL_FLAG)
+TAO_RTSCHED_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_RTSCHED_HAS_DLL=$(DLL_FLAG)
+TAO_TIME_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_TIME_HAS_DLL=$(DLL_FLAG)
+TAO_TRADING_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_TRADING_HAS_DLL=$(DLL_FLAG)
+
+#
 # Libraries
 #
 ACE_LIB = $(CORE_BINDIR)\ace$(LIB_DECORATOR).lib
 NETSVCS_LIB = $(CORE_BINDIR)\netsvcs$(LIB_DECORATOR).lib
-TAO_LIB = $(CORE_BINDIR)\tao$(LIB_DECORATOR).lib
-ORBSVCS_LIB = $(CORE_BINDIR)\orbsvcs$(LIB_DECORATOR).lib
-
+TAO_LIB = $(CORE_BINDIR)\TAO$(LIB_DECORATOR).lib
+TAO_SVC_UTILS_LIB = $(CORE_BINDIR)\TAO_Svc_Utils$(LIB_DECORATOR).lib
+TAO_AV_LIB = $(CORE_BINDIR)\TAO_AV$(LIB_DECORATOR).lib
+TAO_CONCURRENCY_LIB = $(CORE_BINDIR)\TAO_CosConcurrency$(LIB_DECORATOR).lib
+TAO_EVENT_LIB = $(CORE_BINDIR)\TAO_CosEvent$(LIB_DECORATOR).lib
+TAO_LIFECYCLE_LIB = $(CORE_BINDIR)\TAO_CosLifeCycle$(LIB_DECORATOR).lib
+TAO_LOG_LIB = $(CORE_BINDIR)\TAO_DsLogAdmin$(LIB_DECORATOR).lib
+TAO_NAMING_LIB = $(CORE_BINDIR)\TAO_CosNaming$(LIB_DECORATOR).lib
+TAO_NOTIFY_LIB = $(CORE_BINDIR)\TAO_CosNotification$(LIB_DECORATOR).lib
+TAO_PROPERTY_LIB = $(CORE_BINDIR)\TAO_CosProperty$(LIB_DECORATOR).lib
+TAO_RTEVENT_LIB = $(CORE_BINDIR)\TAO_RTEvent$(LIB_DECORATOR).lib
+TAO_RTSCHED_LIB = $(CORE_BINDIR)\TAO_RTSched$(LIB_DECORATOR).lib
+TAO_TIME_LIB = $(CORE_BINDIR)\TAO_CosTime$(LIB_DECORATOR).lib
+TAO_TRADING_LIB = $(CORE_BINDIR)\TAO_CosTrading$(LIB_DECORATOR).lib
diff --git a/include/makeinclude/build_example.bor b/include/makeinclude/build_example.bor
index f13206e186d..ca694366c70 100644
--- a/include/makeinclude/build_example.bor
+++ b/include/makeinclude/build_example.bor
@@ -4,9 +4,9 @@
 
 TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
 
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(ORBSVCS_CFLAGS)
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_NAMING_CFLAGS)
 
-LIBFILES = $(ACE_LIB) $(TAO_LIB) $(ORBSVCS_LIB)
+LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_NAMING_LIB)
 
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>