You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by hg...@apache.org on 2001/05/21 17:18:58 UTC

cvs commit: jakarta-tomcat-connectors/jk/src/native/apache-2.0 Makefile.in Makefile.linux

hgomez      01/05/21 08:18:58

  Modified:    jk/src/native/apache-2.0 Makefile.in Makefile.linux
  Log:
  Updated Makefile for ajp14 and md5 support
  
  Revision  Changes    Path
  1.3       +3 -2      jakarta-tomcat-connectors/jk/src/native/apache-2.0/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/apache-2.0/Makefile.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.in	2001/05/18 14:38:47	1.2
  +++ Makefile.in	2001/05/21 15:18:50	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 \
  @@ -21,7 +22,7 @@
   all: mod_jk.so
   
   mod_jk.so: 
  -	$(APXS) -I ${JK} ${JAVA_INCL} -c -o mod_jk.la mod_jk.c $(SRCS) 
  +	$(APXS) ${JK_INCL} ${JAVA_INCL} -c -o mod_jk.la mod_jk.c $(SRCS) 
   	mv .libs/mod_jk.so .
   
   clean:
  
  
  
  1.3       +3 -2      jakarta-tomcat-connectors/jk/src/native/apache-2.0/Makefile.linux
  
  Index: Makefile.linux
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/apache-2.0/Makefile.linux,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.linux	2001/05/18 14:38:49	1.2
  +++ Makefile.linux	2001/05/21 15:18:52	1.3
  @@ -3,7 +3,9 @@
   ## I assume this one is set up already
   # JAVA_HOME=
   OS=linux
  +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
   
  @@ -16,7 +18,6 @@
   APXS=/usr/sbin/apxs2
   #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 \
  @@ -30,7 +31,7 @@
   all: mod_jk.so
   
   mod_jk.so: 
  -	$(APXS) -I ${JK} ${JAVA_INCL} -c -o mod_jk.la mod_jk.c $(SRCS) 
  +	$(APXS) ${JK_INCL} ${JAVA_INCL} -c -o mod_jk.la mod_jk.c $(SRCS) 
   	mv .libs/mod_jk.so .
   
   clean: