Author: mturk Date: Fri Oct 22 08:38:53 2010 New Revision: 1026244 URL: http://svn.apache.org/viewvc?rev=1026244&view=rev Log: Do not have fixed version strings in makefiles. Use command line option for JK_VERSION and HTTPD_VERSION
Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc tomcat/jk/trunk/native/iis/Makefile.amd64 tomcat/jk/trunk/native/iis/Makefile.ia64 tomcat/jk/trunk/native/iis/Makefile.x86 tomcat/jk/trunk/native/iis/README tomcat/jk/trunk/native/netscape/Makefile.vc Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=1026244&r1=1026243&r2=1026244&view=diff ============================================================================== --- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original) +++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Fri Oct 22 08:38:53 2010 @@ -19,17 +19,14 @@ APU_LIB=libaprutil.lib OUTDIR=.\Release20 INTDIR=.\Release20 APACHE2_HOME=$(APACHE20_HOME) -HTTPD_VERSION=2.0.52 !ELSE !IFDEF APACHE23_HOME APACHE2_HOME=$(APACHE23_HOME) OUTDIR=.\Release23 INTDIR=.\Release23 -HTTPD_VERSION=2.3.1 !ELSE OUTDIR=.\Release22 INTDIR=.\Release22 -HTTPD_VERSION=2.2.3 !ENDIF APR_LIB=libapr-1.lib APU_LIB=libaprutil-1.lib @@ -39,8 +36,7 @@ APU_LIB=libaprutil-1.lib !ERROR Missing APACHE2_HOME environment variable. !ENDIF -JK_VERSION=1.2.31 -TARGET=mod_jk-$(JK_VERSION)-httpd-$(HTTPD_VERSION) +TARGET=mod_jk-$(JK_VERSION)$(HTTPD_VERSION) CPP=cl.exe MTL=midl.exe RSC=rc.exe Modified: tomcat/jk/trunk/native/iis/Makefile.amd64 URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.amd64?rev=1026244&r1=1026243&r2=1026244&view=diff ============================================================================== --- tomcat/jk/trunk/native/iis/Makefile.amd64 (original) +++ tomcat/jk/trunk/native/iis/Makefile.amd64 Fri Oct 22 08:38:53 2010 @@ -19,8 +19,7 @@ # nmake -f Makefile.amd64 # -JK_VERSION=1.2.31 -TARGET=isapi_redirect-$(JK_VERSION) +TARGET=isapi_redirect$(JK_VERSION) CPP=cl.exe MTL=midl.exe @@ -122,7 +121,7 @@ LINK32_OBJS= \ IF EXIST $(OUTDIR)\$(TARGET).manifest \ mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest -outputresource:$(OUTDIR)\$(TARGET).dll;2 -CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I "pcre" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" $(CFLAGS) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c +CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I "pcre" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /D "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" $(CFLAGS) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c .c{$(INTDIR)}.obj:: $(CPP) @<< Modified: tomcat/jk/trunk/native/iis/Makefile.ia64 URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.ia64?rev=1026244&r1=1026243&r2=1026244&view=diff ============================================================================== --- tomcat/jk/trunk/native/iis/Makefile.ia64 (original) +++ tomcat/jk/trunk/native/iis/Makefile.ia64 Fri Oct 22 08:38:53 2010 @@ -19,8 +19,7 @@ # nmake -f Makefile.ia64 # -JK_VERSION=1.2.31 -TARGET=isapi_redirect-$(JK_VERSION) +TARGET=isapi_redirect$(JK_VERSION) CPP=cl.exe MTL=midl.exe @@ -122,7 +121,7 @@ LINK32_OBJS= \ IF EXIST $(OUTDIR)\$(TARGET).manifest \ mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest -outputresource:$(OUTDIR)\$(TARGET).dll;2 -CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I "pcre" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_IA64_=1" -DWIN64 /D "_WIN64" /Wp64 /FIPRE64PRA.H /D "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" $(CFLAGS) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c +CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Zi -EHsc /I "..\common" /I "pcre" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_IA64_=1" -DWIN64 /D "_WIN64" /D "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" $(CFLAGS) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c .c{$(INTDIR)}.obj:: $(CPP) @<< Modified: tomcat/jk/trunk/native/iis/Makefile.x86 URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.x86?rev=1026244&r1=1026243&r2=1026244&view=diff ============================================================================== --- tomcat/jk/trunk/native/iis/Makefile.x86 (original) +++ tomcat/jk/trunk/native/iis/Makefile.x86 Fri Oct 22 08:38:53 2010 @@ -13,8 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -JK_VERSION=1.2.31 -TARGET=isapi_redirect-$(JK_VERSION) +TARGET=isapi_redirect$(JK_VERSION) CPP=cl.exe MTL=midl.exe Modified: tomcat/jk/trunk/native/iis/README URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/README?rev=1026244&r1=1026243&r2=1026244&view=diff ============================================================================== --- tomcat/jk/trunk/native/iis/README (original) +++ tomcat/jk/trunk/native/iis/README Fri Oct 22 08:38:53 2010 @@ -37,7 +37,7 @@ The steps that you need to take are: 1. Change directory to the isapi redirector plugins source directory. 2. Execute the following command: - nmake -f Makefile.x86 + nmake -f Makefile.x86 [JK_VERSION=-1.2.31] This will build both release and debug versions of the redirector plugin. Modified: tomcat/jk/trunk/native/netscape/Makefile.vc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.vc?rev=1026244&r1=1026243&r2=1026244&view=diff ============================================================================== --- tomcat/jk/trunk/native/netscape/Makefile.vc (original) +++ tomcat/jk/trunk/native/netscape/Makefile.vc Fri Oct 22 08:38:53 2010 @@ -24,8 +24,7 @@ NULL= NULL=nul !ENDIF -JK_VERSION=1.2.31 -TARGET=nsapi_redirect-$(JK_VERSION) +TARGET=nsapi_redirect$(JK_VERSION) OUTDIR=.\nsapi_release INTDIR=.\nsapi_release --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org