costin 01/10/25 13:14:18
Modified: jk/native/apache-2.0 Makefile.in
Log:
I changed the build for .so module from apxs to libtool.
The problem with apxs is that it recompiles _every_ .c file - if that's what
we want you don't need make.
Also make sure java is included corectly.
If someone can check I didn't make something stupid, it would be great.
Revision Changes Path
1.9 +15 -5 jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 2001/10/17 19:57:25 1.8
+++ Makefile.in 2001/10/25 20:14:18 1.9
@@ -11,16 +11,17 @@
JK=../common
JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -DHAVE_JNI
-CFLAGS=@apache_include@ @CFLAGS@ ${JK_INCL}
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
+CFLAGS=@apache_include@ @CFLAGS@ ${JK_INCL} ${JAVA_INCL} -D_REENTRANT -Wall
include ../common/list.mk
include ../scripts/build/rules.mk
+#include ${APACHE_DIR}/build/config_vars.mk
-OEXT=@APACHE20_OEXT@
+# OEXT=@APACHE20_OEXT@
+OEXT=.lo
-
all: @LIB_JK_TYPE@
install: @INSTALL_TYPE@
@@ -41,9 +42,17 @@
@echo "./configure --with-mod_jk=static"
@echo "make"
@echo ""
+
+#################### Dynamic .so file ####################
+# APXS will compile every file, this is derived from apxs
+
+mod_jk.la: mod_jk.lo $(APACHE_OBJECTS)
+ $(LIBTOOL) --mode=link ${COMPILE} -o $@ -module -avoid-version $<
+
+#$(APXS) ${JK_INCL} ${JAVA_INCL} -c -o mod_jk.la mod_jk.c $(APACHE_OBJECTS)
-mod_jk.so: mod_jk.c $(APACHE_OBJECTS)
- $(APXS) ${JK_INCL} ${JAVA_INCL} -c -o mod_jk.la mod_jk.c $(APACHE_OBJECTS)
+mod_jk.so: mod_jk.la
+ cp $< $@
install_dynamic:
@echo ""
@@ -54,5 +63,6 @@
@echo ""
clean:
+ (cd ../common && $(MAKE) clean)
rm -f *.o *.so *.lo *.la *.slo
rm -rf .libs
