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 Changes Path
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 -0000 1.6
+++ Makefile.apxs.in 5 Feb 2004 17:40:22 -0000 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 -0000 1.8
+++ Makefile.in 5 Feb 2004 17:40:22 -0000 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 -0000 1.6
+++ Makefile.apxs.in 5 Feb 2004 17:40:22 -0000 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 -0000 1.14
+++ Makefile.in 5 Feb 2004 17:40:22 -0000 1.15
@@ -1,5 +1,7 @@
# Gnu makefile and libtool are required
# use -D options to overrides defaults
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -10,10 +12,11 @@
[EMAIL PROTECTED]@ @APR_UTIL_INCDIR@ @APR_INCDIR@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+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
JK_DIR := ../..
BUILD_DIR = ${JK_DIR}/../build/jk2/apache2
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
