tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 Makefile.apxs.in Makefile.in
Date Thu, 16 May 2002 23:50:12 GMT
costin      02/05/16 16:50:12

  Modified:    jk/native2/server/apache13 Makefile.apxs.in Makefile.in
  Log:
  Apache1.3 doesn't use java, and we don't compile jkjni in this case.
  
  jkjni.so is used from Java, not from Apache - we'll build a single
  version of jkjni.so using APR.
  
  Curently the Makefile for Apache2 will create jkjni.so, but we should
  split it too.
  
  Revision  Changes    Path
  1.2       +1 -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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.apxs.in	7 May 2002 15:57:36 -0000	1.1
  +++ Makefile.apxs.in	16 May 2002 23:50:12 -0000	1.2
  @@ -8,7 +8,7 @@
   
   JK=../../common/
   JKINC=../../include/
  -JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC}
  +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
   
  
  
  
  1.3       +3 -17     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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.in	14 May 2002 11:21:46 -0000	1.2
  +++ Makefile.in	16 May 2002 23:50:12 -0000	1.3
  @@ -3,15 +3,11 @@
   
   APACHE_HOME=@APACHE_HOME@
   OS=@OS@
  -JAVA_HOME=@JAVA_HOME@
   APACHE_INCL=@APACHE_INCL@
   APR_INCL=@APR_INCL@
   EXTRA_CFLAGS=@EXTRA_CFLAGS@
   EXTRA_CPPFLAGS=@EXTRA_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
  -
   JK_DIR := ../..
   BUILD_DIR = ${JK_DIR}/../build/jk2/apache13
   
  @@ -20,10 +16,9 @@
   # It doesn't hurt if we include all
   INCLUDES= -I${JK_DIR}/include \
             ${APACHE_INCL} \
  -          ${APR_INCL} \
  -          ${JAVA_INCL}
  +          ${APR_INCL} 
   
  -JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 @HAS_APR@ -DHAVE_JNI @APR_INCL@
  +JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 @HAS_APR@ @APR_INCL@ -DHAVE_MMAP
   JK_LDFLAGS=-L${APACHE_HOME}/lib -lcrypt @APR_LDFLAGS@
   
   ###### Based on rules.mk ##########################################
  @@ -46,14 +41,11 @@
   # Excludes are not yet implemented.
   
   COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
  -JNI_C_FILES := $(wildcard ${JK_DIR}/jni/*.c )
   A_C_FILES := $(wildcard ${JK_DIR}/server/apache13/*.c )
   H_FILES := $(wildcard ${JK_DIR}/include/*.h )
   
   COMMON_LO_FILES := $(patsubst ${JK_DIR}/common/%, ${BUILD_DIR}/%, \
   			 $(patsubst %c, %lo, ${COMMON_C_FILES} ))
  -JNI_LO_FILES := $(patsubst ${JK_DIR}/jni/%, ${BUILD_DIR}/%, \
  -			 $(patsubst %c, %lo, ${JNI_C_FILES} ))
   A_LO_FILES := $(patsubst ${JK_DIR}/server/apache13/%, ${BUILD_DIR}/%, \
   			 $(patsubst %c, %lo, ${A_C_FILES} ))
   
  @@ -71,19 +63,13 @@
   ${BUILD_DIR}/%.lo: ${JK_DIR}/common/%.c
   	 ${SH_COMPILE} -c $< -o $@
   
  -${BUILD_DIR}/%.lo: ${JK_DIR}/jni/%.c
  -	 ${SH_COMPILE} -c $< -o $@
  -
   ${BUILD_DIR}/%.lo: ${JK_DIR}/server/apache13/%.c
   	 ${SH_COMPILE} -c $< -o $@
   
   
   # ---------- Targets -------------------- 
   
  -all: prepare ${BUILD_DIR}/mod_jk2.so ${BUILD_DIR}/jkjni.so
  -
  -${BUILD_DIR}/jkjni.so: ${JNI_LO_FILES}
  -	$(MOD_LINK) -o $@ $^
  +all: prepare ${BUILD_DIR}/mod_jk2.so 
   
   ${BUILD_DIR}/mod_jk2.so: ${COMMON_LO_FILES} ${A_LO_FILES}
   	${MOD_LINK} -o $@ $^ @APR_LIB_STATIC@
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message