ChangeLogTag:Fri Sep 8 11:30:56 2000 Christopher Kohlhoff <chris@kohlhoff.com>

10 files changed, 141 insertions, 61 deletions

diff --git a/ChangeLog b/ChangeLog
index 71b01e75e9a..5945fad3dee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,33 @@
+Fri Sep  8 11:30:56 2000  Christopher Kohlhoff <chris@kohlhoff.com>
+
+        * ace/config-win32-borland.h:
+          Added ACE_LACKS_INLINE_ASSEMBLY since the inline CDR assembly
+          does not currently work under BCB. Thanks to
+          Johnny Willemsen <Johnny.Willemsen@meco.nl> for reporting this.
+
+        * ace/Makefile.bor:
+        * include/makeinclude/build_dll.bor:
+        * include/makeinclude/build_exe.bor:
+        * include/makeinclude/build_lib.bor:
+        * netsvcs/clients/Logger/Makefile.bor:
+          Added support for both recursion and a build in the one makefile.
+
+        * include/makeinclude/ace_flags.bor:
+        * include/makeinclude/build_example.bor:
+          Added new libraries for TAO.
+
 Thu Sep 07 18:10:00 2000  Darrell Brunsch  <brunsch@uci.edu>
 
         * ace/config-win32-common.h:
 
-          ACE_HAS_WINSOCK2 is turned on by default for all of Win32.  
-	  Windows 98 and Windows ME should have Winsock2, and NT/2000
-	  also does.  For Windows 95, this requires that Winsock 
-	  library be added or ACE_HAS_WINSOCK2 defined to 0 in 
-	  config.h before including config-win32.h (overriding it).
+          ACE_HAS_WINSOCK2 is turned on by default for all of Win32.
+          Windows 98 and Windows ME should have Winsock2, and NT/2000
+          also does.  For Windows 95, this requires that Winsock
+          library be added or ACE_HAS_WINSOCK2 defined to 0 in
+          config.h before including config-win32.h (overriding it).
 
-	  Thanks to Giovanni Zito <gzito@mbox.thunder.it> for inquiring
-	  about this.
+          Thanks to Giovanni Zito <gzito@mbox.thunder.it> for inquiring
+          about this.
 
 Thu Sep 07 17:21:17 2000  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 71b01e75e9a..5945fad3dee 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,15 +1,33 @@
+Fri Sep  8 11:30:56 2000  Christopher Kohlhoff <chris@kohlhoff.com>
+
+        * ace/config-win32-borland.h:
+          Added ACE_LACKS_INLINE_ASSEMBLY since the inline CDR assembly
+          does not currently work under BCB. Thanks to
+          Johnny Willemsen <Johnny.Willemsen@meco.nl> for reporting this.
+
+        * ace/Makefile.bor:
+        * include/makeinclude/build_dll.bor:
+        * include/makeinclude/build_exe.bor:
+        * include/makeinclude/build_lib.bor:
+        * netsvcs/clients/Logger/Makefile.bor:
+          Added support for both recursion and a build in the one makefile.
+
+        * include/makeinclude/ace_flags.bor:
+        * include/makeinclude/build_example.bor:
+          Added new libraries for TAO.
+
 Thu Sep 07 18:10:00 2000  Darrell Brunsch  <brunsch@uci.edu>
 
         * ace/config-win32-common.h:
 
-          ACE_HAS_WINSOCK2 is turned on by default for all of Win32.  
-	  Windows 98 and Windows ME should have Winsock2, and NT/2000
-	  also does.  For Windows 95, this requires that Winsock 
-	  library be added or ACE_HAS_WINSOCK2 defined to 0 in 
-	  config.h before including config-win32.h (overriding it).
+          ACE_HAS_WINSOCK2 is turned on by default for all of Win32.
+          Windows 98 and Windows ME should have Winsock2, and NT/2000
+          also does.  For Windows 95, this requires that Winsock
+          library be added or ACE_HAS_WINSOCK2 defined to 0 in
+          config.h before including config-win32.h (overriding it).
 
-	  Thanks to Giovanni Zito <gzito@mbox.thunder.it> for inquiring
-	  about this.
+          Thanks to Giovanni Zito <gzito@mbox.thunder.it> for inquiring
+          about this.
 
 Thu Sep 07 17:21:17 2000  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 71b01e75e9a..5945fad3dee 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,15 +1,33 @@
+Fri Sep  8 11:30:56 2000  Christopher Kohlhoff <chris@kohlhoff.com>
+
+        * ace/config-win32-borland.h:
+          Added ACE_LACKS_INLINE_ASSEMBLY since the inline CDR assembly
+          does not currently work under BCB. Thanks to
+          Johnny Willemsen <Johnny.Willemsen@meco.nl> for reporting this.
+
+        * ace/Makefile.bor:
+        * include/makeinclude/build_dll.bor:
+        * include/makeinclude/build_exe.bor:
+        * include/makeinclude/build_lib.bor:
+        * netsvcs/clients/Logger/Makefile.bor:
+          Added support for both recursion and a build in the one makefile.
+
+        * include/makeinclude/ace_flags.bor:
+        * include/makeinclude/build_example.bor:
+          Added new libraries for TAO.
+
 Thu Sep 07 18:10:00 2000  Darrell Brunsch  <brunsch@uci.edu>
 
         * ace/config-win32-common.h:
 
-          ACE_HAS_WINSOCK2 is turned on by default for all of Win32.  
-	  Windows 98 and Windows ME should have Winsock2, and NT/2000
-	  also does.  For Windows 95, this requires that Winsock 
-	  library be added or ACE_HAS_WINSOCK2 defined to 0 in 
-	  config.h before including config-win32.h (overriding it).
+          ACE_HAS_WINSOCK2 is turned on by default for all of Win32.
+          Windows 98 and Windows ME should have Winsock2, and NT/2000
+          also does.  For Windows 95, this requires that Winsock
+          library be added or ACE_HAS_WINSOCK2 defined to 0 in
+          config.h before including config-win32.h (overriding it).
 
-	  Thanks to Giovanni Zito <gzito@mbox.thunder.it> for inquiring
-	  about this.
+          Thanks to Giovanni Zito <gzito@mbox.thunder.it> for inquiring
+          about this.
 
 Thu Sep 07 17:21:17 2000  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/ace/Makefile.bor b/ace/Makefile.bor
index ac5ae95adcd..56ad937b25f 100644
--- a/ace/Makefile.bor
+++ b/ace/Makefile.bor
@@ -5,6 +5,8 @@
 
 NAME = ace
 
+DIRS = SSL
+
 OBJFILES = \
 	$(OBJDIR)\ACE.obj \
 	$(OBJDIR)\Activation_Queue.obj \
@@ -93,16 +95,14 @@ OBJFILES = \
 	$(OBJDIR)\Object_Manager.obj \
 	$(OBJDIR)\Obstack.obj \
 	$(OBJDIR)\OS.obj \
-        $(OBJDIR)\OS_Dirent.obj \
-        $(OBJDIR)\OS_Memory.obj \
-        $(OBJDIR)\OS_String.obj \
-        $(OBJDIR)\OS_TLI.obj \
-        $(OBJDIR)\Thread_Hook.obj \
-        $(OBJDIR)\Base_Thread_Adapter.obj \
-        $(OBJDIR)\OS_Thread_Adapter.obj \
-        $(OBJDIR)\Thread_Adapter.obj \
-        $(OBJDIR)\Thread_Exit.obj \
-        $(OBJDIR)\Thread_Control.obj \
+	$(OBJDIR)\OS_Dirent.obj \
+	$(OBJDIR)\OS_Memory.obj \
+	$(OBJDIR)\OS_String.obj \
+	$(OBJDIR)\OS_TLI.obj \
+	$(OBJDIR)\Thread_Hook.obj \
+	$(OBJDIR)\Thread_Adapter.obj \
+	$(OBJDIR)\Thread_Exit.obj \
+	$(OBJDIR)\Thread_Control.obj \
 	$(OBJDIR)\Pair.obj \
 	$(OBJDIR)\Parse_Node.obj \
 	$(OBJDIR)\Pipe.obj \
@@ -229,3 +229,4 @@ INCLUDES = \
 	Typed_SV_Message_Queue.cpp
 
 !include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h
index 2ad564f6e33..14d616a3721 100644
--- a/ace/config-win32-borland.h
+++ b/ace/config-win32-borland.h
@@ -3,25 +3,25 @@
 
 // The following configuration file contains defines for Borland compilers.
 
-#ifndef	ACE_WIN32_BORLAND_H
-#define	ACE_WIN32_BORLAND_H
+#ifndef ACE_WIN32_BORLAND_H
+#define ACE_WIN32_BORLAND_H
 #include "ace/pre.h"
 
 #if defined (__BORLANDC__)
 
 # if (__BORLANDC__ == 0x540)
-// The linker in C++Builder 4 has trouble with the large number	of DLL
+// The linker in C++Builder 4 has trouble with the large number of DLL
 // function exports created when you compile without inline
-// functions. Therefore	we will	use inline functions by	default	with
-// this	version	of the compiler.
-#  if !	defined	(__ACE_INLINE__)
+// functions. Therefore we will use inline functions by default with
+// this version of the compiler.
+#  if ! defined (__ACE_INLINE__)
 #   define __ACE_INLINE__ 1
 #  endif /* __ACE_INLINE__ */
-# endif	/* __BORLANDC__	== 0x540 */
+# endif /* __BORLANDC__ == 0x540 */
 
 # include "ace/config-win32-common.h"
 
-# define ACE_CC_NAME ACE_TEXT ("Borland	C++ Builder")
+# define ACE_CC_NAME ACE_TEXT ("Borland C++ Builder")
 # define ACE_CC_MAJOR_VERSION (__BORLANDC__ / 0x100)
 # define ACE_CC_MINOR_VERSION (__BORLANDC__ % 0x100)
 # define ACE_CC_BETA_VERSION (0)
@@ -54,7 +54,8 @@
 # define ACE_HAS_TYPENAME_KEYWORD 1
 # define ACE_HAS_USER_MODE_MASKS 1
 # define ACE_HAS_USING_KEYWORD 1
-# define ACE_LACKS_ACE_IOSTREAM	1
+# define ACE_LACKS_ACE_IOSTREAM 1
+# define ACE_LACKS_INLINE_ASSEMBLY 1
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
 # define ACE_LACKS_MODE_MASKS 1
 # define ACE_LACKS_NATIVE_STRPTIME 1
@@ -62,15 +63,15 @@
 # define ACE_LACKS_PRAGMA_ONCE 1
 # define ACE_LACKS_STRRECVFD 1
 # define ACE_NEW_THROWS_EXCEPTIONS 1
-# define ACE_SIZEOF_LONG_DOUBLE	10
+# define ACE_SIZEOF_LONG_DOUBLE 10
 # define ACE_TEMPLATES_REQUIRE_SOURCE 1
 # define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%Lu")
 # define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%Ld")
 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 # define ACE_USES_STD_NAMESPACE_FOR_STDC_LIB 1
-# define ACE_WSTRING_HAS_USHORT_SUPPORT	1
+# define ACE_WSTRING_HAS_USHORT_SUPPORT 1
 
-#endif /* defined(__BORLANDC__)	*/
+#endif /* defined(__BORLANDC__) */
 
 #include "ace/post.h"
 #endif /* ACE_WIN32_BORLAND_H */
diff --git a/include/makeinclude/ace_flags.bor b/include/makeinclude/ace_flags.bor
index 03f17c8a22f..04983722a16 100644
--- a/include/makeinclude/ace_flags.bor
+++ b/include/makeinclude/ace_flags.bor
@@ -1,5 +1,5 @@
 #
-# Flags	specific for compiling ACE library and applications
+# Flags specific for compiling ACE library and applications
 # with Borland C++Builder
 #
 
@@ -14,14 +14,20 @@ DLL_NAME=dll
 #
 # Compiler flags
 #
-ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG)
+ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG) -DACE_OS_HAS_DLL=$(DLL_FLAG)
 !ifdef SSL_ROOT
 SSL_CFLAGS = -I$(SSL_ROOT)\inc32 -DACE_HAS_SSL=1
 !endif
 ACE_SSL_CFLAGS = -I$(ACE_ROOT) -DACE_SSL_HAS_DLL=$(DLL_FLAG)
 TAO_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_HAS_DLL=$(DLL_FLAG)
+TAO_DYNAMICANY_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_DYNAMICANY_HAS_DLL=$(DLL_FLAG)
+TAO_PORTABLESERVER_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_PORTABLESERVER_HAS_DLL=$(DLL_FLAG)
+TAO_IDL_BE_CFLAGS = -I$(ACE_ROOT)\TAO\TAO_IDL -I$(ACE_ROOT)\TAO\TAO_IDL\be_include \
+	-DTAO_IDL_BE_HAS_DLL=$(DLL_FLAG)
+TAO_IDL_FE_CFLAGS = -I$(ACE_ROOT)\TAO\TAO_IDL -I$(ACE_ROOT)\TAO\TAO_IDL\fe \
+	-I$(ACE_ROOT)\TAO\TAO_IDL\include -I$(ACE_ROOT)\TAO\TAO_IDL\util -DTAO_IDL_FE_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_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)
@@ -29,41 +35,45 @@ TAO_LOADBALANCING_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_LOADBALANCING_HAS_DLL
 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_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_RTOLDEVENT_CFLAGS =	-I$(ACE_ROOT)\TAO\orbsvcs -DTAO_RTOLDEVENT_HAS_DLL=$(DLL_FLAG)
+TAO_RTOLDEVENT_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_RTOLDEVENT_HAS_DLL=$(DLL_FLAG)
 TAO_RTSCHED_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_RTSCHED_HAS_DLL=$(DLL_FLAG)
-TAO_RTSCHEDEVENT_CFLAGS	= -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_RTSCHEDEVENT_HAS_DLL=$(DLL_FLAG)
-TAO_SECURITY_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs	-DTAO_SECURITY_HAS_DLL=$(DLL_FLAG)
+TAO_RTSCHEDEVENT_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_RTSCHEDEVENT_HAS_DLL=$(DLL_FLAG)
+TAO_SECURITY_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_SECURITY_HAS_DLL=$(DLL_FLAG)
 TAO_SSLIOP_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_SSLIOP_HAS_DLL=$(DLL_FLAG)
-TAO_TIME_CFLAGS	= -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_TIME_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
+ACE_LIB = $(CORE_BINDIR)\ace$(LIB_DECORATOR).lib
 !ifdef SSL_ROOT
-SSL_LIB	= $(SSL_ROOT)\out32$(DLL_NAME)\libeay32.lib $(SSL_ROOT)\out32$(DLL_NAME)\ssleay32.lib
+SSL_LIB = $(SSL_ROOT)\out32$(DLL_NAME)\libeay32.lib $(SSL_ROOT)\out32$(DLL_NAME)\ssleay32.lib
 !endif
 ACE_SSL_LIB = $(CORE_BINDIR)\ACE_SSL$(LIB_DECORATOR).lib
 NETSVCS_LIB = $(CORE_BINDIR)\netsvcs$(LIB_DECORATOR).lib
-TAO_LIB	= $(CORE_BINDIR)\TAO$(LIB_DECORATOR).lib
+TAO_LIB = $(CORE_BINDIR)\TAO$(LIB_DECORATOR).lib
+TAO_DYNAMICANY_LIB = $(CORE_BINDIR)\TAO_DynamicAny$(LIB_DECORATOR).lib
+TAO_PORTABLESERVER_LIB = $(CORE_BINDIR)\TAO_PortableServer$(LIB_DECORATOR).lib
+TAO_IDL_BE_LIB = $(CORE_BINDIR)\TAO_IDL_BE$(LIB_DECORATOR).lib
+TAO_IDL_FE_LIB = $(CORE_BINDIR)\TAO_IDL_FE$(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_EVENT_LIB = $(CORE_BINDIR)\TAO_CosEvent$(LIB_DECORATOR).lib
 TAO_LIFECYCLE_LIB = $(CORE_BINDIR)\TAO_CosLifeCycle$(LIB_DECORATOR).lib
-TAO_LOADBALANCING_LIB =	$(CORE_BINDIR)\TAO_LoadBalancing$(LIB_DECORATOR).lib
+TAO_LOADBALANCING_LIB = $(CORE_BINDIR)\TAO_LoadBalancing$(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_RTEVENT_LIB = $(CORE_BINDIR)\TAO_RTEvent$(LIB_DECORATOR).lib
 TAO_RTOLDEVENT_LIB = $(CORE_BINDIR)\TAO_RTOLDEvent$(LIB_DECORATOR).lib
-TAO_RTSCHED_LIB	= $(CORE_BINDIR)\TAO_RTSched$(LIB_DECORATOR).lib
+TAO_RTSCHED_LIB = $(CORE_BINDIR)\TAO_RTSched$(LIB_DECORATOR).lib
 TAO_RTSCHEDEVENT_LIB = $(CORE_BINDIR)\TAO_RTSchedEvent$(LIB_DECORATOR).lib
 TAO_SECURITY_LIB = $(CORE_BINDIR)\TAO_Security$(LIB_DECORATOR).lib
 TAO_SSLIOP_LIB = $(CORE_BINDIR)\TAO_SSLIOP$(LIB_DECORATOR).lib
 TAO_TIME_LIB = $(CORE_BINDIR)\TAO_CosTime$(LIB_DECORATOR).lib
-TAO_TRADING_LIB	= $(CORE_BINDIR)\TAO_CosTrading$(LIB_DECORATOR).lib
+TAO_TRADING_LIB = $(CORE_BINDIR)\TAO_CosTrading$(LIB_DECORATOR).lib
diff --git a/include/makeinclude/build_dll.bor b/include/makeinclude/build_dll.bor
index dbdaaa474e0..b87c2ccfee8 100644
--- a/include/makeinclude/build_dll.bor
+++ b/include/makeinclude/build_dll.bor
@@ -18,6 +18,8 @@
 
 TARGET = $(BINDIR)\$(NAME)$(LIB_DECORATOR).dll
 
+all: $(TARGET)
+
 $(TARGET): $(OBJFILES) $(RESOURCE)
 	@$(MAKE_BINDIR)
 	$(LD) @&&!
diff --git a/include/makeinclude/build_example.bor b/include/makeinclude/build_example.bor
index ca694366c70..aaf5182805f 100644
--- a/include/makeinclude/build_example.bor
+++ b/include/makeinclude/build_example.bor
@@ -4,9 +4,17 @@
 
 TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
 
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_NAMING_CFLAGS)
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+	$(TAO_PORTABLESERVER_CFLAGS) \
+	$(TAO_NAMING_CFLAGS)
 
-LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_NAMING_LIB)
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+	$(TAO_PORTABLESERVER_LIB) \
+	$(TAO_NAMING_LIB)
 
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
 
diff --git a/include/makeinclude/build_exe.bor b/include/makeinclude/build_exe.bor
index 8633efc9b98..79db237468b 100644
--- a/include/makeinclude/build_exe.bor
+++ b/include/makeinclude/build_exe.bor
@@ -19,6 +19,8 @@
 
 TARGET = $(BINDIR)\$(NAME).exe
 
+all: $(TARGET)
+
 $(TARGET): $(OBJFILES) $(RESOURCE)
 	@$(MAKE_BINDIR)
 	$(LD) @&&!
diff --git a/include/makeinclude/build_lib.bor b/include/makeinclude/build_lib.bor
index abd969c7563..6d1577c308b 100644
--- a/include/makeinclude/build_lib.bor
+++ b/include/makeinclude/build_lib.bor
@@ -18,6 +18,8 @@
 
 TARGET = $(BINDIR)\$(NAME)$(LIB_DECORATOR).lib
 
+all: $(TARGET)
+
 $(TARGET): $(OBJFILES)
 	@$(MAKE_BINDIR)
 	$(AR) $(LIB_LFLAGS) $(TARGET) @&&!