Author: rjung
Date: Sat Dec 20 19:32:28 2014
New Revision: 1647040
URL: http://svn.apache.org/r1647040
Log:
Make building module for Apache 1.3 and 2.x more
consistent.
Fix SHELL use in Makefiles for platforms with
basic /bin/sh (like Soalris).
More out of tree build fixes.
Modified:
tomcat/jk/trunk/native/apache-1.3/Makefile.in
tomcat/jk/trunk/native/apache-2.0/Makefile.in
tomcat/jk/trunk/native/common/Makefile.in
tomcat/jk/trunk/native/configure.ac
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=1647040&r1=1647039&r2=1647040&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/Makefile.in (original)
+++ tomcat/jk/trunk/native/apache-1.3/Makefile.in Sat Dec 20 19:32:28 2014
@@ -13,48 +13,51 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
-## configure should make the Makefile out of this file.
-
srcdir=@srcdir@
top_srcdir=@top_srcdir@
top_builddir=@top_builddir@
-
-VPATH=@srcdir@
APXS=@APXS@
CP=@CP@
APACHE_DIR=@APACHE_DIR@
MKDIR=@MKDIR@
-DESTDIR=@APACHE_DIR@
-LIBTOOL=@LIBTOOL@
-CP=@CP@
+APXSCFLAGS=@APXSCFLAGS@
+APXSCPPFLAGS=@APXSCPPFLAGS@
+APXSLDFLAGS=@APXSLDFLAGS@
CC=@CC@
+SHELL=@SHELL@
-OEXT=.lo
+# Defaults
libexecdir=${APACHE_DIR}/libexec
-APACHE_FILES = Makefile.tmpl Makefile.libdir libjk.module
+JK=${top_builddir}/common/
+# Defines APACHE_OBJECTS - the list of all common files
+include ${top_builddir}/common/list.mk
+
+# Apache settings, values guessed by Apache config and used to build it
+# Will define libexecdir, LIBTOOL, etc
+include @APACHE_CONFIG_VARS@
+# Local settings ( overriding/appending to Apache's )
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
+CFLAGS=@apache_include@ @CFLAGS@ ${JK_INCL} ${APXSCPPFLAGS} ${APXSCFLAGS}
${EXTRA_CFLAGS} ${EXTRA_CPPFLAGS}
-# Compile commands
-JK_CFLAGS = $(JK_INCL) $(APACHE_CFLAGS)
-COMPILE = $(CC)
-SH_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) $(JK_CFLAGS)
-MOD_LINK = $(LIBTOOL) --mode=link $(CC) @APXSLDFLAGS@
-JK=${top_builddir}/common/
-include @top_builddir@/common/list.mk
+# Implicit rules
+include ${top_srcdir}/scripts/build/rules.mk
-all: @LIB_JK_TYPE@
+OEXT=.lo
-#
-# install part
-#
+all: Makefile @LIB_JK_TYPE@
install: @INSTALL_TYPE@
+Makefile: ${srcdir}/Makefile.in
+ echo Regenerating Makefile
+ ( cd ..; ./config.status )
+
+lib_jk.la: mod_jk.lo ${APACHE_OBJECTS}
+ $(LIBTOOL) --mode=link $(CC) -o lib_jk.la -static -rpath
${libexecdir}/jk mod_jk.lo $(APACHE_OBJECTS)
+
install_static: mod_jk.a
@echo ""
@echo "Copying files to Apache Modules Directory..."
@@ -74,38 +77,34 @@ install_static: mod_jk.a
@echo " --disable-shared=dir"
@echo "make"
@echo ""
-install_dynamic: mod_jk.la
- @echo ""
- @echo "Copying files to Apache libexec Directory..."
- ${LIBTOOL} --mode=install ${CP} $< ${libexecdir}/mod_jk.so
-#
-# Clean part.
-#
-clean:
- rm -f *.o *.lo *.a *.la *.so *.so.* *.slo
- rm -rf .libs
+#################### Dynamic .so file ####################
+# APXS will compile every file, this is derived from apxs
-maintainer-clean: clean
+mod_jk.a: mod_jk.lo $(APACHE_OBJECTS)
+ $(LIBTOOL) --mode=link ${COMPILE} $(APXSLDFLAGS) -o $@ mod_jk.lo
$(APACHE_OBJECTS)
-distclean: clean
+mod_jk.lo: ${srcdir}/mod_jk.c
+ ${LT_COMPILE}
-#
-# Compile part.
-#
mod_jk.la: mod_jk.lo $(APACHE_OBJECTS)
- ${MOD_LINK} -o $@ -module -rpath ${libexecdir} $^
-mod_jk.a: mod_jk.lo $(APACHE_OBJECTS)
- ${MOD_LINK} -o $@ $^
+ $(LIBTOOL) --mode=link ${COMPILE} $(APXSLDFLAGS) -o $@ -module -rpath
${libexecdir} -avoid-version mod_jk.lo $(APACHE_OBJECTS)
mod_jk.so: mod_jk.la
- @top_srcdir@/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: ${srcdir}/mod_jk.c
- ${LT_COMPILE}
+install_dynamic:
+ @echo ""
+ @echo "Installing files to Apache Modules Directory..."
+ $(APXS) -i mod_jk.la
+ @echo ""
+ @echo "Please be sure to arrange ${APACHE_DIR}/conf/httpd.conf..."
+ @echo ""
+
+clean:
+ rm -f *.o *.lo *.a *.la *.so *.so.* *.slo
+ rm -rf .libs
+
+maintainer-clean: clean
-.c.lo:
- ${SH_COMPILE} -c $< -o $@
+distclean: clean
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=1647040&r1=1647039&r2=1647040&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/Makefile.in (original)
+++ tomcat/jk/trunk/native/apache-2.0/Makefile.in Sat Dec 20 19:32:28 2014
@@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-##
-
srcdir=@srcdir@
top_srcdir=@top_srcdir@
top_builddir=@top_builddir@
@@ -26,15 +24,16 @@ APXSCFLAGS=@APXSCFLAGS@
APXSCPPFLAGS=@APXSCPPFLAGS@
APXSLDFLAGS=@APXSLDFLAGS@
CC=@CC@
+SHELL=@SHELL@
# Defaults
libexecdir=${APACHE_DIR}/modules
-JK=../common/
+JK=${top_builddir}/common/
# Defines APACHE_OBJECTS - the list of all common files
-include @top_builddir/common/list.mk
+include ${top_builddir}/common/list.mk
-# Apache2 settings, values guessed by Apache config and used to build it
+# Apache settings, values guessed by Apache config and used to build it
# Will define libexecdir, LIBTOOL, etc
include @APACHE_CONFIG_VARS@
@@ -45,7 +44,7 @@ CFLAGS=@apache_include@ @CFLAGS@ ${JK_IN
# Implicit rules
-include @top_srcdir@/scripts/build/rules.mk
+include ${top_srcdir}/scripts/build/rules.mk
OEXT=.lo
@@ -84,7 +83,7 @@ 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
- @top_srcdir@/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=1647040&r1=1647039&r2=1647040&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/Makefile.in (original)
+++ tomcat/jk/trunk/native/common/Makefile.in Sat Dec 20 19:32:28 2014
@@ -22,6 +22,7 @@ exec_prefix = @exec_prefix@
APXSLDFLAGS=@APXSLDFLAGS@
APXSCFLAGS=@APXSCFLAGS@
APXSCPPFLAGS=@APXSCPPFLAGS@
+SHELL=@SHELL@
top_builddir = ..
Modified: tomcat/jk/trunk/native/configure.ac
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.ac?rev=1647040&r1=1647039&r2=1647040&view=diff
==============================================================================
--- tomcat/jk/trunk/native/configure.ac (original)
+++ tomcat/jk/trunk/native/configure.ac Sat Dec 20 19:32:28 2014
@@ -63,7 +63,9 @@ dnl Mark that we have generated config.h
CFLAGS="${CFLAGS} -DHAVE_CONFIG_H"
AC_SUBST(CFLAGS)
-APACHE_CONFIG_VARS=`pwd`/scripts/build/config_vars.mk
+configure_dir=`dirname $0`
+configure_dir=`cd $configure_dir; pwd`
+APACHE_CONFIG_VARS=$configure_dir/scripts/build/config_vars.mk
WEBSERVER=""
apache_dir=""
apache_include=""
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
