tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hgo...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.apxs.in Makefile.in
Date Tue, 04 Jun 2002 10:33:45 GMT
hgomez      2002/06/04 03:33:45

  Modified:    jk/native2/server/apache13 Makefile.apxs.in Makefile.in
               jk/native2/server/apache2 Makefile.apxs.in Makefile.in
  Log:
  Updated makefile.
  No more use list.mk but instead wildcard (req. gnu make)
  Also HAVE_JNI is set by configure
  
  Revision  Changes    Path
  1.5       +4 -8      jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in
  
  Index: Makefile.apxs.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.apxs.in	24 May 2002 07:21:24 -0000	1.4
  +++ Makefile.apxs.in	4 Jun 2002 10:33:44 -0000	1.5
  @@ -1,28 +1,24 @@
   ## configure should make the Makefile out of this file.
   
  -## include all files to be built in common, with or without apr's
  -## read the object (.c) from the list file.
  -include ../../common/list.mk
  -OEXT=.c
  -
   APXS=@APXS@
   OS=@OS@
  +JK_DIR := ../..
   APXS_LDFLAGS=@APXS_LDFLAGS@
   APXS_CFLAGS=@APXS_CFLAGS@
  -JK_OBJECTS=${COMMON_OBJECTS} @COMMON_APR_OBJECTS@
  +COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
   APR_CFLAGS=@APR_CFLAGS@
   APR_LDFLAGS=@APR_LDFLAGS@
   
   JK=../../common/
   JKINC=../../include/
   JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAVE_MMAP
  -JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
  +JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} @HAVE_JNI@
   JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
   
   all: mod_jk2.so
   
   mod_jk2.so: 
  -	$(APXS) -c -o $@ -Wc,"${JK_INCL} ${APR_CFLAGS} ${APR_LDFLAGS}" "${JAVA_INCL}" mod_jk2.c
${JK_OBJECTS} 
  +	$(APXS) -c -o $@ -Wc,"${JK_INCL} ${APR_CFLAGS} ${APR_LDFLAGS}" "${JAVA_INCL}" mod_jk2.c
${COMMON_C_FILES} 
   
   clean:
   	rm -f *.o *.so
  
  
  
  1.5       +7 -9      jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.in	24 May 2002 07:21:24 -0000	1.4
  +++ Makefile.in	4 Jun 2002 10:33:45 -0000	1.5
  @@ -1,16 +1,15 @@
   # Gnu makefile and libtool are required
   # use -D options to overrides defaults
   
  -JK=../../common/
  -OEXT=.c
  -include ../../common/list.mk
  -
   APACHE_HOME=@APACHE_HOME@
   OS=@OS@
   APACHE_INCL=@APACHE_INCL@
   EXTRA_CFLAGS=@APXS_CFLAGS@
   EXTRA_CPPFLAGS=@APXS_CPPFLAGS@
  -JK_OBJECTS=${COMMON_OBJECTS} ${COMMON_APR_OBJECTS}
  +JAVA_HOME=@JAVA_HOME@
  +
  +JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} @HAVE_JNI@
  +JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
   
   JK_DIR := ../..
   BUILD_DIR = ${JK_DIR}/../build/jk2/apache13
  @@ -21,8 +20,8 @@
   INCLUDES= -I${JK_DIR}/include \
             ${APACHE_INCL}
   
  -JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 @APR_CFLAGS@ -DHAVE_MMAP
  -JK_LDFLAGS=-L${APACHE_HOME}/lib -lcrypt @APR_LDFLAGS@
  +JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 @APR_CFLAGS@ -DHAVE_MMAP ${JAVA_INCL}
  +JK_LDFLAGS=-L${APACHE_HOME}/lib -lcrypt @APR_LDFLAGS@ ${JAVA_LIB}
   
   ###### Based on rules.mk ##########################################
   ALL_CFLAGS   = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS)
  @@ -43,8 +42,7 @@
   # Same behavior as ant - 'all files from a dir'. 
   # Excludes are not yet implemented.
   
  -#COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
  -COMMON_C_FILES = ${JK_OBJECTS}
  +COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
   A_C_FILES := $(wildcard ${JK_DIR}/server/apache13/*.c )
   H_FILES := $(wildcard ${JK_DIR}/include/*.h )
   
  
  
  
  1.5       +7 -8      jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in
  
  Index: Makefile.apxs.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.apxs.in	24 May 2002 07:21:24 -0000	1.4
  +++ Makefile.apxs.in	4 Jun 2002 10:33:45 -0000	1.5
  @@ -3,19 +3,18 @@
   APXS=@APXS2@
   OS=@OS@
   JAVA_HOME=@JAVA_HOME@
  +JK_DIR := ../..
   APXS_LDFLAGS=@APXS2_LDFLAGS@
   APXS_CFLAGS=@APXS2_CFLAGS@
  +COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
   
  -JK=../../common/
  -JKINC=../../include/
  -JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR
  +
  +JK=${JK_DIR}/common/
  +JKINC=${JK_DIR}/include/
  +JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR @HAVE_JNI@
   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
   
  -## read the object (.c) from the list file.
  -OEXT=.c
  -include ../../common/list.mk
  -
   APACHE2_OBJECTS=jk_logger_apache2.c jk_map_aprtable.c jk_service_apache2.c
   
   ## Must include the jni stuff 
  @@ -23,7 +22,7 @@
   all: mod_jk2.la
   
   mod_jk2.la: 
  -	$(APXS) -c -o $@ -Wc,"${JK_INCL}" "${JAVA_INCL}" mod_jk2.c ${APACHE2_OBJECTS} ${COMMON_OBJECTS}
${COMMON_APR_OBJECTS}
  +	$(APXS) -c -o $@ -Wc,"${JK_INCL}" "${JAVA_INCL}" mod_jk2.c ${APACHE2_OBJECTS} ${COMMON_C_FILES}
   
   install: mod_jk2.la
   	$(APXS) -i mod_jk2.la
  
  
  
  1.7       +4 -12     jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.in	29 May 2002 15:23:58 -0000	1.6
  +++ Makefile.in	4 Jun 2002 10:33:45 -0000	1.7
  @@ -9,8 +9,6 @@
   APR_INCL=@APR_CFLAGS@ 
   EXTRA_CFLAGS=@APXS2_CFLAGS@
   EXTRA_CPPFLAGS=@APXS2_CPPFLAGS@
  -CC=@CC@
  -LD=@LD@
   
   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
  @@ -33,7 +31,7 @@
             ${APR_INCL} \
             ${JAVA_INCL}
   
  -JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR -DHAVE_JNI
  +JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR @HAVE_JNI@
   JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt
   
   ###### Based on rules.mk ##########################################
  @@ -47,8 +45,7 @@
   COMPILE      = $(CC)  $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(ALL_INCLUDES)
   
   SH_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) $(JK_CFLAGS)
  -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)
  +MOD_LINK = $(LIBTOOL) --mode=link $(CC) -module -shared $(LT_LDFLAGS) $(ALL_LDFLAGS) $(JK_LDFLAGS)
   
   #############################################################################
   
  @@ -93,15 +90,10 @@
   
   all: prepare ${BUILD_DIR}/mod_jk2.so ${BUILD_DIR}/jkjni.so
   
  -${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}
  +${BUILD_DIR}/jkjni.so: ${JNI_LO_FILES} ${COMMON_LO_FILES}
   	$(MOD_LINK) -o $@ $^
   
  -${BUILD_DIR}/mod_jk2.la: ${COMMON_LO_FILES} ${JNI_LO_FILES} ${A2_LO_FILES}
  +${BUILD_DIR}/mod_jk2.so: ${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:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message