Author: rjung
Date: Mon Oct  6 21:35:14 2014
New Revision: 1629768

URL: http://svn.apache.org/r1629768
Log:
BZ57060: Alow building out of source tree.
Patch contributed by Petr Sumbera.
Modified:
    tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in
    tomcat/jk/trunk/native/apache-1.3/Makefile.in
    tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in
    tomcat/jk/trunk/native/apache-2.0/Makefile.in
    tomcat/jk/trunk/native/common/Makefile.in
    tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in?rev=1629768&r1=1629767&r2=1629768&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in (original)
+++ tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in Mon Oct  6 21:35:14 2014
@@ -15,21 +15,24 @@
 
 ## configure should make the Makefile out of this file.
 
+srcdir=@srcdir@
+top_srcdir=@top_srcdir@
+top_builddir=@top_builddir@
 APXS=@APXS@
 APXSLDFLAGS=@APXSLDFLAGS@
 APXSCFLAGS=@APXSCFLAGS@
 
-JK=../common/
-JK_INCL=-DUSE_APACHE_MD5 -I ${JK}
+COMMON=common
+JK_INCL=-DUSE_APACHE_MD5 -I${top_builddir}/${COMMON} -I ${top_srcdir}/${COMMON}
 
 ## read the object (.c) from the list file.
 OEXT=.c
-include ../common/list.mk
+include @top_srcdir@/common/list.mk
 
 all: mod_jk.so
 
 mod_jk.so:
-       $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${APXSLDFLAGS} mod_jk.c 
${APACHE_OBJECTS}
+        $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${APXSLDFLAGS} 
${srcdir}/mod_jk.c ${APACHE_OBJECTS}
 
 clean:
        rm -f *.o *.lo *.a *.la *.so *.so.* *.slo

Modified: tomcat/jk/trunk/native/apache-1.3/Makefile.in
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/Makefile.in?rev=1629768&r1=1629767&r2=1629768&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/Makefile.in (original)
+++ tomcat/jk/trunk/native/apache-1.3/Makefile.in Mon Oct  6 21:35:14 2014
@@ -18,6 +18,8 @@
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
+top_builddir=@top_builddir@
+
 VPATH=@srcdir@
 APXS=@APXS@
 CP=@CP@
@@ -28,17 +30,13 @@ LIBTOOL=@LIBTOOL@
 CP=@CP@
 CC=@CC@
 
-top_builddir=..
-
 OEXT=.lo
 libexecdir=${APACHE_DIR}/libexec
-JK_DIR := ..
-BUILD_DIR = ${JK_DIR}/../build/jk/apache13
 
 APACHE_FILES = Makefile.tmpl Makefile.libdir libjk.module
 
-JK=../common/
-JK_INCL=-DUSE_APACHE_MD5 -I ${top_srcdir}/common
+COMMON=common
+JK_INCL=-DUSE_APACHE_MD5 -I${top_builddir}/${COMMON} -I ${top_srcdir}/${COMMON}
 APACHE_CFLAGS=@apache_include@ @APXSCFLAGS@ @APXSCPPFLAGS@ 
-I${top_srcdir}/common
 
 # Compile commands
@@ -47,7 +45,7 @@ COMPILE    = $(CC)
 SH_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) $(JK_CFLAGS)
 MOD_LINK   = $(LIBTOOL) --mode=link $(CC) @APXSLDFLAGS@
 
-include ../common/list.mk
+include @top_srcdir@/common/list.mk
 
 all: @LIB_JK_TYPE@
 
@@ -100,13 +98,13 @@ mod_jk.a: mod_jk.lo $(APACHE_OBJECTS)
         ${MOD_LINK} -o $@ $^
 
 mod_jk.so: mod_jk.la
-       ../scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_jk.la `pwd`
+       @top_srcdir@/scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_jk.la 
`pwd`
 
 #
 # Common part.
 #
-mod_jk.lo: mod_jk.c
-       ${SH_COMPILE} -c mod_jk.c -o $@
+mod_jk.lo: ${srcdir}/mod_jk.c
+       ${LT_COMPILE}
 
 .c.lo:
        ${SH_COMPILE} -c $< -o $@

Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in?rev=1629768&r1=1629767&r2=1629768&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in (original)
+++ tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in Mon Oct  6 21:35:14 2014
@@ -15,21 +15,24 @@
 
 ## configure should make the Makefile out of this file.
 
+srcdir=@srcdir@
+top_srcdir=@top_srcdir@
+top_builddir=@top_builddir@
 APXS=@APXS@
 APXSLDFLAGS=@APXSLDFLAGS@
 APXSCFLAGS=@APXSCFLAGS@
 
-JK=../common/
-JK_INCL=-DUSE_APACHE_MD5 -I ${JK}
+COMMON=common
+JK_INCL=-DUSE_APACHE_MD5 -I${top_builddir}/${COMMON} -I ${top_srcdir}/${COMMON}
 
 ## read the object (.c) from the list file.
 OEXT=.c
-include ../common/list.mk
+include @top_srcdir@/common/list.mk
 
 all: mod_jk.la
 
 mod_jk.la:
-       $(APXS)  -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${APXSLDFLAGS} 
mod_jk.c ${APACHE_OBJECTS}
+       $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${APXSLDFLAGS} 
${srcdir}/mod_jk.c ${APACHE_OBJECTS}
 
 install: mod_jk.la
        $(APXS) -i mod_jk.la

Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.in
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.in?rev=1629768&r1=1629767&r2=1629768&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/Makefile.in (original)
+++ tomcat/jk/trunk/native/apache-2.0/Makefile.in Mon Oct  6 21:35:14 2014
@@ -15,6 +15,9 @@
 
 ##
 
+srcdir=@srcdir@
+top_srcdir=@top_srcdir@
+top_builddir=@top_builddir@
 APXS=@APXS@
 CP=@CP@
 APACHE_DIR=@APACHE_DIR@
@@ -36,20 +39,20 @@ include ../common/list.mk
 include @APACHE_CONFIG_VARS@
 
 # Local settings ( overriding/appending to Apache's )
-COMMON=../common
-JK_INCL=-DUSE_APACHE_MD5 -I ${COMMON}
+COMMON=common
+JK_INCL=-DUSE_APACHE_MD5 -I${top_builddir}/${COMMON} -I ${top_srcdir}/${COMMON}
 CFLAGS=@apache_include@ @CFLAGS@ ${JK_INCL} ${APXSCPPFLAGS} ${APXSCFLAGS} 
${EXTRA_CFLAGS} ${EXTRA_CPPFLAGS}
 
 
 # Implicit rules
-include ../scripts/build/rules.mk
+include @top_srcdir@/scripts/build/rules.mk
 
 OEXT=.lo
 
 all: Makefile @LIB_JK_TYPE@
 install: @INSTALL_TYPE@
 
-Makefile: Makefile.in
+Makefile: ${srcdir}/Makefile.in
        echo Regenerating Makefile
        ( cd ..; ./config.status )
 
@@ -74,11 +77,14 @@ install_static:
 #################### Dynamic .so file ####################
 # APXS will compile every file, this is derived from apxs
 
+mod_jk.lo: ${srcdir}/mod_jk.c
+       ${LT_COMPILE}
+
 mod_jk.la: mod_jk.lo $(APACHE_OBJECTS)
        $(LIBTOOL) --mode=link ${COMPILE} $(APXSLDFLAGS) -o $@ -module -rpath 
${libexecdir} -avoid-version mod_jk.lo $(APACHE_OBJECTS)
 
 mod_jk.so: mod_jk.la
-       ../scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_jk.la `pwd`
+       @top_srcdir@/scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_jk.la 
`pwd`
 
 install_dynamic:
        @echo ""

Modified: tomcat/jk/trunk/native/common/Makefile.in
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/Makefile.in?rev=1629768&r1=1629767&r2=1629768&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/Makefile.in (original)
+++ tomcat/jk/trunk/native/common/Makefile.in Mon Oct  6 21:35:14 2014
@@ -31,7 +31,7 @@ CC = @CC@
 OEXT=.lo
 include list.mk
 
-CFLAGS=@apache_include@ @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS}
+CFLAGS=-I. @apache_include@ @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS}
 
 include @top_srcdir@/scripts/build/rules.mk
 

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1629768&r1=1629767&r2=1629768&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Oct  6 21:35:14 2014
@@ -45,6 +45,10 @@
   <subsection name="Native">
     <changelog>
       <fix>
+        <bug>57060</bug>: Alow building out of source tree.
+        Patch contributed by Petr Sumbera. (rjung)
+      </fix>
+      <fix>
         <bug>56703</bug>: Status: Fix inflated counter for current number
         of backend connections especially when a connection timeout occured
         on the backend. (rjung)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to