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

11 files changed, 37 insertions, 115 deletions

diff --git a/apps/Gateway/Makefile.bor b/apps/Gateway/Makefile.bor
index fcce9a54f49..bbe0f9444be 100644
--- a/apps/Gateway/Makefile.bor
+++ b/apps/Gateway/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)\apps\Gateway\Gateway
-        $(MAKE) -f Makefile.bor $(FLAGS)
+        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
         cd $(ACE_ROOT)\apps\Gateway\Peer
-        $(MAKE) -f Makefile.bor $(FLAGS)
+        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
 
diff --git a/apps/Gateway/Peer/Makefile.bor b/apps/Gateway/Peer/Makefile.bor
index 8aa8af754a7..7d01fd58d4a 100644
--- a/apps/Gateway/Peer/Makefile.bor
+++ b/apps/Gateway/Peer/Makefile.bor
@@ -5,5 +5,4 @@ OBJFILES = \
         $(OBJDIR)\Peer.obj \
         $(OBJDIR)\peerd.obj
 !include <$(ACE_ROOT)\apps\build.bor>
-LIBFILES= $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib
 
diff --git a/apps/JAWS/Makefile.bor b/apps/JAWS/Makefile.bor
index 13a6c4e5043..f517d4b8872 100644
--- a/apps/JAWS/Makefile.bor
+++ b/apps/JAWS/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)\apps\JAWS\clients
-        $(MAKE) -f Makefile.bor $(FLAGS)
+        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
 	cd $(ACE_ROOT)\apps\JAWS\server
-        $(MAKE) -f Makefile.bor $(FLAGS)
+        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
 
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Makefile.bor b/apps/JAWS/PROTOTYPE/JAWS/Makefile.bor
index accf9908b48..af27229cef2 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Makefile.bor
+++ b/apps/JAWS/PROTOTYPE/JAWS/Makefile.bor
@@ -16,18 +16,16 @@ OBJFILES = \
 	$(OBJDIR)\IO_Acceptor.obj \
 	$(OBJDIR)\IO_Handler.obj \
 	$(OBJDIR)\IO.obj \
-        $(OBJDIR)\Cache_Hash_T.obj \
-        $(OBJDIR)\Cache_Heap_T.obj \
-        $(OBJDIR)\Cache_List_T.obj \
-        $(OBJDIR)\Cache_Manager_T.obj \
-        $(OBJDIR)\Hash_Bucket_T.obj \
-        $(OBJDIR)\Pipeline_Handler_T.obj
+	$(OBJDIR)\Cache_Hash_T.obj \
+	$(OBJDIR)\Cache_Heap_T.obj \
+	$(OBJDIR)\Cache_List_T.obj \
+	$(OBJDIR)\Cache_Manager_T.obj \
+	$(OBJDIR)\Hash_Bucket_T.obj \
+	$(OBJDIR)\Pipeline_Handler_T.obj
 
 CFLAGS = -I$(ACE_ROOT) -I.. -DJAWS_NTRACE=0 -DACE_NLOGGING
 CPPDIR = .
-BASE_OBJDIR = .\bor\obj
 BINDIR =..\.
-LIBFILES = \
-        $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib
+LIBFILES = $(ACE_LIB)
 !include <$(ACE_ROOT)\include\makeinclude\build_library.bor>
 
diff --git a/apps/JAWS/PROTOTYPE/Makefile.bor b/apps/JAWS/PROTOTYPE/Makefile.bor
index 77230de9988..77f0476e68d 100644
--- a/apps/JAWS/PROTOTYPE/Makefile.bor
+++ b/apps/JAWS/PROTOTYPE/Makefile.bor
@@ -8,11 +8,11 @@ OBJFILES = \
 	$(OBJDIR)\HTTP_10_Parse.obj \
 	$(OBJDIR)\HTTP_10_Write.obj
 
-CFLAGS=-I. -I$(ACE_ROOT) $(ACE_CFLAGS) -DJAWS_HAS_THREAD_SAFE_ACCEPT
+CFLAGS=-I. -DJAWS_HAS_THREAD_SAFE_ACCEPT
 LIBFILES= \
         .\HTTPU$(LIB_DECORATOR).lib \
         .\JAWS$(LIB_DECORATOR).lib \
-        $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib
+        $(ACE_LIB)
 
 !include <$(ACE_ROOT)\apps\build.bor>
 
diff --git a/apps/JAWS/clients/Makefile.bor b/apps/JAWS/clients/Makefile.bor
index 06dd3941440..2a119e447a0 100644
--- a/apps/JAWS/clients/Makefile.bor
+++ b/apps/JAWS/clients/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)\apps\JAWS\clients\Blobby
-        $(MAKE) -f Makefile.bor $(FLAGS)
+        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
         cd $(ACE_ROOT)\apps\JAWS\clients\Caching
-        $(MAKE) -f Makefile.bor $(FLAGS)
+        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
 
diff --git a/apps/JAWS/server/Makefile.bor b/apps/JAWS/server/Makefile.bor
index e8e46b75dd4..037d2b2b8fc 100644
--- a/apps/JAWS/server/Makefile.bor
+++ b/apps/JAWS/server/Makefile.bor
@@ -11,9 +11,7 @@ OBJFILES = \
 	$(OBJDIR)\HTTP_Response.obj \
 	$(OBJDIR)\Parse_Headers.obj \
 	$(OBJDIR)\IO.obj \
-        $(OBJDIR)\main.obj
-XXLIBFILES = \
-        $(ACE_ROOT)\bin\ace$(LIB_DECORATOR).lib
+   $(OBJDIR)\main.obj
 
 !include <$(ACE_ROOT)\apps\build.bor>
 
diff --git a/apps/Makefile.bor b/apps/Makefile.bor
index 0c8f8000c14..bdc3b24ec5a 100644
--- a/apps/Makefile.bor
+++ b/apps/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)\apps\gperf
-        $(MAKE) -f Makefile.bor $(FLAGS)
+        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
 	cd $(ACE_ROOT)\apps\Gateway
-        $(MAKE) -f Makefile.bor $(FLAGS)
+        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
 	cd $(ACE_ROOT)\apps\JAWS
-        $(MAKE) -f Makefile.bor $(FLAGS)
+        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
 
diff --git a/apps/build.bor b/apps/build.bor
index 0b5bbb335a3..b11a02f2ca6 100644
--- a/apps/build.bor
+++ b/apps/build.bor
@@ -1,34 +1,14 @@
 
-!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>
diff --git a/apps/gperf/Makefile.bor b/apps/gperf/Makefile.bor
index 0105cbd3418..2831e305908 100644
--- a/apps/gperf/Makefile.bor
+++ b/apps/gperf/Makefile.bor
@@ -1,19 +1,7 @@
 
-!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)\apps\gperf\src
-        $(MAKE) -f Makefile.bor $(FLAGS)
+        $(MAKE) -f Makefile.bor $(MAKE_FLAGS)
 
diff --git a/apps/gperf/src/Makefile.bor b/apps/gperf/src/Makefile.bor
index 1dd4621ee90..95b6cf73277 100644
--- a/apps/gperf/src/Makefile.bor
+++ b/apps/gperf/src/Makefile.bor
@@ -1,5 +1,6 @@
 
 NAME = gperf
+
 OBJFILES = \
         $(OBJDIR)\Options.obj \
         $(OBJDIR)\Iterator.obj \
@@ -11,6 +12,12 @@ OBJFILES = \
         $(OBJDIR)\Vectors.obj \
         $(OBJDIR)\Version.obj \
         $(OBJDIR)\gperf.obj
-BINDIR=$(ACE_ROOT)\bin
-!include <$(ACE_ROOT)\apps\build.bor>
+
+CFLAGS = $(ACE_CFLAGS)
+
+CPPDIR = .
+
+LIBFILES = $(ACE_LIB)
+
+!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>