You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jf...@apache.org on 2001/10/10 17:30:25 UTC
cvs commit: jakarta-tomcat-connectors/webapp/lib Makefile.in
jfclere 01/10/10 08:30:25
Modified: webapp Makedefs.in configure.in
webapp/apache-1.3 Makefile.in
webapp/lib Makefile.in
Log:
Arrange the configure/makefile logic to use the libtool of apr or apache-2.0.
Revision Changes Path
1.12 +6 -2 jakarta-tomcat-connectors/webapp/Makedefs.in
Index: Makedefs.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makedefs.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makedefs.in 2001/09/17 00:42:59 1.11
+++ Makedefs.in 2001/10/10 15:30:24 1.12
@@ -56,9 +56,9 @@
# ========================================================================= #
# @author Pier Fumagalli <ma...@eng.sun.com>
-# @version $Id: Makedefs.in,v 1.11 2001/09/17 00:42:59 pier Exp $
+# @version $Id: Makedefs.in,v 1.12 2001/10/10 15:30:24 jfclere Exp $
-.SUFFIXES: .c .o
+.SUFFIXES: .c .o .lo
# -------------------------------------------------------------------------
# Programs discovered by "configure" during initialization
@@ -118,6 +118,8 @@
APR_LDFLAGS = @APR_LDFLAGS@
# Extra APR libraries required for linking
APR_LIBS = @APR_LIBS@
+# Libtool location
+LIBTOOL = @LIBTOOL@
# -------------------------------------------------------------------------
# C Compiler settings
@@ -175,3 +177,5 @@
.c.o:
$(CC) $(ALL_CFLAGS) -c "$<" -o "$@"
+.c.lo:
+ $(LIBTOOL) $(CC) -static $(ALL_CFLAGS) -c "$<"
1.42 +4 -1 jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- configure.in 2001/10/09 10:41:25 1.41
+++ configure.in 2001/10/10 15:30:24 1.42
@@ -58,7 +58,7 @@
dnl --------------------------------------------------------------------------
dnl Author Pier Fumagalli <ma...@eng.sun.com>
dnl Author Jon S. Stevens <ma...@latchkey.com>
-dnl Version $Id: configure.in,v 1.41 2001/10/09 10:41:25 jfclere Exp $
+dnl Version $Id: configure.in,v 1.42 2001/10/10 15:30:24 jfclere Exp $
dnl --------------------------------------------------------------------------
dnl --------------------------------------------------------------------------
@@ -426,6 +426,7 @@
dnl -----------------------------------------------------
MODULE="apache-2.0"
local_prefix="`${APXS} -q PREFIX`"
+ LIBTOOL="$local_prefix/build/libtool"
APR_CFGFLG=""
APR_VARFIL="${local_prefix}/lib/APRVARS"
APR_LIBDIR="${local_prefix}/lib"
@@ -521,6 +522,7 @@
APR_VARFIL="${APR_SRCDIR}/APRVARS"
APR_LIBDIR="${TGTDIR}/lib"
TARGET="${TARGET} apr"
+ LIBTOOL="${APR_SRCDIR}/libtool"
fi
dnl --------------------------------------------------------------------------
@@ -543,6 +545,7 @@
AC_SUBST(APR_INCLUDES)
AC_SUBST(APR_LDFLAGS)
AC_SUBST(APR_LIBS)
+AC_SUBST(LIBTOOL)
dnl --------------------------------------------------------------------------
dnl Set up targets for building and cleaning
1.20 +8 -1 jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.in 2001/09/17 22:59:52 1.19
+++ Makefile.in 2001/10/10 15:30:24 1.20
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <ma...@eng.sun.com>
-# @version $Id: Makefile.in,v 1.19 2001/09/17 22:59:52 pier Exp $
+# @version $Id: Makefile.in,v 1.20 2001/10/10 15:30:24 jfclere Exp $
include @TGTDIR@/Makedefs
@@ -100,3 +100,10 @@
$(LN) -s $(SRCDIR)/apache-1.3/$@ ./$@
@$(ECHO) $(TGTDIR)/apache-1.3/$@ >> $(LSTFILE)
+$(TGTDIR)/lib/libwebapp.a: $(TGTDIR)/lib/libwebapp.la
+ $(LIBTOOL) --silent --mode=install \
+ $(SRCDIR)/support/install.sh -c \
+ $(TGTDIR)/lib/libwebapp.la \
+ $(TGTDIR)/lib
+ $(LIBTOOL) --silent --mode=finish \
+ $(TGTDIR)/lib
1.18 +12 -13 jakarta-tomcat-connectors/webapp/lib/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile.in 2001/10/09 10:41:25 1.17
+++ Makefile.in 2001/10/10 15:30:25 1.18
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <ma...@eng.sun.com>
-# @version $Id: Makefile.in,v 1.17 2001/10/09 10:41:25 jfclere Exp $
+# @version $Id: Makefile.in,v 1.18 2001/10/10 15:30:25 jfclere Exp $
include @TGTDIR@/Makedefs
@@ -70,17 +70,17 @@
wa_main.c \
wa_request.c
-OBJS = wa_main.o \
- wa_config.o \
- wa_request.o
-
-PROVS = pr_info.o \
- pr_warp.o \
- pr_warp_packet.o \
- pr_warp_network.o \
- pr_warp_config.o
+OBJS = wa_main.lo \
+ wa_config.lo \
+ wa_request.lo
+
+PROVS = pr_info.lo \
+ pr_warp.lo \
+ pr_warp_packet.lo \
+ pr_warp_network.lo \
+ pr_warp_config.lo
-LIB = libwebapp.a
+LIB = libwebapp.la
WARPH = pr_warp_defs.h
@@ -91,8 +91,7 @@
$(LIB): $(SRCS) $(WARPH) $(OBJS) $(PROVS)
@$(MECHO) "Creating library \"$@\""
- $(AR) cr $@ $(OBJS) $(PROVS)
- $(RANLIB) $@
+ $(LIBTOOL) $(CC) -rpath $(TGTDIR)/lib -static -o $@ $(OBJS) $(PROVS)
pr_warp_defs.h: $(TGTDIR)/java/Constants.java
@$(MECHO) "Generating \"$@\" from \"$?\""