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 Changes Path
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 -0000 1.3
+++ Makefile.apxs.in 24 May 2002 07:21:24 -0000 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 -0000 1.3
+++ Makefile.in 24 May 2002 07:21:24 -0000 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 -0000 1.3
+++ Makefile.apxs.in 24 May 2002 07:21:24 -0000 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 ${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
+
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:
- $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" "${JAVA_INCL}"
"${APXSLDFLAGS}" mod_jk2.c ${APACHE2_OBJECTS} ${APACHE_OBJECTS}
+ $(APXS) -c -o $@ -Wc,"${JK_INCL}" "${JAVA_INCL}" mod_jk2.c ${APACHE2_OBJECTS}
${COMMON_OBJECTS} ${COMMON_APR_OBJECTS}
install: mod_jk2.la
$(APXS) -i mod_jk2.la
1.4 +9 -9 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in 17 May 2002 00:31:55 -0000 1.3
+++ Makefile.in 24 May 2002 07:21:24 -0000 1.4
@@ -1,13 +1,13 @@
# Gnu makefile and libtool are required
# use -D options to overrides defaults
-APACHE_HOME=@APACHE_HOME@
+APACHE2_HOME=@APACHE2_HOME@
OS=@OS@
JAVA_HOME=@JAVA_HOME@
-APACHE_INCL=@APACHE_INCL@
-APR_INCL=@APR_INCL@
-EXTRA_CFLAGS=@EXTRA_CFLAGS@
-EXTRA_CPPFLAGS=@EXTRA_CPPFLAGS@
+APACHE2_INCL=@APACHE2_INCL@
+APR_INCL=@APR_CFLAGS@
+EXTRA_CFLAGS=@APXS2_CFLAGS@
+EXTRA_CPPFLAGS=@APXS2_CPPFLAGS@
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
@@ -17,21 +17,21 @@
# Extract EXTRA_CFLAGS and EXTRA_CPPFLAGS - same flags used during apache2
# compilation
-#include ${APACHE_HOME}/build/config_vars.mk
+#include ${APACHE2_HOME}/build/config_vars.mk
# Yes, we use the same properties file as ant
#include ../../../build.properties
-LIBTOOL=${APACHE_HOME}/build/libtool
+LIBTOOL=${APACHE2_HOME}/build/libtool
# It doesn't hurt if we include all
INCLUDES= -I${JK_DIR}/include \
- ${APACHE_INCL} \
+ ${APACHE2_INCL} \
${APR_INCL} \
${JAVA_INCL}
JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR -DHAVE_JNI
-JK_LDFLAGS=-L${APACHE_HOME}/lib -lapr -lcrypt
+JK_LDFLAGS=-L${APACHE2_HOME}/lib -lapr -lcrypt
###### Based on rules.mk ##########################################
ALL_CFLAGS = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
