Thanks to JF who correct my brutal commit - Henri Gomez ___[_]____ EMAIL : [EMAIL PROTECTED] (. .) PGP KEY : 697ECEDD ...oOOo..(_)..oOOo... PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6
>-----Original Message----- >From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] >Sent: Wednesday, June 05, 2002 4:17 PM >To: [EMAIL PROTECTED] >Subject: cvs commit: >jakarta-tomcat-connectors/jk/native2/server/apache2 >Makefile.in > > >jfclere 2002/06/05 07:16:44 > > Modified: jk/native2/server/apache2 Makefile.in > Log: > use libtool name (*.la) instead native name (*.so). > > Revision Changes Path > 1.8 +10 -3 >jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in > > Index: Makefile.in > =================================================================== > RCS file: >/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/M >akefile.in,v > retrieving revision 1.7 > retrieving revision 1.8 > diff -u -r1.7 -r1.8 > --- Makefile.in 4 Jun 2002 10:33:45 -0000 1.7 > +++ Makefile.in 5 Jun 2002 14:16:44 -0000 1.8 > @@ -9,6 +9,7 @@ > APR_INCL=@APR_CFLAGS@ > EXTRA_CFLAGS=@APXS2_CFLAGS@ > EXTRA_CPPFLAGS=@APXS2_CPPFLAGS@ > +CC=@CC@ > > 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 > @@ -45,7 +46,8 @@ > COMPILE = $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(ALL_INCLUDES) > > SH_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) $(JK_CFLAGS) > -MOD_LINK = $(LIBTOOL) --mode=link $(CC) -module -shared >$(LT_LDFLAGS) $(ALL_LDFLAGS) $(JK_LDFLAGS) > +MOD_LINK = $(LIBTOOL) --mode=link $(CC) -avoid-version >-module -rpath ${APACHE2_HOME}/modules $(LT_LDFLAGS) >$(ALL_LDFLAGS) $(JK_LDFLAGS) > +MOD_INSTALL = $(LIBTOOL) --mode=install $(CP) > > >############################################################### >############## > > @@ -90,10 +92,15 @@ > > all: prepare ${BUILD_DIR}/mod_jk2.so ${BUILD_DIR}/jkjni.so > > -${BUILD_DIR}/jkjni.so: ${JNI_LO_FILES} ${COMMON_LO_FILES} > +${BUILD_DIR}/mod_jk2.so: ${BUILD_DIR}/mod_jk2.la > + $(MOD_INSTALL) cp $^ `pwd`/${BUILD_DIR} > +${BUILD_DIR}/jkjni.so: ${BUILD_DIR}/jkjni.la > + $(MOD_INSTALL) cp $^ `pwd`/${BUILD_DIR} > + > +${BUILD_DIR}/jkjni.la: ${JNI_LO_FILES} ${COMMON_LO_FILES} > $(MOD_LINK) -o $@ $^ > > -${BUILD_DIR}/mod_jk2.so: ${COMMON_LO_FILES} ${JNI_LO_FILES} >${A2_LO_FILES} > +${BUILD_DIR}/mod_jk2.la: ${COMMON_LO_FILES} ${JNI_LO_FILES} >${A2_LO_FILES} > ${MOD_LINK} -o $@ $^ > > ${COMMON_C_FILES} ${A2_C_FILES}: ${H_FILES} > > > > >-- >To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]> -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
