hgomez 2002/12/11 02:38:52 Modified: jk/native/apache-1.3 Makefile.in jk/native/common Makefile.in Log: Update makefiles Revision Changes Path 1.8 +5 -4 jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile.in 6 Sep 2002 14:42:54 -0000 1.7 +++ Makefile.in 11 Dec 2002 10:38:51 -0000 1.8 @@ -1,6 +1,9 @@ ## configure should make the Makefile out of this file. +srcdir=@srcdir@ +top_srcdir=@top_srcdir@ +VPATH=@srcdir@ APXS=@APXS@ OS=@OS@ JAVA_HOME=@JAVA_HOME@ @@ -17,14 +20,12 @@ JK_DIR := .. BUILD_DIR = ${JK_DIR}/../build/jk/apache13 -#VPATH=.:../common APACHE_FILES = Makefile.tmpl Makefile.libdir libjk.module -JK=../common/ -JK_INCL=-DUSE_APACHE_MD5 -I ${JK} +JK_INCL=-DUSE_APACHE_MD5 -I ${top_srcdir}/common 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 -APACHE_CFLAGS=@apache_include@ @APXSCFLAGS@ @APXSCPPFLAGS@ -I../common +APACHE_CFLAGS=@apache_include@ @APXSCFLAGS@ @APXSCPPFLAGS@ -I${top_srcdir}/common # Compile commands JK_CFLAGS = $(JK_INCL) $(JAVA_INCL) $(APACHE_CFLAGS) 1.10 +1 -1 jakarta-tomcat-connectors/jk/native/common/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile.in 27 Jun 2002 14:34:18 -0000 1.9 +++ Makefile.in 11 Dec 2002 10:38:52 -0000 1.10 @@ -19,7 +19,7 @@ JAVA_INCL=-I @JAVA_HOME@/include -I @JAVA_HOME@/include/@OS@ CFLAGS=@apache_include@ @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS} ${JAVA_INCL} -include ../scripts/build/rules.mk +include @top_srcdir@/scripts/build/rules.mk JK=./
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>