diff options
author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1999-07-05 17:23:07 +0000 |
---|---|---|
committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1999-07-05 17:23:07 +0000 |
commit | 349055b47d3a65318c480860b427e27024c41822 (patch) | |
tree | 15b928ddf1e6593063b046eecf4a1571b037d1cc /apps/JAWS | |
parent | ccf17bf2229d70940197202af39cf374113a7149 (diff) | |
download | ATCD-349055b47d3a65318c480860b427e27024c41822.tar.gz |
ChangeLogTag:Mon Jul 5 11:59:49 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
Diffstat (limited to 'apps/JAWS')
-rw-r--r-- | apps/JAWS/Makefile.bor | 18 | ||||
-rw-r--r-- | apps/JAWS/PROTOTYPE/JAWS/Makefile.bor | 16 | ||||
-rw-r--r-- | apps/JAWS/PROTOTYPE/Makefile.bor | 4 | ||||
-rw-r--r-- | apps/JAWS/clients/Makefile.bor | 18 | ||||
-rw-r--r-- | apps/JAWS/server/Makefile.bor | 4 |
5 files changed, 16 insertions, 44 deletions
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> |