pier 00/11/29 01:01:38
Modified: connectors Makedefs.orig
connectors/webapplib Makefile
Added: connectors Makefile
connectors/apache-1.3 Makefile
Log:
Updated makefiles for module build.
Revision Changes Path
1.2 +61 -0 jakarta-tomcat-4.0/connectors/Makedefs.orig
Index: Makedefs.orig
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/connectors/Makedefs.orig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makedefs.orig 2000/11/27 12:49:56 1.1
+++ Makedefs.orig 2000/11/29 09:01:34 1.2
@@ -1,3 +1,63 @@
+# ========================================================================= #
+# #
+# 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: Makedefs.orig,v 1.2 2000/11/29 09:01:34 pier Exp $
+# Author: Pier Fumagalli <mailto:[EMAIL PROTECTED]>
+
CC = gcc
AR = ar
APXS = apxs
@@ -7,3 +67,4 @@
.c.o:
$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+
1.1 jakarta-tomcat-4.0/connectors/Makefile
Index: Makefile
===================================================================
# ========================================================================= #
# #
# 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.1 2000/11/29 09:01:34 pier Exp $
# Author: Pier Fumagalli <mailto:[EMAIL PROTECTED]>
DIRS = webapplib apache-1.3
MODULES = apache-1.3/mod_webapp.so
all: Makedefs $(MODULES)
recompile: clean all
Makedefs:
@cp Makedefs.orig Makedefs
@echo "$(MAKE): *** Please edit the 'Makedefs' file before compiling"
@exit 1
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
1.1 jakarta-tomcat-4.0/connectors/apache-1.3/Makefile
Index: Makefile
===================================================================
# ========================================================================= #
# #
# 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.1 2000/11/29 09:01:36 pier Exp $
# Author: Pier Fumagalli <mailto:[EMAIL PROTECTED]>
include ../Makedefs
all: mod_webapp.so
mod_webapp.so: ../webapplib/libwebapp.a mod_webapp.c
$(APXS) -c $(INCLUDES) $(LIBS) mod_webapp.c
clean:
rm -f mod_webapp.o mod_webapp.so
1.2 +66 -8 jakarta-tomcat-4.0/connectors/webapplib/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/connectors/webapplib/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile 2000/11/27 12:48:03 1.1
+++ Makefile 2000/11/29 09:01:37 1.2
@@ -1,15 +1,73 @@
-include ../Makedefs
+# ========================================================================= #
+# #
+# 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/>. #
+# #
+# ========================================================================= #
-OBJS = wa_callback.o wa_connection.o wa_host.o wa_provider.o wa_provider_info.o
wa_request.o
+# CVS $Id: Makefile,v 1.2 2000/11/29 09:01:37 pier Exp $
+# Author: Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-all: test libwebapp.a
+include ../Makedefs
-clean:
- rm -f $(OBJS) libwebapp.a
+OBJS = wa_callback.o wa_connection.o wa_host.o wa_provider.o wa_request.o \
+ wa_provider_info.o
+all: libwebapp.a
+
libwebapp.a: $(OBJS)
ar -cr libwebapp.a $(OBJS)
+
+clean:
+ rm -f $(OBJS) libwebapp.a
-test: $(OBJS) wa.c
- $(CC) $(CFLAGS) $(INCLUDES) wa.c -o test
- rm -f test
