Whoops. This commit message had a copy paste error. Should have read "... for
apache2..." throughout.
From: <[EMAIL PROTECTED]>
> truk 2004/03/18 18:52:23
>
> Modified: jk/native2/server/apache2 Makefile.apxs.in Makefile.in
> Log:
> Rearrange Makefile.apxs.in to be more consistant with Makefile.in
>
> Arrange --with-pcre support for apache13 for both Makefile.in and
> Makefile.apxs.in
>
> Arrange --with-jni support for apache13 for Makefile.apxs.in
> (excluding libjkjni.so)
>
> Slight adjustments to the prepare and clean targets in Makefile.in
>
> Revision Changes Path
> 1.11 +16 -11
> jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in
>
> Index: Makefile.apxs.in
> ===================================================================
> RCS file:
> /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in,v
> retrieving revision 1.10
> retrieving revision 1.11
> diff -u -r1.10 -r1.11
> --- Makefile.apxs.in 10 Mar 2004 23:52:34 -0000 1.10
> +++ Makefile.apxs.in 19 Mar 2004 02:52:22 -0000 1.11
> @@ -1,4 +1,6 @@
> ## configure should make the Makefile out of this file.
> [EMAIL PROTECTED]@
> [EMAIL PROTECTED]@
>
> [EMAIL PROTECTED]@
> [EMAIL PROTECTED]@
> @@ -6,30 +8,33 @@
> JK_DIR := ../..
> [EMAIL PROTECTED]@
> [EMAIL PROTECTED]@
> -COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
> -
> -
> -JK=${JK_DIR}/common/
> -JKINC=${JK_DIR}/include/
> -JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
>
> ifneq ($(strip $(JAVA_HOME)),)
> JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
> JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L
> ${JAVA_HOME}/lib/${ARCH}/native_threads
> endif
>
> -APACHE2_OBJECTS=jk_logger_apache2.c jk_map_aprtable.c jk_service_apache2.c
> +INCLUDES= -I${JK_DIR}/include \
> + ${JAVA_INCL}
>
> -## Must include the jni stuff
> +JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 @HAVE_JNI@ @HAS_PCRE@
> +
> +COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
> +JNI_C_FILES := $(wildcard ${JK_DIR}/jni/*.c )
> +A2_C_FILES := $(wildcard *.c )
>
> all: mod_jk2.la
>
> mod_jk2.la:
> - $(APXS) -c -o $@ -Wc,"${JK_INCL}" "${JAVA_INCL}" mod_jk2.c ${APACHE2_OBJECTS}
> ${COMMON_C_FILES}
> + $(APXS) -c -o $@ -Wc,"${INCLUDES} ${JK_CFLAGS}" ${JAVA_LIB} @PCRE_LIBS@ \
> + ${A2_C_FILES} ${COMMON_C_FILES} ${JNI_C_FILES}
>
> install: mod_jk2.la
> $(APXS) -i mod_jk2.la
>
> clean:
> - rm -f *.o *.so *.lo *.la *.slo
> - rm -rf .libs
> + rm -f *.o *.so *.lo *.la *.slo ${JK_DIR}/common/*.o ${JK_DIR}/common/*.so \
> + ${JK_DIR}/common/*.lo ${JK_DIR}/common/*.la ${JK_DIR}/common/*.slo \
> + ${JK_DIR}/jni/*.o ${JK_DIR}/jni/*.so ${JK_DIR}/jni/*.lo \
> + ${JK_DIR}/jni/*.la ${JK_DIR}/jni/*.slo
> + rm -rf .libs ${JK_DIR}/common/.libs ${JK_DIR}/jni/.libs
>
>
>
> 1.24 +7 -5
> jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in
>
> Index: Makefile.in
> ===================================================================
> RCS file:
> /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in,v
> retrieving revision 1.23
> retrieving revision 1.24
> diff -u -r1.23 -r1.24
> --- Makefile.in 12 Mar 2004 08:23:46 -0000 1.23
> +++ Makefile.in 19 Mar 2004 02:52:22 -0000 1.24
> @@ -2,6 +2,8 @@
> # use -D options to overrides defaults
> [EMAIL PROTECTED]@
> [EMAIL PROTECTED]@
> [EMAIL PROTECTED]@
> [EMAIL PROTECTED]@
>
> [EMAIL PROTECTED]@
> [EMAIL PROTECTED]@
> @@ -37,7 +39,7 @@
> ${APR_INCL} \
> ${JAVA_INCL}
>
> -JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
> +JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 @HAVE_JNI@ @HAS_PCRE@
> ifdef APR_LIBDIR_LA
> JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt @PCRE_LIBS@
> else
> @@ -106,13 +108,11 @@
> ${BUILD_DIR}/mod_jk2.so: ${BUILD_DIR}/${APACHE2_LIBEXEC}/mod_jk2.so
> $(CP) $^ $@
> ${BUILD_DIR}/${APACHE2_LIBEXEC}/mod_jk2.so: ${BUILD_DIR}/mod_jk2.la
> - mkdir -p ${BUILD_DIR}/${APACHE2_LIBEXEC}
> $(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}/${APACHE2_LIBEXEC}
>
> ${BUILD_DIR}/libjkjni.so: ${BUILD_DIR}/${APACHE2_LIBEXEC}/libjkjni.so
> $(CP) $^ $@
> ${BUILD_DIR}/${APACHE2_LIBEXEC}/libjkjni.so: ${BUILD_DIR}/libjkjni.la
> - mkdir -p ${BUILD_DIR}/${APACHE2_LIBEXEC}
> $(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}/${APACHE2_LIBEXEC}
>
> ${BUILD_DIR}/libjkjni.la: ${JNI_LO_FILES} ${COMMON_LO_FILES}
> @@ -124,7 +124,9 @@
> ${COMMON_C_FILES} ${A2_C_FILES}: ${H_FILES}
>
> prepare:
> - mkdir -p ${BUILD_DIR}
> + mkdir -p ${BUILD_DIR}${APACHE2_LIBEXEC}
>
> clean:
> - rm -rf ${BUILD_DIR}/*.lo ${BUILD_DIR}/*.la ${BUILD_DIR}/*.o ${BUILD_DIR}/.libs
> ${BUILD_DIR}/*.so
> + rm -rf ${BUILD_DIR}/*.lo ${BUILD_DIR}/*.la ${BUILD_DIR}/*.o ${BUILD_DIR}/*.a \
> + ${BUILD_DIR}/.libs ${BUILD_DIR}/*.so ${BUILD_DIR}${APACHE2_LIBEXEC}/*.so \
> + ${BUILD_DIR}${APACHE2_LIBEXEC}/*.la
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
