hgomez 01/05/21 08:07:14
Modified: jk/src/native/apache-1.3 Makefile.freebsd Makefile.in
Makefile.linux Makefile.nw
Log:
Updated Makefile fro ajp14/md5 build
Revision Changes Path
1.3 +4 -4
jakarta-tomcat-connectors/jk/src/native/apache-1.3/Makefile.freebsd
Index: Makefile.freebsd
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/src/native/apache-1.3/Makefile.freebsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.freebsd 2001/05/18 14:47:35 1.2
+++ Makefile.freebsd 2001/05/21 15:06:57 1.3
@@ -9,12 +9,12 @@
## I assume this one is set up already
# JAVA_HOME=
+JK=../common/
+JK_INCL=-I ${JK} -DUSE_APACHE_MD5
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
-
CFLAGS=-DHAVE_CONFIG_H -g -fpic -DSHARED_MODULE -O2 -D_REENTRANT -pthread -DLINUX
-Wall
-JK=../common/
SRCS=jk_ajp12_worker.c jk_connect.c jk_msg_buff.c jk_util.c jk_ajp13.c \
jk_jni_worker.c jk_pool.c jk_worker.c jk_ajp13_worker.c jk_lb_worker.c \
jk_sockbuf.c jk_map.c jk_uri_worker_map.c jk_ajp14.c jk_ajp14_worker.c \
@@ -24,10 +24,10 @@
OBJS=${patsubst %.c,%.o,${SRCS}}
%.o: ../common/%.c
- ${CC} -c ${CFLAGS} ${JAVA_INCL} ${A13_FLAGS} $< -o $@
+ ${CC} -c ${CFLAGS} ${JAVA_INCL} ${JK_INCL} ${A13_FLAGS} $< -o $@
.c.o:
- ${APXS} -c ${JAVA_INCL} -DFREEBSD ${A13_FLAGS} -I../common $<
+ ${APXS} -c ${JAVA_INCL} ${JK_INCL} -DFREEBSD ${A13_FLAGS} -I../common $<
all: mod_jk.so
1.3 +3 -2 jakarta-tomcat-connectors/jk/src/native/apache-1.3/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/apache-1.3/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 2001/05/18 14:47:37 1.2
+++ Makefile.in 2001/05/21 15:06:59 1.3
@@ -4,10 +4,11 @@
OS=@OS@
JAVA_HOME=@JAVA_HOME@
+JK=../common
+JK_INCL=-DUSE_APACHE_MD5 -I ${JK}
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
-JK=../common/
SRCS=${JK}/jk_ajp12_worker.c ${JK}/jk_connect.c ${JK}/jk_msg_buff.c ${JK}/jk_util.c
${JK}/jk_ajp13.c \
${JK}/jk_jni_worker.c ${JK}/jk_pool.c ${JK}/jk_worker.c
${JK}/jk_ajp13_worker.c ${JK}/jk_lb_worker.c \
${JK}/jk_sockbuf.c ${JK}/jk_map.c ${JK}/jk_uri_worker_map.c ${JK}/jk_ajp14.c
${JK}/jk_ajp14_worker.c \
@@ -16,7 +17,7 @@
all: mod_jk.so
mod_jk.so:
- $(APXS) -I ${JK} ${JAVA_INCL} -c -o $@ mod_jk.c $(SRCS)
+ $(APXS) ${JK_INCL} ${JAVA_INCL} -c -o $@ mod_jk.c $(SRCS)
clean:
rm *.o *.so
1.3 +4 -3
jakarta-tomcat-connectors/jk/src/native/apache-1.3/Makefile.linux
Index: Makefile.linux
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/src/native/apache-1.3/Makefile.linux,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.linux 2001/05/18 14:47:38 1.2
+++ Makefile.linux 2001/05/21 15:07:01 1.3
@@ -4,13 +4,14 @@
# JAVA_HOME=
OS=linux
-JAVA_INCL=-DUSE_APACHE_MD5 -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
+JK=../common/
+JK_INCL=-I ${JK} -DUSE_APACHE_MD5
+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
#ifndef APXS
APXS=/usr/sbin/apxs
#endif
-JK=../common/
SRCS=${JK}/jk_ajp12_worker.c ${JK}/jk_connect.c ${JK}/jk_msg_buff.c ${JK}/jk_util.c
${JK}/jk_ajp13.c \
${JK}/jk_jni_worker.c ${JK}/jk_pool.c ${JK}/jk_worker.c
${JK}/jk_ajp13_worker.c ${JK}/jk_lb_worker.c \
${JK}/jk_sockbuf.c ${JK}/jk_map.c ${JK}/jk_uri_worker_map.c ${JK}/jk_ajp14.c
${JK}/jk_ajp14_worker.c \
@@ -20,7 +21,7 @@
all: mod_jk.so
mod_jk.so:
- $(APXS) -I ${JK} ${JAVA_INCL} -c -o $@ mod_jk.c $(SRCS)
+ $(APXS) ${JK_INCL} ${JAVA_INCL} -c -o $@ mod_jk.c $(SRCS)
clean:
rm *.o *.so
1.4 +3 -0 jakarta-tomcat-connectors/jk/src/native/apache-1.3/Makefile.nw
Index: Makefile.nw
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/apache-1.3/Makefile.nw,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.nw 2001/05/18 20:53:20 1.3
+++ Makefile.nw 2001/05/21 15:07:03 1.4
@@ -50,6 +50,9 @@
jk_worker.obj \
mod_jk.obj \
jk_nwmain.obj \
+ jk_ajp14.obj \
+ jk_ajp14_worker.obj \
+ jk_md5.obj
all: $(NLM_NAME).nlm
