cvs commit: jakarta-tomcat-connectors/jk/src/native/apache-1.3 Makefile.freebsd Makefile.linux Makefile.nw

[hg...@apache.org]

hgomez      01/05/15 02:59:57

  Added:       jk/src/native/apache-1.3 Makefile.freebsd Makefile.linux
                        Makefile.nw
  Log:
  move to apache-1.3
  
  Revision  Changes    Path
  1.1                  jakarta-tomcat-connectors/jk/src/native/apache-1.3/Makefile.freebsd
  
  Index: Makefile.freebsd
  ===================================================================
  ## You need to edit this file - configure later :-)
  
  APACHE_HOME=/usr/local/apache
  OS=freebsd
  APXS=${APACHE_HOME}/bin/apxs
  
  A13_FLAGS=-I${APACHE_HOME}/include
  
  ## I assume this one is set up already
  # JAVA_HOME=
  
  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=-DHAVE_CONFIG_H -g -fpic  -DSHARED_MODULE -O2 -D_REENTRANT -pthread -DLINUX -Wall
  
  JK=../common/
  SRCS=jk_ajp12_worker.c jk_connect.c jk_msg_buff.c jk_util.c jk_ajp13.c \
       jk_jni_worker.c jk_pool.c jk_worker.c jk_ajp13_worker.c jk_lb_worker.c \
       jk_sockbuf.c  jk_map.c jk_uri_worker_map.c          
  
  
  OBJS=${patsubst %.c,%.o,${SRCS}}
  
  %.o: ../common/%.c 
  	${CC} -c ${CFLAGS} ${JAVA_INCL} ${A13_FLAGS} $< -o $@ 
  
  .c.o:
  	${APXS} -c ${JAVA_INCL} -DFREEBSD ${A13_FLAGS} -I../common $<
  
  all: mod_jk.so
  
  mod_jk.so: ${OBJS} mod_jk.o
  	$(APXS) -c -o mod_jk.so ${OBJS} mod_jk.o
  	
  # $(CC) -shared -o mod_jk.so ${OBJS} mod_jk.o
  
  clean:
  	rm *.o *.so
  
  
  
  1.1                  jakarta-tomcat-connectors/jk/src/native/apache-1.3/Makefile.linux
  
  Index: Makefile.linux
  ===================================================================
  ## You need to edit this file - configure later :-)
  
  ## I assume this one is set up already
  # JAVA_HOME=
  OS=linux
  
  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
  #ifndef APXS
  APXS=/usr/sbin/apxs
  #endif
  
  JK=../common/
  SRCS=${JK}/jk_ajp12_worker.c ${JK}/jk_connect.c ${JK}/jk_msg_buff.c ${JK}/jk_util.c ${JK}/jk_ajp13.c \
       ${JK}/jk_jni_worker.c ${JK}/jk_pool.c ${JK}/jk_worker.c ${JK}/jk_ajp13_worker.c ${JK}/jk_lb_worker.c \
       ${JK}/jk_sockbuf.c  ${JK}/jk_map.c ${JK}/jk_uri_worker_map.c          
  
  
  all: mod_jk.so
  
  mod_jk.so: 
  	$(APXS) -I ${JK} ${JAVA_INCL} -c -o $@ mod_jk.c $(SRCS) 
  
  clean:
  	rm *.o *.so
  
  
  
  1.1                  jakarta-tomcat-connectors/jk/src/native/apache-1.3/Makefile.nw
  
  Index: Makefile.nw
  ===================================================================
  .SILENT:
  
  NLM_NAME=mod_jk
  
  JDKPATH=k:\jdk\jdk-1_2_2
  NOVELLNDK=r:\nwsdk
  APACHE_HOME=d:\apache_1.3.12\src
  WINSOCK_INCDIR=k:\ws295sdk\include
  METROWERKSPATH=k:\mw\5.3
  
  CC=$(METROWERKSPATH)\bin\mwccnlm
  LINK=$(METROWERKSPATH)\bin\mwldnlm
  
  JK_OBJS=\
  	jk_ajp12_worker.obj \
  	jk_ajp13.obj \
  	jk_ajp13_worker.obj \
  	jk_connect.obj \
  	jk_jni_worker.obj \
  	jk_lb_worker.obj \
  	jk_map.obj \
  	jk_msg_buff.obj \
  	jk_pool.obj \
  	jk_sockbuf.obj \
  	jk_uri_worker_map.obj \
  	jk_util.obj \
  	jk_worker.obj \
  	mod_jk.obj \
  	jk_nwmain.obj \
  	
  all: $(NLM_NAME).nlm
  
  $(NLM_NAME).nlm: $(JK_OBJS) link.opt
  	@echo Linking $@
  	@$(LINK) @link.opt
  
  %.obj: %.c cc.opt
  	@echo Compiling $<
  	@$(CC) $< -o=$(@F) @cc.opt
  	
  %.obj: ../common/%.c cc.opt
  	@echo Compiling $<
  	@$(CC) $< -o=$(@F) @cc.opt
  	
  cc.opt: Makefile.nw
  	-@del cc.opt 2> NUL
  	@echo Generating $@
  	@echo -nosyspath -ext obj -c -align 1 -w nocmdline -bool on >> $@
  ifdef DEBUG
  	@echo -g >> $@
  endif
  	@echo -I$(NOVELLNDK)\include\nlm >> $@
  	@echo -I$(NOVELLNDK)\include >> $@
  	@echo -I. >> $@
  	@echo -I..\common >> $@
  	@echo -I$(METROWERKSPATH)\include >> $@
  	@echo -I$(JDKPATH)\include >> $@
  	@echo -I$(JDKPATH)\include\netware >> $@
  	@echo -I$(APACHE_HOME)\include >> $@
  	@echo -I$(APACHE_HOME)\os\netware >> $@
  	@echo -I$(WINSOCK_INCDIR) >> $@
  	@echo -DN_PLAT_NLM >> $@
  	@echo -DNETWARE >> $@
  	@echo -DXP_NETWARE >> $@
  
  link.opt: Makefile.nw
  	-@del link.opt 2> NUL
  	-@del link.def 2> NUL
  	@echo -warnings off >> $@
  	@echo -zerobss >> $@
  	@echo -desc "Apache 1.3 Plugin for Tomcat" >> $@
  	@echo -o $(NLM_NAME).nlm >> $@
  	@echo -screenname "System Console" >> $@
  	@echo -nlmversion 0,1,0 >> $@
  ifdef DEBUG
  	@echo -g >> $@
  	@echo -sym internal >> $@
  	@echo -sym codeview4 >> $@
  	@echo -osym $(NLM_NAME).sym >> $@
  endif
  	@echo -nodefaults >> $@
  	@echo -map $(NLM_NAME).map >> $@
  	@echo -threadname "APTomcat Thread" >> $@
  	@echo -stacksize 64000 >> $@
  	@echo $(METROWERKSPATH)\lib\nwpre.obj $(strip $(JK_OBJS)) >> $@
  	@echo -commandfile link.def >> $@
  	@echo module apache >> link.def
  	@echo Import @$(NOVELLNDK)\imports\clib.imp >> link.def
  	@echo Import @$(NOVELLNDK)\imports\lib0.imp >> link.def
  	@echo Import @$(NOVELLNDK)\imports\nlmlib.imp >> link.def
  	@echo Import @$(NOVELLNDK)\imports\threads.imp >> link.def
  	@echo Import @$(NOVELLNDK)\imports\socklib.imp >> link.def
  	@echo Import @$(NOVELLNDK)\imports\ws2nlm.imp >> link.def
  	@echo Import @$(APACHE_HOME)\os\netware\ApacheCore.imp >> link.def
  	@echo Export jk_module >> link.def
  
  clean:
  	-@del *.obj 2> NUL
  	-@del *.map 2> NUL
  	-@del link.* 2> NUL
  	-@del cc.opt 2> NUL
  	-@del *.nlm 2> NUL
  	-@del *.sym 2> NUL