Hi,

The Makefile in jakarta-tomcat-4.0/connectors are broken. I have fixed
them. Find enclosed the patch.

Cheers

Jean-frederic
? Makedefs
? patch.txt
? apache-1.3/.libs
Index: Makefile
===================================================================
RCS file: /home/cvs/mirror/jakarta-tomcat-4.0/connectors/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile    2001/01/23 18:43:08     1.4
+++ Makefile    2001/02/07 13:35:10
@@ -1,123 +1,64 @@
 # ========================================================================= #
-
 #                                                                           #
-
 #                 The Apache Software License,  Version 1.1                 #
-
 #                                                                           #
-
 #         Copyright (c) 1999, 2000  The Apache Software Foundation.         #
-
 #                           All rights reserved.                            #
-
 #                                                                           #
-
 # ========================================================================= #
-
 #                                                                           #
-
 # Redistribution and use in source and binary forms,  with or without modi- #
-
 # fication, are permitted provided that the following conditions are met:   #
-
 #                                                                           #
-
 # 1. Redistributions of source code  must retain the above copyright notice #
-
 #    notice, this list of conditions and the following disclaimer.          #
-
 #                                                                           #
-
 # 2. Redistributions  in binary  form  must  reproduce the  above copyright #
-
 #    notice,  this list of conditions  and the following  disclaimer in the #
-
 #    documentation and/or other materials provided with the distribution.   #
-
 #                                                                           #
-
 # 3. The end-user documentation  included with the redistribution,  if any, #
-
 #    must include the following acknowlegement:                             #
-
 #                                                                           #
-
 #       "This product includes  software developed  by the Apache  Software #
-
 #        Foundation <http://www.apache.org/>."                              #
-
 #                                                                           #
-
 #    Alternately, this acknowlegement may appear in the software itself, if #
-
 #    and wherever such third-party acknowlegements normally appear.         #
-
 #                                                                           #
-
 # 4. The names  "The  Jakarta  Project",  "Tomcat",  and  "Apache  Software #
-
 #    Foundation"  must not be used  to endorse or promote  products derived #
-
 #    from this  software without  prior  written  permission.  For  written #
-
 #    permission, please contact <[EMAIL PROTECTED]>.                        #
-
 #                                                                           #
-
 # 5. Products derived from this software may not be called "Apache" nor may #
-
 #    "Apache" appear in their names without prior written permission of the #
-
 #    Apache Software Foundation.                                            #
-
 #                                                                           #
-
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES #
-
 # INCLUDING, BUT NOT LIMITED TO,  THE IMPLIED WARRANTIES OF MERCHANTABILITY #
-
 # AND FITNESS FOR  A PARTICULAR PURPOSE  ARE DISCLAIMED.  IN NO EVENT SHALL #
-
 # THE APACHE  SOFTWARE  FOUNDATION OR  ITS CONTRIBUTORS  BE LIABLE  FOR ANY #
-
 # DIRECT,  INDIRECT,   INCIDENTAL,  SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL #
-
 # DAMAGES (INCLUDING,  BUT NOT LIMITED TO,  PROCUREMENT OF SUBSTITUTE GOODS #
-
 # OR SERVICES;  LOSS OF USE,  DATA,  OR PROFITS;  OR BUSINESS INTERRUPTION) #
-
 # HOWEVER CAUSED AND  ON ANY  THEORY  OF  LIABILITY,  WHETHER IN  CONTRACT, #
-
 # STRICT LIABILITY, OR TORT  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN #
-
 # ANY  WAY  OUT OF  THE  USE OF  THIS  SOFTWARE,  EVEN  IF  ADVISED  OF THE #
-
 # POSSIBILITY OF SUCH DAMAGE.                                               #
-
 #                                                                           #
-
 # ========================================================================= #
-
 #                                                                           #
-
 # This software  consists of voluntary  contributions made  by many indivi- #
-
 # duals on behalf of the  Apache Software Foundation.  For more information #
-
 # on the Apache Software Foundation, please see <http://www.apache.org/>.   #
-
 #                                                                           #
-
 # ========================================================================= #
 
-
-
 # CVS $Id: Makefile,v 1.4 2001/01/23 18:43:08 pier Exp $
-
 # Author: Pier Fumagalli <mailto:[EMAIL PROTECTED]>
 
 
-
 DIRS =    webapplib apache-1.3 java
 
 TARGETS = apache-1.3/mod_webapp.so java/warp.jar
@@ -129,84 +70,54 @@
 
 
 recompile:
-
        @echo "$(MAKE): ***"
-
        @echo "$(MAKE): *** Cleaning up previous compilation"
-
        @echo "$(MAKE): ***"
-
        @$(MAKE) clean
-
        @echo "$(MAKE): ***"
-
        @echo "$(MAKE): *** Recompiling from sources"
-
        @echo "$(MAKE): ***"
-
        @$(MAKE) all
 
 
 
 Makedefs:
-
        @cp Makedefs.orig Makedefs
-
        @echo "$(MAKE): ***"
-
        @echo "$(MAKE): *** Please edit the 'Makedefs' file before compiling"
-
        @echo "$(MAKE): ***"
-
        @exit 1
 
 
 
 java/warp.jar: Makedefs
-
        @$(MAKE) -C java warp.jar
 
 
 
 webapplib/libwebapp.a: Makedefs
-
        @$(MAKE) -C webapplib libwebapp.a
 
 
 
 apache-1.3/mod_webapp.so: Makedefs webapplib/libwebapp.a
-
        @$(MAKE) -C apache-1.3 mod_webapp.so
 
 
 
 clean: Makedefs
-
        @for DIR in $(DIRS) ; do \
-
                if [ ! -d "$$DIR" ] ; then \
-
                        echo "$(MAKE): *** Cannot find directory '$$DIR'" ; \
-
                        exit 1 ; \
-
                fi ; \
-
                $(MAKE) -C $$DIR clean ; \
-
                RET="$$?" ; \
-
                if [ "$$RET" != "0" ] ; then \
-
                        exit $$RET ; \
-
                fi ; \
-
        done
 
-
-
 distclean: clean
-
        rm -f Makedefs
 
Index: webapplib/Makefile
===================================================================
RCS file: /home/cvs/mirror/jakarta-tomcat-4.0/connectors/webapplib/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- webapplib/Makefile  2001/01/23 18:44:13     1.6
+++ webapplib/Makefile  2001/02/07 13:35:11
@@ -1,144 +1,72 @@
 # ========================================================================= #
-
 #                                                                           #
-
 #                 The Apache Software License,  Version 1.1                 #
-
 #                                                                           #
-
 #         Copyright (c) 1999, 2000  The Apache Software Foundation.         #
-
 #                           All rights reserved.                            #
-
 #                                                                           #
-
 # ========================================================================= #
-
 #                                                                           #
-
 # Redistribution and use in source and binary forms,  with or without modi- #
-
 # fication, are permitted provided that the following conditions are met:   #
-
 #                                                                           #
-
 # 1. Redistributions of source code  must retain the above copyright notice #
-
 #    notice, this list of conditions and the following disclaimer.          #
-
 #                                                                           #
-
 # 2. Redistributions  in binary  form  must  reproduce the  above copyright #
-
 #    notice,  this list of conditions  and the following  disclaimer in the #
-
 #    documentation and/or other materials provided with the distribution.   #
-
 #                                                                           #
-
 # 3. The end-user documentation  included with the redistribution,  if any, #
-
 #    must include the following acknowlegement:                             #
-
 #                                                                           #
-
 #       "This product includes  software developed  by the Apache  Software #
-
 #        Foundation <http://www.apache.org/>."                              #
-
 #                                                                           #
-
 #    Alternately, this acknowlegement may appear in the software itself, if #
-
 #    and wherever such third-party acknowlegements normally appear.         #
-
 #                                                                           #
-
 # 4. The names  "The  Jakarta  Project",  "Tomcat",  and  "Apache  Software #
-
 #    Foundation"  must not be used  to endorse or promote  products derived #
-
 #    from this  software without  prior  written  permission.  For  written #
-
 #    permission, please contact <[EMAIL PROTECTED]>.                        #
-
 #                                                                           #
-
 # 5. Products derived from this software may not be called "Apache" nor may #
-
 #    "Apache" appear in their names without prior written permission of the #
-
 #    Apache Software Foundation.                                            #
-
 #                                                                           #
-
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES #
-
 # INCLUDING, BUT NOT LIMITED TO,  THE IMPLIED WARRANTIES OF MERCHANTABILITY #
-
 # AND FITNESS FOR  A PARTICULAR PURPOSE  ARE DISCLAIMED.  IN NO EVENT SHALL #
-
 # THE APACHE  SOFTWARE  FOUNDATION OR  ITS CONTRIBUTORS  BE LIABLE  FOR ANY #
-
 # DIRECT,  INDIRECT,   INCIDENTAL,  SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL #
-
 # DAMAGES (INCLUDING,  BUT NOT LIMITED TO,  PROCUREMENT OF SUBSTITUTE GOODS #
-
 # OR SERVICES;  LOSS OF USE,  DATA,  OR PROFITS;  OR BUSINESS INTERRUPTION) #
-
 # HOWEVER CAUSED AND  ON ANY  THEORY  OF  LIABILITY,  WHETHER IN  CONTRACT, #
-
 # STRICT LIABILITY, OR TORT  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN #
-
 # ANY  WAY  OUT OF  THE  USE OF  THIS  SOFTWARE,  EVEN  IF  ADVISED  OF THE #
-
 # POSSIBILITY OF SUCH DAMAGE.                                               #
-
 #                                                                           #
-
 # ========================================================================= #
-
 #                                                                           #
-
 # This software  consists of voluntary  contributions made  by many indivi- #
-
 # duals on behalf of the  Apache Software Foundation.  For more information #
-
 # on the Apache Software Foundation, please see <http://www.apache.org/>.   #
-
 #                                                                           #
-
 # ========================================================================= #
 
-
-
 # CVS $Id: Makefile,v 1.6 2001/01/23 18:44:13 pier Exp $
-
 # Author: Pier Fumagalli <mailto:[EMAIL PROTECTED]>
 
-
-
 include ../Makedefs
 
-
-
 OBJS = wa.o wa_callback.o wa_connection.o wa_host.o wa_request.o \
-
        wa_provider.o wa_provider_info.o wa_provider_warp.o
 
-
-
 all: libwebapp.a
 
-
-
 libwebapp.a: $(OBJS)
-
        ar -cr libwebapp.a $(OBJS)
 
-
-
 clean:
-
        rm -f $(OBJS) libwebapp.a
-

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

Reply via email to