hgomez 02/05/13 03:15:34
Added: jk/native2/server/apache13 Makefile.am
jk/native2/server/apache2 Makefile.am
Log:
Initial add for automake stuff.
Should certainly be reworked in separate Makefiles
for dynamic and static
Revision Changes Path
1.1 jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.am
Index: Makefile.am
===================================================================
## configure should make the Makefile out of this file.
APXS=@APXS@
OS=@OS@
JAVA_HOME=@JAVA_HOME@
CP=@CP@
APACHE_DIR=@APACHE_DIR@
MKDIR=@MKDIR@
DESTDIR=@APACHE_DIR@
libdir=/libexec
#VPATH=.:../common
APACHE_FILES = Makefile.tmpl Makefile.libdir libjk2.module
JK=../../common/
JKINC=../../include/
JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} @HAS_APR@
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
AM_CFLAGS=@apache_include@ -I../common ${JK_INCL}
include ../../common/list.mk.in
if MAKE_DYNAMIC_APACHE
OEXT=.lo
lib_LTLIBRARIES = libjk2.la
libjk2_la_SOURCES = mod_jk2.c
libjk2_la_LIBADD = $(APACHE_OBJECTS)
all: mod_jk2.so
mod_jk2.la: mod_jk2.lo $(APACHE_OBJECTS)
$(LIBTOOL) --mode=link ${COMPILE} -o $@ -module -rpath ${libexecdir}
-avoid-version mod_jk2.lo $(APACHE_OBJECTS)
mod_jk2.so: mod_jk2.la
$(LIBTOOL) --mode=install cp $< `pwd`/$@
else
OEXT=.o
noinst_LIBRARIES = libjk2.a
libjk2_a_SOURCES = mod_jk2.c
libjk2_a_LIBADD = $(APACHE_OBJECTS)
install-data-local:
@echo ""
@echo "Copying files to Apache Modules Directory..."
-${MKDIR} ${APACHE_DIR}/src/modules/jk
${CP} ${APACHE_FILES} ${APACHE_DIR}/src/modules/jk
${CP} ${noinst_LIBRARIES} ${APACHE_DIR}/src/modules/jk
@echo ""
@echo "Please be sure to re-compile Apache..."
@echo ""
@echo "cd ${APACHE_DIR}"
@echo "./config.status --activate-module=src/modules/jk/libjk2.a"
@echo "make"
@echo ""
endif
1.1 jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.am
Index: Makefile.am
===================================================================
## configure should make the Makefile out of this file.
APXS=@APXS@
OS=@OS@
JAVA_HOME=@JAVA_HOME@
CP=@CP@
APACHE_DIR=@APACHE_DIR@
MKDIR=@MKDIR@
DESTDIR=@APACHE_DIR@
libdir=/libexec
#VPATH=.:../common
APACHE_FILES = Makefile.tmpl Makefile.libdir libjk2.module
JK=../../common/
JKINC=../../include/
JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} @HAS_APR@
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
AM_CFLAGS=@apache_include@ -I../common ${JK_INCL} ${JAVA_INCL}
include ../../common/list.mk.in
if MAKE_DYNAMIC_APACHE
OEXT=.lo
lib_LTLIBRARIES = libjk2.la
libjk2_la_SOURCES = mod_jk2.c jk_logger_apache2.c jk_map_aprtable.c
jk_service_apache2.c
libjk2_la_LIBADD = $(APACHE_OBJECTS)
all: mod_jk2.so
mod_jk2.la: mod_jk2.lo jk_logger_apache2.lo jk_map_aprtable.lo jk_service_apache2.lo
$(APACHE_OBJECTS)
$(LIBTOOL) --mode=link ${COMPILE} -o $@ -module -rpath ${libexecdir}
-avoid-version mod_jk2.lo \
jk_logger_apache2.lo jk_map_aprtable.lo jk_service_apache2.lo $(APACHE_OBJECTS)
mod_jk2.so: mod_jk2.la jk_logger_apache2.la jk_map_aprtable.la jk_service_apache2.la
$(LIBTOOL) --mode=install cp $< `pwd`/$@
else
OEXT=.o
noinst_LIBRARIES = libjk2.a
libjk2_a_SOURCES = mod_jk2.c jk_logger_apache2.c jk_map_aprtable.c
jk_service_apache2.c
libjk2_a_LIBADD = $(APACHE_OBJECTS)
install-data-local:
@echo ""
@echo "Copying files to Apache Modules Directory..."
-${MKDIR} ${APACHE_DIR}/src/modules/jk
${CP} ${APACHE_FILES} ${APACHE_DIR}/src/modules/jk
${CP} ${noinst_LIBRARIES} ${APACHE_DIR}/src/modules/jk
@echo ""
@echo "Please be sure to re-compile Apache..."
@echo ""
@echo "cd ${APACHE_DIR}"
@echo "./config.status --activate-module=src/modules/jk/libjk2.a"
@echo "make"
@echo ""
endif
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
