cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.apxs.in Makefile.in
truk2004/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 ChangesPath
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 - 1.10
+++ Makefile.apxs.in 19 Mar 2004 02:52:22 - 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 - 1.23
+++ Makefile.in 19 Mar 2004 02:52:22 - 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
Re: cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.apxs.in Makefile.in
Whoops. This commit message had a copy paste error. Should have read ... for
apache2... throughout.
From: [EMAIL PROTECTED]
truk2004/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 ChangesPath
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 - 1.10
+++ Makefile.apxs.in 19 Mar 2004 02:52:22 - 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 - 1.23
+++ Makefile.in 19 Mar 2004 02:52:22 - 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 \
+
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.apxs.in Makefile.in
truk2004/03/10 15:52:34
Modified:jk/native2/server/apache2 Makefile.apxs.in Makefile.in
Log:
Go back to using HAS_PCRE to fix libjkjni unresolved references.
This reverts Apache2 back to its original behavior for pcre
(for platforms that use configure). If you want pcre support
then configure with --with-pcre.
Revision ChangesPath
1.10 +1 -1
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.apxs.in 27 Feb 2004 19:14:33 - 1.9
+++ Makefile.apxs.in 10 Mar 2004 23:52:34 - 1.10
@@ -11,7 +11,7 @@
JK=${JK_DIR}/common/
JKINC=${JK_DIR}/include/
-JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR -DHAS_AP_PCRE @HAVE_JNI@
+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}
1.22 +3 -3 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile.in 10 Mar 2004 19:07:40 - 1.21
+++ Makefile.in 10 Mar 2004 23:52:34 - 1.22
@@ -37,11 +37,11 @@
${APR_INCL} \
${JAVA_INCL}
-JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR -DHAS_AP_PCRE @HAVE_JNI@
+JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
ifdef APR_LIBDIR_LA
-JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt
+JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt @PCRE_LIBS@
else
-JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr-0
+JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr-0 @PCRE_LIBS@
endif
## Based on rules.mk ##
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.apxs.in Makefile.in NWGNUmakefile mod_jk2.dsp
truk2004/02/27 11:14:33
Modified:jk/native2/server/apache2 Makefile.apxs.in Makefile.in
NWGNUmakefile mod_jk2.dsp
Log:
Remove HAS_PCRE and add HAS_AP_PCRE. From Guenter Knauf.
apache2 doesn't need --with-pcre now and is silently ignored.
pcre support is always included for apache2
Revision ChangesPath
1.9 +1 -1
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.apxs.in 10 Feb 2004 04:39:51 - 1.8
+++ Makefile.apxs.in 27 Feb 2004 19:14:33 - 1.9
@@ -11,7 +11,7 @@
JK=${JK_DIR}/common/
JKINC=${JK_DIR}/include/
-JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
+JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR -DHAS_AP_PCRE @HAVE_JNI@
ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
1.20 +3 -3 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.in 24 Feb 2004 04:00:30 - 1.19
+++ Makefile.in 27 Feb 2004 19:14:33 - 1.20
@@ -37,11 +37,11 @@
${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 -DHAS_APR -DHAS_AP_PCRE @HAVE_JNI@
ifdef APR_LIBDIR_LA
-JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt @PCRE_LIBS@
+JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt
else
-JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr-0 @PCRE_LIBS@
+JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr-0
endif
## Based on rules.mk ##
1.2 +1 -2
jakarta-tomcat-connectors/jk/native2/server/apache2/NWGNUmakefile
Index: NWGNUmakefile
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/NWGNUmakefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NWGNUmakefile 20 Nov 2003 00:26:30 - 1.1
+++ NWGNUmakefile 27 Feb 2004 19:14:33 - 1.2
@@ -59,9 +59,8 @@
-D__NOVELL_LIBC__ \
-D_POSIX_SOURCE \
-DHAS_APR \
+ -DHAS_AP_PCRE \
$(EOLIST)
-
-#-DHAS_PCRE
#
# These flags will be added to the link.opt file
1.8 +2 -2 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.dsp
Index: mod_jk2.dsp
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_jk2.dsp 2 Feb 2004 21:58:55 - 1.7
+++ mod_jk2.dsp 27 Feb 2004 19:14:33 - 1.8
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D
_MBCS /D _USRDLL /D MOD_JK2_EXPORTS /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\..\include /I $(JAVA_HOME)\include /I
$(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I
$(APACHE2_HOME)\os\win32 /D NDEBUG /D WIN32 /D _WINDOWS /D _MBCS /D
_USRDLL /D MOD_JK2_EXPORTS /D HAVE_JNI /D HAS_APR /D HAS_PCRE /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\..\include /I $(JAVA_HOME)\include /I
$(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I
$(APACHE2_HOME)\os\win32 /D NDEBUG /D WIN32 /D _WINDOWS /D _MBCS /D
_USRDLL /D MOD_JK2_EXPORTS /D HAVE_JNI /D HAS_APR /D HAS_AP_PCRE /FR /YX /FD
/c
# ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32
# ADD MTL /nologo /D NDEBUG /mktyplib203 /win32
# ADD BASE RSC /l 0xc0a /d NDEBUG
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D WIN32 /D _DEBUG /D
_WINDOWS /D _MBCS /D _USRDLL /D MOD_JK2_EXPORTS /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ..\..\include /I
$(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I
$(APACHE2_HOME)\os\win32 /D _DEBUG /D WIN32 /D _WINDOWS /D _MBCS /D
_USRDLL /D MOD_JK2_EXPORTS /D HAVE_JNI /D HAS_APR /D HAS_PCRE /FR /YX /FD
/GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ..\..\include /I
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.apxs.in Makefile.in
jfclere 2004/02/05 09:40:22
Modified:jk/native2/server/apache13 Makefile.apxs.in Makefile.in
jk/native2/server/apache2 Makefile.apxs.in Makefile.in
Log:
Start arrange the libtool and other logic. It is still not OK the apache13
need a libtool install to get the mod_jk2.so in build.
Revision ChangesPath
1.7 +6 -1
jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in
Index: Makefile.apxs.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.apxs.in 26 Jun 2003 23:43:01 - 1.6
+++ Makefile.apxs.in 5 Feb 2004 17:40:22 - 1.7
@@ -9,17 +9,22 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
C_FILES=jk_service_apache13_c mod_jk2_c
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/apr-config --libs`
JK=../../common/
JKINC=../../include/
JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAVE_MMAP
+
+ifdef JAVA_HOME
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} @HAVE_JNI@
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
+endif
all: mod_jk2.so
mod_jk2.so:
- $(APXS) -c -o $@ -Wc,${JK_INCL} ${APR_CFLAGS} ${APR_LDFLAGS} ${JAVA_INCL}
${C_FILES} ${COMMON_C_FILES}
+ $(APXS) -c -o $@ -Wc,${JK_INCL} ${APR_CFLAGS} ${APR_LDFLAGS} ${JAVA_INCL}
${C_FILES} ${COMMON_C_FILES} ${APR_LIBS}
clean:
rm -f *.o *.so
1.9 +7 -2 jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in
Index: Makefile.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 10 Nov 2003 11:05:33 - 1.8
+++ Makefile.in 5 Feb 2004 17:40:22 - 1.9
@@ -1,5 +1,7 @@
# Gnu makefile and libtool are required
# use -D options to overrides defaults
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -7,9 +9,12 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/apr-config --libs`
+ifdef JAVA_HOME
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} @HAVE_JNI@
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
+endif
JK_DIR := ../..
BUILD_DIR = ${JK_DIR}/../build/jk2/apache13
@@ -36,7 +41,7 @@
COMPILE = $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(ALL_INCLUDES)
SH_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) $(JK_CFLAGS)
-MOD_LINK = $(LIBTOOL) --mode=link $(CC) -avoid-version -module -shared -rpath
$(APACHE_LIBEXEC) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(JK_LDFLAGS)
+MOD_LINK = $(LIBTOOL) --mode=link $(CC) -avoid-version -module -rpath
$(APACHE_LIBEXEC) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(JK_LDFLAGS)
MOD_INSTALL = $(LIBTOOL) --mode=install $(CP)
#
@@ -77,7 +82,7 @@
all: prepare ${BUILD_DIR}/mod_jk2.so
${BUILD_DIR}/mod_jk2.so: ${COMMON_LO_FILES} ${A_LO_FILES}
- ${MOD_LINK} -o $@ $^ @APR_LDFLAGS@
+ ${MOD_LINK} -o $@ $^ @APR_LDFLAGS@ ${APR_LIBS}
${COMMON_C_FILES} ${A_C_FILES}: ${H_FILES}
1.7 +3 -0
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.apxs.in 22 Oct 2002 19:41:03 - 1.6
+++ Makefile.apxs.in 5 Feb 2004 17:40:22 - 1.7
@@ -12,8 +12,11 @@
JK=${JK_DIR}/common/
JKINC=${JK_DIR}/include/
JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
+
+ifdef 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
1.15 +4 -1 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.in 5 Feb 2004 17:16:42 - 1.14
+++ Makefile.in 5 Feb 2004 17:40:22 - 1.15
@@ -1,5 +1,7 @@
# Gnu makefile and libtool are required
# use -D
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.apxs.in Makefile.in
hgomez 2002/06/04 03:33:45
Modified:jk/native2/server/apache13 Makefile.apxs.in Makefile.in
jk/native2/server/apache2 Makefile.apxs.in Makefile.in
Log:
Updated makefile.
No more use list.mk but instead wildcard (req. gnu make)
Also HAVE_JNI is set by configure
Revision ChangesPath
1.5 +4 -8
jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in
Index: Makefile.apxs.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.apxs.in 24 May 2002 07:21:24 - 1.4
+++ Makefile.apxs.in 4 Jun 2002 10:33:44 - 1.5
@@ -1,28 +1,24 @@
## configure should make the Makefile out of this file.
-## include all files to be built in common, with or without apr's
-## read the object (.c) from the list file.
-include ../../common/list.mk
-OEXT=.c
-
APXS=@APXS@
OS=@OS@
+JK_DIR := ../..
APXS_LDFLAGS=@APXS_LDFLAGS@
APXS_CFLAGS=@APXS_CFLAGS@
-JK_OBJECTS=${COMMON_OBJECTS} @COMMON_APR_OBJECTS@
+COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
APR_CFLAGS=@APR_CFLAGS@
APR_LDFLAGS=@APR_LDFLAGS@
JK=../../common/
JKINC=../../include/
JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAVE_MMAP
-JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
+JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} @HAVE_JNI@
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
all: mod_jk2.so
mod_jk2.so:
- $(APXS) -c -o $@ -Wc,${JK_INCL} ${APR_CFLAGS} ${APR_LDFLAGS} ${JAVA_INCL}
mod_jk2.c ${JK_OBJECTS}
+ $(APXS) -c -o $@ -Wc,${JK_INCL} ${APR_CFLAGS} ${APR_LDFLAGS} ${JAVA_INCL}
mod_jk2.c ${COMMON_C_FILES}
clean:
rm -f *.o *.so
1.5 +7 -9 jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in
Index: Makefile.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 24 May 2002 07:21:24 - 1.4
+++ Makefile.in 4 Jun 2002 10:33:45 - 1.5
@@ -1,16 +1,15 @@
# Gnu makefile and libtool are required
# use -D options to overrides defaults
-JK=../../common/
-OEXT=.c
-include ../../common/list.mk
-
APACHE_HOME=@APACHE_HOME@
OS=@OS@
APACHE_INCL=@APACHE_INCL@
EXTRA_CFLAGS=@APXS_CFLAGS@
EXTRA_CPPFLAGS=@APXS_CPPFLAGS@
-JK_OBJECTS=${COMMON_OBJECTS} ${COMMON_APR_OBJECTS}
+JAVA_HOME=@JAVA_HOME@
+
+JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} @HAVE_JNI@
+JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
JK_DIR := ../..
BUILD_DIR = ${JK_DIR}/../build/jk2/apache13
@@ -21,8 +20,8 @@
INCLUDES= -I${JK_DIR}/include \
${APACHE_INCL}
-JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 @APR_CFLAGS@ -DHAVE_MMAP
-JK_LDFLAGS=-L${APACHE_HOME}/lib -lcrypt @APR_LDFLAGS@
+JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 @APR_CFLAGS@ -DHAVE_MMAP ${JAVA_INCL}
+JK_LDFLAGS=-L${APACHE_HOME}/lib -lcrypt @APR_LDFLAGS@ ${JAVA_LIB}
## Based on rules.mk ##
ALL_CFLAGS = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS)
@@ -43,8 +42,7 @@
# Same behavior as ant - 'all files from a dir'.
# Excludes are not yet implemented.
-#COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
-COMMON_C_FILES = ${JK_OBJECTS}
+COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
A_C_FILES := $(wildcard ${JK_DIR}/server/apache13/*.c )
H_FILES := $(wildcard ${JK_DIR}/include/*.h )
1.5 +7 -8
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.apxs.in 24 May 2002 07:21:24 - 1.4
+++ Makefile.apxs.in 4 Jun 2002 10:33:45 - 1.5
@@ -3,19 +3,18 @@
APXS=@APXS2@
OS=@OS@
JAVA_HOME=@JAVA_HOME@
+JK_DIR := ../..
APXS_LDFLAGS=@APXS2_LDFLAGS@
APXS_CFLAGS=@APXS2_CFLAGS@
+COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
-JK=../../common/
-JKINC=../../include/
-JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR
+
+JK=${JK_DIR}/common/
+JKINC=${JK_DIR}/include/
+JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR @HAVE_JNI@
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.apxs.in Makefile.in
hgomez 02/05/24 00:21:24
Modified:jk/native2/server/apache13 Makefile.apxs.in Makefile.in
jk/native2/server/apache2 Makefile.apxs.in Makefile.in
Log:
Updated Makefiles
Nota, that in Apache 1.3, we get list of common's files from common/list.mk
Revision ChangesPath
1.4 +13 -7
jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in
Index: Makefile.apxs.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.apxs.in 17 May 2002 00:31:54 - 1.3
+++ Makefile.apxs.in 24 May 2002 07:21:24 - 1.4
@@ -1,22 +1,28 @@
## configure should make the Makefile out of this file.
+## include all files to be built in common, with or without apr's
+## read the object (.c) from the list file.
+include ../../common/list.mk
+OEXT=.c
+
APXS=@APXS@
OS=@OS@
-APXSLDFLAGS=@APXSLDFLAGS@
-APXSCFLAGS=@APXSCFLAGS@
+APXS_LDFLAGS=@APXS_LDFLAGS@
+APXS_CFLAGS=@APXS_CFLAGS@
+JK_OBJECTS=${COMMON_OBJECTS} @COMMON_APR_OBJECTS@
+APR_CFLAGS=@APR_CFLAGS@
+APR_LDFLAGS=@APR_LDFLAGS@
JK=../../common/
JKINC=../../include/
JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAVE_MMAP
-
-## read the object (.c) from the list file.
-OEXT=.c
-include ../../common/list.mk
+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
all: mod_jk2.so
mod_jk2.so:
- $(APXS) -c -o $@ -Wc,${APXSCFLAGS} ${JK_INCL} ${APXSLDFLAGS} mod_jk2.c
${APACHE_OBJECTS}
+ $(APXS) -c -o $@ -Wc,${JK_INCL} ${APR_CFLAGS} ${APR_LDFLAGS} ${JAVA_INCL}
mod_jk2.c ${JK_OBJECTS}
clean:
rm -f *.o *.so
1.4 +12 -8 jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in
Index: Makefile.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in 16 May 2002 23:50:12 - 1.3
+++ Makefile.in 24 May 2002 07:21:24 - 1.4
@@ -1,12 +1,16 @@
# Gnu makefile and libtool are required
# use -D options to overrides defaults
+JK=../../common/
+OEXT=.c
+include ../../common/list.mk
+
APACHE_HOME=@APACHE_HOME@
OS=@OS@
APACHE_INCL=@APACHE_INCL@
-APR_INCL=@APR_INCL@
-EXTRA_CFLAGS=@EXTRA_CFLAGS@
-EXTRA_CPPFLAGS=@EXTRA_CPPFLAGS@
+EXTRA_CFLAGS=@APXS_CFLAGS@
+EXTRA_CPPFLAGS=@APXS_CPPFLAGS@
+JK_OBJECTS=${COMMON_OBJECTS} ${COMMON_APR_OBJECTS}
JK_DIR := ../..
BUILD_DIR = ${JK_DIR}/../build/jk2/apache13
@@ -15,10 +19,9 @@
# It doesn't hurt if we include all
INCLUDES= -I${JK_DIR}/include \
- ${APACHE_INCL} \
- ${APR_INCL}
+ ${APACHE_INCL}
-JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 @HAS_APR@ @APR_INCL@ -DHAVE_MMAP
+JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 @APR_CFLAGS@ -DHAVE_MMAP
JK_LDFLAGS=-L${APACHE_HOME}/lib -lcrypt @APR_LDFLAGS@
## Based on rules.mk ##
@@ -40,7 +43,8 @@
# Same behavior as ant - 'all files from a dir'.
# Excludes are not yet implemented.
-COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
+#COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
+COMMON_C_FILES = ${JK_OBJECTS}
A_C_FILES := $(wildcard ${JK_DIR}/server/apache13/*.c )
H_FILES := $(wildcard ${JK_DIR}/include/*.h )
@@ -72,7 +76,7 @@
all: prepare ${BUILD_DIR}/mod_jk2.so
${BUILD_DIR}/mod_jk2.so: ${COMMON_LO_FILES} ${A_LO_FILES}
- ${MOD_LINK} -o $@ $^ @APR_LIB_STATIC@
+ ${MOD_LINK} -o $@ $^ @APR_LDFLAGS@
${COMMON_C_FILES} ${A_C_FILES}: ${H_FILES}
1.4 +7 -5
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.apxs.in 17 May 2002 00:31:55 - 1.3
+++ Makefile.apxs.in 24 May 2002 07:21:24 - 1.4
@@ -1,27 +1,29 @@
## configure should make the Makefile out of this file.
-APXS=@APXS@
+APXS=@APXS2@
OS=@OS@
JAVA_HOME=@JAVA_HOME@
-APXSLDFLAGS=@APXSLDFLAGS@
-APXSCFLAGS=@APXSCFLAGS@
+APXS_LDFLAGS=@APXS2_LDFLAGS@
+APXS_CFLAGS=@APXS2_CFLAGS@
JK=../../common/
JKINC=../../include/
-JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} @HAS_APR@
+JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR
JAVA_INCL=-I
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.apxs.in Makefile.in jk_service_apache2.c mod_jk2.c
costin 02/05/16 17:31:55
Modified:jk/native2/server/apache13 Makefile.apxs.in
jk/native2/server/apache2 Makefile.apxs.in Makefile.in
jk_service_apache2.c mod_jk2.c
Log:
mod_jk2.so for apache will include all the jni code.
libjkjni.so will include all common and jni code.
The first is used by apache ( including inprocess worker ). The second
is used only by java - for unix socket, shm, and other native operations.
Revision ChangesPath
1.3 +1 -4
jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in
Index: Makefile.apxs.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.apxs.in 16 May 2002 23:50:12 - 1.2
+++ Makefile.apxs.in 17 May 2002 00:31:54 - 1.3
@@ -2,15 +2,12 @@
APXS=@APXS@
OS=@OS@
-JAVA_HOME=@JAVA_HOME@
APXSLDFLAGS=@APXSLDFLAGS@
APXSCFLAGS=@APXSCFLAGS@
JK=../../common/
JKINC=../../include/
JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAVE_MMAP
-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
## read the object (.c) from the list file.
OEXT=.c
@@ -19,7 +16,7 @@
all: mod_jk2.so
mod_jk2.so:
- $(APXS) -c -o $@ -Wc,${APXSCFLAGS} ${JK_INCL} ${JAVA_INCL} ${APXSLDFLAGS}
mod_jk2.c ${APACHE_OBJECTS}
+ $(APXS) -c -o $@ -Wc,${APXSCFLAGS} ${JK_INCL} ${APXSLDFLAGS} mod_jk2.c
${APACHE_OBJECTS}
clean:
rm -f *.o *.so
1.3 +2 -0
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.apxs.in 13 May 2002 10:25:33 - 1.2
+++ Makefile.apxs.in 17 May 2002 00:31:55 - 1.3
@@ -16,6 +16,8 @@
OEXT=.c
include ../../common/list.mk
APACHE2_OBJECTS=jk_logger_apache2.c jk_map_aprtable.c jk_service_apache2.c
+## Must include the jni stuff
+
all: mod_jk2.la
mod_jk2.la:
1.3 +2 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 14 May 2002 11:21:46 - 1.2
+++ Makefile.in 17 May 2002 00:31:55 - 1.3
@@ -89,10 +89,10 @@
all: prepare ${BUILD_DIR}/mod_jk2.so ${BUILD_DIR}/jkjni.so
-${BUILD_DIR}/jkjni.so: ${JNI_LO_FILES}
+${BUILD_DIR}/jkjni.so: ${JNI_LO_FILES} ${COMMON_LO_FILES}
$(MOD_LINK) -o $@ $^
-${BUILD_DIR}/mod_jk2.so: ${COMMON_LO_FILES} ${A2_LO_FILES}
+${BUILD_DIR}/mod_jk2.so: ${COMMON_LO_FILES} ${JNI_LO_FILES} ${A2_LO_FILES}
${MOD_LINK} -o $@ $^
${COMMON_C_FILES} ${A2_C_FILES}: ${H_FILES}
1.22 +3 -2
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c
Index: jk_service_apache2.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jk_service_apache2.c 16 May 2002 20:54:18 - 1.21
+++ jk_service_apache2.c 17 May 2002 00:31:55 - 1.22
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor [EMAIL PROTECTED]
* Henri Gomez [EMAIL PROTECTED]
- * Version: $Revision: 1.21 $
+ * Version: $Revision: 1.22 $
*/
#include apu_compat.h
@@ -74,7 +74,8 @@
#include http_core.h
#include http_protocol.h
#include http_main.h
-#include http_log.h
+#include http_log.h
+#include scoreboard.h
#include util_script.h
/*
1.24 +2 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mod_jk2.c 16 May 2002 20:54:18 - 1.23
+++ mod_jk2.c 17 May 2002
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.apxs.in Makefile.in
hgomez 02/05/07 08:57:37
Added: jk/native2/server/apache13 Makefile.apxs.in Makefile.in
jk/native2/server/apache2 Makefile.apxs.in Makefile.in
Log:
First task will be to have Makefile which will
use apxs to build
Revision ChangesPath
1.1
jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in
Index: Makefile.apxs.in
===
## configure should make the Makefile out of this file.
APXS=@APXS@
OS=@OS@
JAVA_HOME=@JAVA_HOME@
APXSLDFLAGS=@APXSLDFLAGS@
APXSCFLAGS=@APXSCFLAGS@
JK=../../common/
JKINC=../../include/
JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC}
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
## read the object (.c) from the list file.
OEXT=.c
include ../../common/list.mk
all: mod_jk2.so
mod_jk2.so:
$(APXS) -c -o $@ -Wc,${APXSCFLAGS} ${JK_INCL} ${JAVA_INCL} ${APXSLDFLAGS}
mod_jk2.c ${APACHE_OBJECTS}
clean:
rm -f *.o *.so
1.1 jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in
Index: Makefile.in
===
# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ../..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
APACHE20_OEXT = @APACHE20_OEXT@
APACHE_CONFIG_VARS = @APACHE_CONFIG_VARS@
APXSCFLAGS = @APXSCFLAGS@
APXSLDFLAGS = @APXSLDFLAGS@
AS = @AS@
CC = @CC@
CFLAGS = @CFLAGS@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
GREP = @GREP@
HAS_APR = @HAS_APR@
INSTALL_TYPE = @INSTALL_TYPE@
JK_CHANNEL_APR_SOCKET = @JK_CHANNEL_APR_SOCKET@
JK_JNI_WORKER = @JK_JNI_WORKER@
JK_POOL_APR = @JK_POOL_APR@
LIBTOOL = @LIBTOOL@
LIB_JK_TYPE = @LIB_JK_TYPE@
LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
PERL = @PERL@
RANLIB = @RANLIB@
RM = @RM@
SED = @SED@
TEST = @TEST@
VERSION = @VERSION@
WEBSERVER = @WEBSERVER@
apache_include = @apache_include@
APXS = @APXS@
OS = @OS@
JAVA_HOME = @JAVA_HOME@
CP = @CP@
APACHE_DIR = @APACHE_DIR@
MKDIR = @MKDIR@
DESTDIR = @APACHE_DIR@
libdir = /libexec
#VPATH=.:../common
APACHE_FILES = Makefile.tmpl Makefile.libdir libjk2.module
JK = ../../common/
JKINC = ../../include/
JK_INCL = -DUSE_APACHE_MD5 -I ${JK} -I ${JKINC}
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
AM_CFLAGS = @apache_include@ -I../common
APACHE_OBJECTS = @JK_CHANNEL_APR_SOCKET@ ${JK}jk_channel_jni${OEXT}
${JK}jk_channel_socket${OEXT} ${JK}jk_config${OEXT} ${JK}jk_endpoint${OEXT}
${JK}jk_env${OEXT} ${JK}jk_handler_logon${OEXT} ${JK}jk_handler_response${OEXT}
${JK}jk_logger_file${OEXT} ${JK}jk_map${OEXT} ${JK}jk_md5${OEXT}
${JK}jk_msg_ajp${OEXT} ${JK}jk_nwmain${OEXT} ${JK}jk_objCache${OEXT}
${JK}jk_pool${OEXT} @JK_POOL_APR@ ${JK}jk_registry${OEXT} ${JK}jk_requtil${OEXT}
${JK}jk_shm${OEXT} ${JK}jk_uriEnv${OEXT} ${JK}jk_uriMap${OEXT}
${JK}jk_vm_default${OEXT} ${JK}jk_worker_ajp13${OEXT} ${JK}jk_workerEnv${OEXT}
${JK}jk_worker_jni${OEXT} ${JK}jk_worker_lb${OEXT} ${JK}jk_worker_run${OEXT}
${JK}jk_worker_status${OEXT}
@MAKE_DYNAMIC_APACHE_TRUE@OEXT = .lo
