ChangeLogTag:Mon Jul 5 11:59:49 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>

8 files changed, 46 insertions, 117 deletions

diff --git a/netsvcs/Makefile.bor b/netsvcs/Makefile.bor
index fe2b39ed7f3..5ac8a257adf 100644
--- a/netsvcs/Makefile.bor
+++ b/netsvcs/Makefile.bor
@@ -2,25 +2,13 @@
 # Makefile for building the netsvcs
 #
 
-!ifdef DEBUG
-DEBUG_FLAG = -DDEBUG 
-!endif
-      
-!ifdef STATIC
-STATIC_FLAG = -DSTATIC
-!endif
-     
-!ifdef PASCAL
-PASCAL_FLAG = -DPASCAL
-!endif
-     
-FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG)
+!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
 
 all:
-        cd $(ACE_ROOT)\netsvcs\lib
-        $(MAKE) -f Makefile.bor $(FLAGS)
-        cd $(ACE_ROOT)\netsvcs\clients
-        $(MAKE) -f Makefile.bor $(FLAGS)
-        cd $(ACE_ROOT)\netsvcs\servers
-        $(MAKE) -f Makefile.bor $(FLAGS)
+	cd $(ACE_ROOT)\netsvcs\lib
+	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
+	cd $(ACE_ROOT)\netsvcs\clients
+	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
+	cd $(ACE_ROOT)\netsvcs\servers
+	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
 
diff --git a/netsvcs/build.bor b/netsvcs/build.bor
index a1dd633ab3c..72036c408fc 100644
--- a/netsvcs/build.bor
+++ b/netsvcs/build.bor
@@ -1,36 +1,16 @@
 
-!ifdef DEBUG
-DEBUGFLAG=-DDEBUG
-!endif
-
-!ifdef STATIC
-STATICFLAG=-DSTATIC
-!endif
-
-!ifdef PASCAL
-PASCALFLAG=-DPASCAL
-!endif
-
 !ifndef CFLAGS
-CFLAGS=-I$(ACE_ROOT) $(ACE_CFLAGS)
+CFLAGS=$(ACE_CFLAGS)
 !endif
 
 !ifndef CPPDIR
 CPPDIR=.
 !endif
 
-!ifndef BINDIR
-BINDIR=.\bor\bin
-!endif
-
-!ifndef BASE_OBJDIR
-BASE_OBJDIR=.\bor\obj
-!endif
-
 !ifndef LIBFILES
-LIBFILES= $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib
+LIBFILES= $(ACE_LIB)
 !endif
 
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
+!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
 
diff --git a/netsvcs/clients/Logger/Makefile.bor b/netsvcs/clients/Logger/Makefile.bor
index 58f395a5496..28ae9437d9c 100644
--- a/netsvcs/clients/Logger/Makefile.bor
+++ b/netsvcs/clients/Logger/Makefile.bor
@@ -1,13 +1,13 @@
 
 APPS = \
-        direct_logging \
-        indirect_logging
+	direct_logging \
+	indirect_logging
 
 all: $(APPS)
 
 $(APPS):
-        $(MAKE) -f Makefile.bor -DNAME=$@ $(DEBUGFLAG) $(STATICFLAG) \
-                $(PASCALFLAG) $(BINDIR)\$@.exe
+	$(MAKE) -f Makefile.bor -DNAME=$@ $(MAKE_FLAGS) $(BINDIR)\$@.exe
+
 OBJFILES=$(OBJDIR)\$(NAME).obj
 
 !include <$(ACE_ROOT)\netsvcs\build.bor>
diff --git a/netsvcs/clients/Makefile.bor b/netsvcs/clients/Makefile.bor
index 464745373f4..a91e169e1ee 100644
--- a/netsvcs/clients/Makefile.bor
+++ b/netsvcs/clients/Makefile.bor
@@ -1,23 +1,11 @@
 
-!ifdef DEBUG
-DEBUG_FLAG = -DDEBUG 
-!endif
-      
-!ifdef STATIC
-STATIC_FLAG = -DSTATIC
-!endif
-     
-!ifdef PASCAL
-PASCAL_FLAG = -DPASCAL
-!endif
-     
-FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG)
+!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
 
 all:
-        cd $(ACE_ROOT)\netsvcs\clients\Logger
-        $(MAKE) -f Makefile.bor $(FLAGS)
-        cd $(ACE_ROOT)\netsvcs\clients\Naming
-        $(MAKE) -f Makefile.bor $(FLAGS)
-        cd $(ACE_ROOT)\netsvcs\clients\Tokens
-        $(MAKE) -f Makefile.bor $(FLAGS)
+	cd $(ACE_ROOT)\netsvcs\clients\Logger
+	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
+	cd $(ACE_ROOT)\netsvcs\clients\Naming
+	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
+	cd $(ACE_ROOT)\netsvcs\clients\Tokens
+	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
 
diff --git a/netsvcs/clients/Naming/Makefile.bor b/netsvcs/clients/Naming/Makefile.bor
index c793a30e471..81c2f78e587 100644
--- a/netsvcs/clients/Naming/Makefile.bor
+++ b/netsvcs/clients/Naming/Makefile.bor
@@ -1,21 +1,9 @@
 
-!ifdef DEBUG
-DEBUG_FLAG = -DDEBUG 
-!endif
-      
-!ifdef STATIC
-STATIC_FLAG = -DSTATIC
-!endif
-     
-!ifdef PASCAL
-PASCAL_FLAG = -DPASCAL
-!endif
-     
-FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG)
+!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
 
 all:
-        cd $(ACE_ROOT)\netsvcs\clients\Naming\Client
-        $(MAKE) -f Makefile.bor $(FLAGS)
-        cd $(ACE_ROOT)\netsvcs\clients\Naming\Dump_Restore
-        $(MAKE) -f Makefile.bor $(FLAGS)
+	cd $(ACE_ROOT)\netsvcs\clients\Naming\Client
+	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
+	cd $(ACE_ROOT)\netsvcs\clients\Naming\Dump_Restore
+	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
 
diff --git a/netsvcs/clients/Tokens/Makefile.bor b/netsvcs/clients/Tokens/Makefile.bor
index eb684a845f9..4bdc1900fdb 100644
--- a/netsvcs/clients/Tokens/Makefile.bor
+++ b/netsvcs/clients/Tokens/Makefile.bor
@@ -1,29 +1,17 @@
 
-!ifdef DEBUG
-DEBUG_FLAG = -DDEBUG 
-!endif
-      
-!ifdef STATIC
-STATIC_FLAG = -DSTATIC
-!endif
-     
-!ifdef PASCAL
-PASCAL_FLAG = -DPASCAL
-!endif
-     
-FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG)
+!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
 
 all:
-        cd $(ACE_ROOT)\netsvcs\clients\Tokens\collection
-        $(MAKE) -f Makefile.bor $(FLAGS)
-        cd $(ACE_ROOT)\netsvcs\clients\Tokens\deadlock
-        $(MAKE) -f Makefile.bor $(FLAGS)
-        cd $(ACE_ROOT)\netsvcs\clients\Tokens\invariant
-        $(MAKE) -f Makefile.bor $(FLAGS)
-        cd $(ACE_ROOT)\netsvcs\clients\Tokens\manual
-        $(MAKE) -f Makefile.bor $(FLAGS)
-        cd $(ACE_ROOT)\netsvcs\clients\Tokens\mutex
-        $(MAKE) -f Makefile.bor $(FLAGS)
-        cd $(ACE_ROOT)\netsvcs\clients\Tokens\rw_lock
-        $(MAKE) -f Makefile.bor $(FLAGS)
+	cd $(ACE_ROOT)\netsvcs\clients\Tokens\collection
+	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
+	cd $(ACE_ROOT)\netsvcs\clients\Tokens\deadlock
+	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
+	cd $(ACE_ROOT)\netsvcs\clients\Tokens\invariant
+	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
+	cd $(ACE_ROOT)\netsvcs\clients\Tokens\manual
+	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
+	cd $(ACE_ROOT)\netsvcs\clients\Tokens\mutex
+	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
+	cd $(ACE_ROOT)\netsvcs\clients\Tokens\rw_lock
+	$(MAKE) -f Makefile.bor $(MAKE_FLAGS)
 
diff --git a/netsvcs/lib/Makefile.bor b/netsvcs/lib/Makefile.bor
index 25773347ea5..7a5de6761b2 100644
--- a/netsvcs/lib/Makefile.bor
+++ b/netsvcs/lib/Makefile.bor
@@ -12,12 +12,11 @@ OBJFILES = \
 	$(OBJDIR)\Logging_Strategy.obj \
 	$(OBJDIR)\Base_Optimizer.obj
 
-CFLAGS = -I$(ACE_ROOT) $(ACE_CFLAGS)
+CFLAGS = $(ACE_CFLAGS)
+
 CPPDIR = .
-BASE_OBJDIR = .\bor\obj
-BINDIR = $(ACE_ROOT)\bin
-LIBFILES = \
-	$(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib
 
-!include <$(ACE_ROOT)\include\makeinclude\build_library.bor>
+LIBFILES = $(ACE_LIB)
+
+!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
 
diff --git a/netsvcs/servers/Makefile.bor b/netsvcs/servers/Makefile.bor
index ed38ae638f6..746ba07d7c2 100644
--- a/netsvcs/servers/Makefile.bor
+++ b/netsvcs/servers/Makefile.bor
@@ -1,9 +1,7 @@
 
 NAME = main
 OBJFILES = $(OBJDIRS)\$(NAME).obj
-CFLAGS = -I$(ACE_ROOT) -I$(ACE_ROOT)\netsvcs\lib $(ACE_CFLAGS)
-LIBFILES = \
-        $(ACE_ROOT)\bin\netsvcs$(LIB_DECORATOR).lib \
-        $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib
+CFLAGS = -I$(ACE_ROOT)\netsvcs\lib $(ACE_CFLAGS)
+LIBFILES = $(ACE_LIB) $(NETSVCS_LIB)
 !include <$(ACE_ROOT)\netsvcs\build.bor>