diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/JAWS/ChangeLog | 21 | ||||
| -rw-r--r-- | apps/JAWS2/HTTPU/Makefile | 1 | ||||
| -rw-r--r-- | apps/JAWS2/JAWS/Makefile | 4 | ||||
| -rw-r--r-- | apps/JAWS2/Makefile | 7 | ||||
| -rw-r--r-- | apps/Makefile | 1 |
5 files changed, 29 insertions, 5 deletions
diff --git a/apps/JAWS/ChangeLog b/apps/JAWS/ChangeLog index 93804b0a44e..5adae5c4da7 100644 --- a/apps/JAWS/ChangeLog +++ b/apps/JAWS/ChangeLog @@ -1,10 +1,29 @@ +Mon Aug 13 14:04:44 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * Applied the following fixes courtesy of Blair Zajac + <blair@gps.caltech.edu>: + + 1) Allow a static libHTTPU.a to be built when + "make static_libs_only=1" is used. + + 2) When I try to build both JAWS and JAWS2 with the same + ACE_ROOT, the libJAWS.* that is built and installed first + prevents the other JAWS from properly compiling. This + resolves this problem by renaming the JAWS2 library to + libJAWS2.*. + + 3) The JAWS2 subdirectory is now descended into by + apps/Makefile. + + 4) The Makefile in JAWS2 now descends into HTTPU and JAWS to + build those libraries. + Tue Jun 12 20:35:26 2001 Krishnakumar B <kitty@cs.wustl.edu> * clients/Blobby/Blob_Handler.cpp: Fixed a size_t printf to make gcc happy on IA-64 Linux. - Sun Feb 18 09:33:33 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> * server/IO.cpp (handle): Added a const to the handle() method diff --git a/apps/JAWS2/HTTPU/Makefile b/apps/JAWS2/HTTPU/Makefile index 4207814eda1..370f56fa722 100644 --- a/apps/JAWS2/HTTPU/Makefile +++ b/apps/JAWS2/HTTPU/Makefile @@ -11,6 +11,7 @@ #BIN = test_parse_url test_parse_http_request test_http_headers \ # test_http_request test_http_response +LIB = libHTTPU.a SHLIB = libHTTPU.so FILES = parse_url parse_http_request parse_http_response \ http_request http_response http_base http_status \ diff --git a/apps/JAWS2/JAWS/Makefile b/apps/JAWS2/JAWS/Makefile index 9671a98e287..c056edc3d3f 100644 --- a/apps/JAWS2/JAWS/Makefile +++ b/apps/JAWS2/JAWS/Makefile @@ -10,8 +10,8 @@ #BIN = main -LIB = libJAWS.a -SHLIB = libJAWS.$(SOEXT) +LIB = libJAWS2.a +SHLIB = libJAWS2.$(SOEXT) MYFILES = \ Cache_Hash_T \ diff --git a/apps/JAWS2/Makefile b/apps/JAWS2/Makefile index 21ba35488af..e611edd4a71 100644 --- a/apps/JAWS2/Makefile +++ b/apps/JAWS2/Makefile @@ -8,6 +8,9 @@ # Local macros #---------------------------------------------------------------------------- +DIRS = HTTPU \ + JAWS + BIN = main FILES = HTTP_10 \ @@ -20,7 +23,7 @@ SRC = $(addsuffix .cpp,$(FILES)) OBJ = $(addsuffix .o,$(FILES)) LDFLAGS += -L./JAWS -LDLIBS = -lHTTPU -lJAWS +LDLIBS = -lHTTPU -lJAWS2 CFLAGS += -DJAWS_HAS_THREAD_SAFE_ACCEPT CPPFLAGS += -I. @@ -33,7 +36,7 @@ BUILD = $(VBIN) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU diff --git a/apps/Makefile b/apps/Makefile index e44fe0182c6..fc319a9a940 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -13,6 +13,7 @@ INFO = README DIRS = Gateway \ gperf \ JAWS \ + JAWS2 \ drwho # The following directories aren't compiled by default since haven't |