summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog15
-rw-r--r--ChangeLogs/ChangeLog-02a15
-rw-r--r--ChangeLogs/ChangeLog-03a15
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a16
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent.bor12
-rw-r--r--TAO/orbsvcs/orbsvcs/DsLogAdmin.bor10
-rw-r--r--TAO/orbsvcs/orbsvcs/RTEvent.bor12
-rw-r--r--TAO/orbsvcs/orbsvcs/RTSched.bor10
-rw-r--r--TAO/tao/Makefile.bor4
-rw-r--r--ace/Makefile.bor3
-rw-r--r--include/makeinclude/ace_flags.bor2
-rw-r--r--include/makeinclude/recurse.bor12
12 files changed, 95 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index ac4e03b407c..9bbaef2f263 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Sun May 14 12:43:35 2000 Darrell Brunsch <brunsch@uci.edu>
+
+ (On behalf of Christopher Kohlhoff <chris@kohlhoff.com>)
+
+ * ace/Makefile.bor:
+ * include/makeinclude/ace_flags.bor:
+
+ Added new file, moved ACE_BUILD_DLL macro into ACE library's
+ makefile. Thanks also to Mogens Hansen <mogens_h@dk-online.dk>.
+
+ * include/makeinclude/recurse.bor:
+
+ Arguments like -i should now be propogated with makefile
+ recursion
+
Sun May 14 12:19:41 2000 Darrell Brunsch <brunsch@uci.edu>
* bin/msvc_auto_compile.pl:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index ac4e03b407c..9bbaef2f263 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,18 @@
+Sun May 14 12:43:35 2000 Darrell Brunsch <brunsch@uci.edu>
+
+ (On behalf of Christopher Kohlhoff <chris@kohlhoff.com>)
+
+ * ace/Makefile.bor:
+ * include/makeinclude/ace_flags.bor:
+
+ Added new file, moved ACE_BUILD_DLL macro into ACE library's
+ makefile. Thanks also to Mogens Hansen <mogens_h@dk-online.dk>.
+
+ * include/makeinclude/recurse.bor:
+
+ Arguments like -i should now be propogated with makefile
+ recursion
+
Sun May 14 12:19:41 2000 Darrell Brunsch <brunsch@uci.edu>
* bin/msvc_auto_compile.pl:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index ac4e03b407c..9bbaef2f263 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,18 @@
+Sun May 14 12:43:35 2000 Darrell Brunsch <brunsch@uci.edu>
+
+ (On behalf of Christopher Kohlhoff <chris@kohlhoff.com>)
+
+ * ace/Makefile.bor:
+ * include/makeinclude/ace_flags.bor:
+
+ Added new file, moved ACE_BUILD_DLL macro into ACE library's
+ makefile. Thanks also to Mogens Hansen <mogens_h@dk-online.dk>.
+
+ * include/makeinclude/recurse.bor:
+
+ Arguments like -i should now be propogated with makefile
+ recursion
+
Sun May 14 12:19:41 2000 Darrell Brunsch <brunsch@uci.edu>
* bin/msvc_auto_compile.pl:
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index a9b5f5a9844..9f243ad6a4e 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,19 @@
+Sun May 14 12:43:35 2000 Darrell Brunsch <brunsch@uci.edu>
+
+ (On behalf of Christopher Kohlhoff <chris@kohlhoff.com>)
+
+ * tao/Makefile.bor:
+
+ Updated to reflect latest files. Thanks to Mogens Hansen
+ <mogens_h@dk-online.dk>.
+
+ * orbsvcs/orbsvcs/CosEvent.bor:
+ * orbsvcs/orbsvcs/DsLogAdmin.bor:
+ * orbsvcs/orbsvcs/RTEvent.bor:
+ * orbsvcs/orbsvcs/RTSched.bor:
+
+ Added TAO_Svc_Utils library for linking.
+
Sat May 13 23:27:31 2000 Darrell Brunsch <brunsch@uci.edu>
* examples/AMI/FL_Callback/AMI_Peer.dsp:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.bor b/TAO/orbsvcs/orbsvcs/CosEvent.bor
index f551df59c05..50622c242f3 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.bor
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.bor
@@ -46,18 +46,20 @@ OBJFILES = \
RESOURCE = $(OBJDIR)\orbsvcs.res
!ifdef STATIC
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_RTSCHED_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) $(TAO_EVENT_CFLAGS)
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SVC_UTILS_CFLAGS) \
+ $(TAO_RTSCHED_CFLAGS) $(TAO_RTEVENT_CFLAGS) $(TAO_EVENT_CFLAGS)
!else
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_RTSCHED_CFLAGS) \
- $(TAO_RTEVENT_CFLAGS) $(TAO_EVENT_CFLAGS) -DTAO_EVENT_BUILD_DLL
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SVC_UTILS_CFLAGS) \
+ $(TAO_RTSCHED_CFLAGS) $(TAO_RTEVENT_CFLAGS) $(TAO_EVENT_CFLAGS) \
+ -DTAO_EVENT_BUILD_DLL
!endif
CPPDIR = .;CosEvent
IDLDIR = .
-LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_RTSCHED_LIB) $(TAO_RTEVENT_LIB)
+LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_SVC_UTILS_LIB) $(TAO_RTSCHED_LIB) \
+ $(TAO_RTEVENT_LIB)
all: idl_src_files event_lib
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor b/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor
index 56ce93b7c1f..970bd2292bb 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor
@@ -27,18 +27,18 @@ OBJFILES = \
RESOURCE = $(OBJDIR)\orbsvcs.res
!ifdef STATIC
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_TRADING_CFLAGS) \
- $(TAO_LOG_CFLAGS)
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SVC_UTILS_CFLAGS) \
+ $(TAO_TRADING_CFLAGS) $(TAO_LOG_CFLAGS)
!else
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_TRADING_CFLAGS) \
- $(TAO_LOG_CFLAGS) -DTAO_LOG_BUILD_DLL
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SVC_UTILS_CFLAGS) \
+ $(TAO_TRADING_CFLAGS) $(TAO_LOG_CFLAGS) -DTAO_LOG_BUILD_DLL
!endif
CPPDIR = .;Log
IDLDIR = .
-LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_TRADING_LIB)
+LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_SVC_UTILS_LIB) $(TAO_TRADING_LIB)
all: idl_src_files log_lib
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.bor b/TAO/orbsvcs/orbsvcs/RTEvent.bor
index 119f545751d..13bb50b8934 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent.bor
+++ b/TAO/orbsvcs/orbsvcs/RTEvent.bor
@@ -86,18 +86,20 @@ OBJFILES = \
RESOURCE = $(OBJDIR)\orbsvcs.res
!ifdef STATIC
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_NAMING_CFLAGS) \
- $(TAO_RTSCHED_CFLAGS) $(TAO_RTEVENT_CFLAGS)
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SVC_UTILS_CFLAGS) \
+ $(TAO_NAMING_CFLAGS) $(TAO_RTSCHED_CFLAGS) $(TAO_RTEVENT_CFLAGS)
!else
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_NAMING_CFLAGS) \
- $(TAO_RTSCHED_CFLAGS) $(TAO_RTEVENT_CFLAGS) -DTAO_RTEVENT_BUILD_DLL
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SVC_UTILS_CFLAGS) \
+ $(TAO_NAMING_CFLAGS) $(TAO_RTSCHED_CFLAGS) $(TAO_RTEVENT_CFLAGS) \
+ -DTAO_RTEVENT_BUILD_DLL
!endif
CPPDIR = .;Event
IDLDIR = .
-LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_NAMING_LIB) $(TAO_RTSCHED_LIB)
+LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_SVC_UTILS_LIB) $(TAO_NAMING_LIB) \
+ $(TAO_RTSCHED_LIB)
all: idl_src_files rtevent_lib
diff --git a/TAO/orbsvcs/orbsvcs/RTSched.bor b/TAO/orbsvcs/orbsvcs/RTSched.bor
index a7a13031479..76e022459a2 100644
--- a/TAO/orbsvcs/orbsvcs/RTSched.bor
+++ b/TAO/orbsvcs/orbsvcs/RTSched.bor
@@ -30,18 +30,18 @@ OBJFILES = \
RESOURCE = $(OBJDIR)\orbsvcs.res
!ifdef STATIC
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_NAMING_CFLAGS) \
- $(TAO_RTSCHED_CFLAGS)
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SVC_UTILS_CFLAGS) \
+ $(TAO_NAMING_CFLAGS) $(TAO_RTSCHED_CFLAGS)
!else
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_NAMING_CFLAGS) \
- $(TAO_RTSCHED_CFLAGS) -DTAO_RTSCHED_BUILD_DLL
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SVC_UTILS_CFLAGS) \
+ $(TAO_NAMING_CFLAGS) $(TAO_RTSCHED_CFLAGS) -DTAO_RTSCHED_BUILD_DLL
!endif
CPPDIR = .;Sched
IDLDIR = .
-LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_NAMING_LIB)
+LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_SVC_UTILS_LIB) $(TAO_NAMING_LIB)
all: idl_src_files rtsched_lib
diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor
index 2bf9b824c3c..0ed21cf97b6 100644
--- a/TAO/tao/Makefile.bor
+++ b/TAO/tao/Makefile.bor
@@ -13,7 +13,6 @@ OBJFILES = \
$(OBJDIR)\BoundsC.obj \
$(OBJDIR)\Buffering_Constraint_Policy.obj \
$(OBJDIR)\CDR.obj \
- $(OBJDIR)\CDR_Interpreter.obj \
$(OBJDIR)\Client_Priority_Policy.obj \
$(OBJDIR)\Client_Strategy_Factory.obj \
$(OBJDIR)\Connector_Registry.obj \
@@ -64,7 +63,6 @@ OBJFILES = \
$(OBJDIR)\Interceptor.obj \
$(OBJDIR)\InterceptorC.obj \
$(OBJDIR)\InterfaceC.obj \
- $(OBJDIR)\InterfaceS.obj \
$(OBJDIR)\Invocation.obj \
$(OBJDIR)\IOPC.obj \
$(OBJDIR)\IOPS.obj \
@@ -75,6 +73,7 @@ OBJFILES = \
$(OBJDIR)\Key_Adapters.obj \
$(OBJDIR)\Leader_Follower.obj \
$(OBJDIR)\Linear_Priority_Mapping.obj \
+ $(OBJDIR)\LocalObject.obj \
$(OBJDIR)\Managed_Types.obj \
$(OBJDIR)\Marshal.obj \
$(OBJDIR)\Messaging_Policy_i.obj \
@@ -151,7 +150,6 @@ OBJFILES = \
$(OBJDIR)\UIOP_Lite_Factory.obj \
$(OBJDIR)\UIOP_Profile.obj \
$(OBJDIR)\UIOP_Transport.obj \
- $(OBJDIR)\Union.obj \
$(OBJDIR)\ValueBase.obj \
$(OBJDIR)\ValueFactory.obj \
$(OBJDIR)\ValueFactory_Map.obj \
diff --git a/ace/Makefile.bor b/ace/Makefile.bor
index 6e32bfe3ae6..5620d684ae3 100644
--- a/ace/Makefile.bor
+++ b/ace/Makefile.bor
@@ -129,6 +129,7 @@ OBJFILES = \
$(OBJDIR)\SOCK_Dgram.obj \
$(OBJDIR)\SOCK_Dgram_Bcast.obj \
$(OBJDIR)\SOCK_Dgram_Mcast.obj \
+ $(OBJDIR)\SOCK_Dgram_Mcast_QoS.obj \
$(OBJDIR)\SOCK_IO.obj \
$(OBJDIR)\SOCK_Stream.obj \
$(OBJDIR)\SPIPE.obj \
@@ -187,7 +188,7 @@ OBJFILES = \
RESOURCE = $(OBJDIR)\ace.res
-CFLAGS = $(ACE_CFLAGS)
+CFLAGS = $(ACE_CFLAGS) -DACE_BUILD_DLL
CPPDIR = .
diff --git a/include/makeinclude/ace_flags.bor b/include/makeinclude/ace_flags.bor
index 6380c92eb42..69522354058 100644
--- a/include/makeinclude/ace_flags.bor
+++ b/include/makeinclude/ace_flags.bor
@@ -12,7 +12,7 @@ DLL_FLAG=1
#
# Compiler flags
#
-ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG) -DACE_BUILD_DLL
+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)
diff --git a/include/makeinclude/recurse.bor b/include/makeinclude/recurse.bor
index 77c878e6ab7..0ba6f4443cc 100644
--- a/include/makeinclude/recurse.bor
+++ b/include/makeinclude/recurse.bor
@@ -17,10 +17,10 @@ all: $(DIRS)
# automatically restored when the sub-directory is finished.
$(DIRS):
@echo Entering directory $<
- @$(MAKE) $(MAKE_FLAGS) -f&&!
+ @$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f&&!
all:
@cd $<
- $(MAKE) $(MAKE_FLAGS) -fMakefile.bor
+ $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -fMakefile.bor
!
# This ugliness is to remove extra spaces from between the items in the list.
@@ -36,10 +36,10 @@ clean: $(DIRS_CLEAN)
# automatically restored when the sub-directory is finished.
$(DIRS_CLEAN):
@echo Cleaning directory $(<:.Clean=)
- @$(MAKE) $(MAKE_FLAGS) -f&&!
+ @$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f&&!
all:
@cd $(<:.Clean=)
- $(MAKE) $(MAKE_FLAGS) -fMakefile.bor clean
+ $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -fMakefile.bor clean
!
!endif
@@ -56,7 +56,7 @@ MAKEFILES_ALL = $(MAKEFILES_ALL_4:%=.All )
all: $(MAKEFILES_ALL)
$(MAKEFILES_ALL):
- $(MAKE) $(MAKE_FLAGS) -f$(<:.All=)
+ $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f$(<:.All=)
# This ugliness is to remove extra spaces from between the items in the list.
MAKEFILES_CLEAN_1 = $(MAKEFILES) $(BLANK_SPACE)
@@ -68,6 +68,6 @@ MAKEFILES_CLEAN = $(MAKEFILES_CLEAN_4:%=.Clean )
clean: $(MAKEFILES_CLEAN)
$(MAKEFILES_CLEAN):
- $(MAKE) $(MAKE_FLAGS) -f$(<:.Clean=) clean
+ $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f$(<:.Clean=) clean
!endif
View Lorry Controller Status