jfclere 2002/09/06 07:42:55
Modified: jk/native configure.in
jk/native/apache-1.3 Makefile.tmpl
Added: jk/native/apache-1.3 Makefile.in mod_jk.exp
Removed: jk/native/apache-1.3 Makefile.am
Log:
Arrange the makefile of Apache-1.3 to allow --with-apache to work correctly.
Note that when building a static mod_jk mod_dir also need to be build static.
Revision Changes Path
1.18 +7 -3 jakarta-tomcat-connectors/jk/native/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/configure.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- configure.in 27 Jun 2002 14:34:18 -0000 1.17
+++ configure.in 6 Sep 2002 14:42:54 -0000 1.18
@@ -46,6 +46,9 @@
AC_PATH_PROG(MKDIR,mkdir,$PATH)dnl
AC_SUBST(MKDIR)
+AC_PATH_PROG(LIBTOOL,libtool,$PATH)dnl
+AC_SUBST(LIBTOOL)
+
APACHE_CONFIG_VARS=`pwd`/scripts/build/config_vars.mk
WEBSERVER=""
apache_dir=""
@@ -425,13 +428,14 @@
AM_CONDITIONAL(MAKE_DYNAMIC_APACHE, ${TEST} "${apache_dir_is_src}" = "false")
if ${TEST} "${apache_dir_is_src}" = "false" ; then
-dnl ????
+dnl normal apxs handling
APACHE20_OEXT=.c
LIB_JK_TYPE=mod_jk.so
INSTALL_TYPE=install_dynamic
else
+dnl install static library in apache sources.
APACHE20_OEXT=.lo
- LIB_JK_TYPE=lib_jk.la
+ LIB_JK_TYPE=mod_jk.a
INSTALL_TYPE=install_static
fi
AC_SUBST(APACHE20_OEXT)
1.2 +32 -2 jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.tmpl 5 Jun 2001 10:27:52 -0000 1.1
+++ Makefile.tmpl 6 Sep 2002 14:42:54 -0000 1.2
@@ -1,8 +1,38 @@
-LIB=libjk.a
+##
+## Apache 1.3 Makefile template for mod_jk
+##
+LIB=libjk.$(LIBEXT)
+JK_INCLUDES=$(INCLUDES) -I./include
+
+OBJS=mod_jk.o
+OBJS_LIB=mod_jk.a
+
+SHLIB_OBJS=mod_jk.so-o
+SHLIB_OBJS_LIB=mod_jk.a
all: ${LIB}
-${LIB}:
+# build the static library by merging the object files
+libjk.a: $(OBJS) $(OBJS_LIB)
+ cp $(OBJS_LIB) $@
+ ar r $@ $(OBJS)
${RANLIB} $@
+# build the shared object library by linking the object files
+libjk.so: $(SHLIB_OBJS) $(SHLIB_OBJS_LIB)
+ rm -f $@
+ $(LD_SHLIB) $(LDFLAGS_SHLIB) -o $@ $(SHLIB_OBJS) $(SHLIB_OBJS_LIB) $(LIBS)
+
+.SUFFIXES: .o .so-o
+.c.o:
+ $(CC) -c $(JK_INCLUDES) $(CFLAGS) $(CPPFLAGS) $(SPACER) $<
+.c.so-o:
+ $(CC) -c $(JK_INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(CPPFLAGS) $(SPACER) $< &&
mv $*.o $*.so-o
clean:
+ -rm -f $(OBJS) $(SHLIB_OBJS) $(LIB)
+
+distclean: clean
+ -rm -f Makefile
+
+depend:
+ echo "No depend"
1.7 +81 -11 jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.in
1.1 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.exp
Index: mod_jk.exp
===================================================================
mod_jk.exp
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
