tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r527492 - in /tomcat/connectors/trunk/jk/native: apache-1.3/Makefile.vc apache-2.0/Makefile.vc
Date Wed, 11 Apr 2007 13:50:34 GMT
Author: mturk
Date: Wed Apr 11 06:50:33 2007
New Revision: 527492

URL: http://svn.apache.org/viewvc?view=rev&rev=527492
Log:
Update command line Makefiles so they can produce multiple targets without writing to the
same output directory.

Modified:
    tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.vc
    tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.vc

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.vc
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.vc?view=diff&rev=527492&r1=527491&r2=527492
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.vc (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.vc Wed Apr 11 06:50:33 2007
@@ -1,37 +1,23 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on mod_jk.dsp
-!IF "$(CFG)" == ""
-CFG=mod_jk - Win32 Release
-!MESSAGE No configuration specified. Defaulting to mod_jk - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "mod_jk - Win32 Release"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "Makefile.vc" CFG="mod_jk - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "mod_jk - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
 !IF "$(OS)" == "Windows_NT"
 NULL=
 !ELSE 
 NULL=nul
 !ENDIF 
 
+!IFDEF EAPI
+OUTDIR=.\ReleaseSSL
+INTDIR=.\ReleaseSSL
+DEF_EAPI=/D "EAPI"
+!ELSE
+OUTDIR=.\Release
+INTDIR=.\Release
+DEF_EAPI=
+!ENDIF
+
+
 CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
 
 ALL : "$(OUTDIR)\mod_jk.so"
 
@@ -102,7 +88,7 @@
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "$(APACHE1_HOME)\include" /I "$(JAVA_HOME)\include"
/I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
/D "MOD_JK_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_jk_src" /FD /c 
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "$(APACHE1_HOME)\include" /I "$(JAVA_HOME)\include"
/I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
$(DEF_EAPI) /D "MOD_JK_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_jk_src" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -136,16 +122,7 @@
 
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
 
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("mod_jk.dep")
-!INCLUDE "mod_jk.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "mod_jk.dep"
-!ENDIF 
-!ENDIF 
 
-
-!IF "$(CFG)" == "mod_jk - Win32 Release"
 SOURCE=..\common\jk_ajp12_worker.c
 
 "$(INTDIR)\jk_ajp12_worker.obj" : $(SOURCE) "$(INTDIR)"
@@ -269,8 +246,3 @@
 SOURCE=.\mod_jk.c
 
 "$(INTDIR)\mod_jk.obj" : $(SOURCE) "$(INTDIR)"
-
-
-
-!ENDIF 
-

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.vc
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.vc?view=diff&rev=527492&r1=527491&r2=527492
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.vc (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.vc Wed Apr 11 06:50:33 2007
@@ -2,9 +2,13 @@
 APACHE2_HOME=$(APACHE22_HOME)
 APR_LIB=libapr-1.lib
 APU_LIB=libaprutil-1.lib
+OUTDIR=.\Release22
+INTDIR=.\Release22
 !ELSE
 APR_LIB=libapr.lib
 APU_LIB=libaprutil.lib
+OUTDIR=.\Release20
+INTDIR=.\Release20
 !IFDEF APACHE20_HOME
 APACHE2_HOME=$(APACHE20_HOME)
 !ENDIF
@@ -17,11 +21,6 @@
 CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
 
 ALL : "$(OUTDIR)\mod_jk.so"
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message