mturk 2004/03/27 22:30:09 Modified: jk/native2/server/apache13 mod_jk2.dsp Log: Remove non-APR build targets. Revision Changes Path 1.7 +15 -93 jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.dsp Index: mod_jk2.dsp =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mod_jk2.dsp 21 Mar 2004 07:03:17 -0000 1.6 +++ mod_jk2.dsp 28 Mar 2004 06:30:09 -0000 1.7 @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=mod_jk2 - Win32 Debug APR +CFG=mod_jk2 - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,14 +13,12 @@ !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 "mod_jk2.mak" CFG="mod_jk2 - Win32 Debug APR" +!MESSAGE NMAKE /f "mod_jk2.mak" CFG="mod_jk2 - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_jk2 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_jk2 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_jk2 - Win32 Debug APR" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_jk2 - Win32 Release APR" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_jk2 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -31,38 +29,13 @@ MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "mod_jk2 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_JK2_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "$(APACHE_HOME)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x41a /d "NDEBUG" -# ADD RSC /l 0x41a /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ApacheCore.lib ws2_32.lib /nologo /dll /machine:I386 /out:"Release/mod_jk2.so" /libpath:"$(APACHE_HOME)\lib" /libpath:"$(APACHE2_HOME)\lib" - -!ELSEIF "$(CFG)" == "mod_jk2 - Win32 Debug" +!IF "$(CFG)" == "mod_jk2 - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "Debug" # PROP BASE Intermediate_Dir "Debug" +# PROP BASE Ignore_Export_Lib 0 # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 @@ -70,33 +43,6 @@ # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_JK2_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "$(APACHE_HOME)\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x41a /d "_DEBUG" -# ADD RSC /l 0x41a /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ApacheCore.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/mod_jk2.so" /pdbtype:sept /libpath:"$(APACHE_HOME)\lib" /libpath:"$(APACHE2_HOME)\lib" - -!ELSEIF "$(CFG)" == "mod_jk2 - Win32 Debug APR" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "mod_jk2___Win32_Debug_APR" -# PROP BASE Intermediate_Dir "mod_jk2___Win32_Debug_APR" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugA" -# PROP Intermediate_Dir "DebugA" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "$(APACHE_HOME)\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /GZ /c # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "$(APACHE_HOME)\include" /I "$(APACHE2_HOME)\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /D "HAVE_JNI" /D "HAS_APR" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -108,20 +54,20 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ApacheCore.lib wsock32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"$(APACHE_HOME)\lib" /libpath:"$(APACHE2_HOME)\lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ApacheCore.lib wsock32.lib libapr.lib libaprutil.lib /nologo /dll /debug /machine:I386 /out:"DebugA/mod_jk2.so" /pdbtype:sept /libpath:"$(APACHE_HOME)\lib" /libpath:"$(APACHE2_HOME)\lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ApacheCore.lib wsock32.lib libapr.lib libaprutil.lib /nologo /dll /debug /machine:I386 /out:"Debug/mod_jk2.so" /pdbtype:sept /libpath:"$(APACHE_HOME)\lib" /libpath:"$(APACHE2_HOME)\lib" -!ELSEIF "$(CFG)" == "mod_jk2 - Win32 Release APR" +!ELSEIF "$(CFG)" == "mod_jk2 - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "mod_jk2___Win32_Release_APR" -# PROP BASE Intermediate_Dir "mod_jk2___Win32_Release_APR" +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" # PROP BASE Ignore_Export_Lib 0 # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseA" -# PROP Intermediate_Dir "ReleaseA" +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "$(APACHE_HOME)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c @@ -135,16 +81,14 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ApacheCore.lib ws2_32.lib /nologo /dll /machine:I386 /libpath:"$(APACHE_HOME)\lib" /libpath:"$(APACHE2_HOME)\lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ApacheCore.lib ws2_32.lib libapr.lib libaprutil.lib /nologo /dll /machine:I386 /out:"ReleaseA/mod_jk2.so" /libpath:"C:\WRKPLACE\PROJECTS\jtc\apache13\lib" /libpath:"C:\WRKPLACE\PROJECTS\jtc\apache13\libexec" /libpath:"$(APACHE2_HOME)\lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ApacheCore.lib ws2_32.lib libapr.lib libaprutil.lib /nologo /dll /machine:I386 /out:"Release/mod_jk2.so" /libpath:"C:\WRKPLACE\PROJECTS\jtc\apache13\lib" /libpath:"C:\WRKPLACE\PROJECTS\jtc\apache13\libexec" /libpath:"$(APACHE2_HOME)\lib" !ENDIF # Begin Target -# Name "mod_jk2 - Win32 Release" # Name "mod_jk2 - Win32 Debug" -# Name "mod_jk2 - Win32 Debug APR" -# Name "mod_jk2 - Win32 Release APR" +# Name "mod_jk2 - Win32 Release" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -412,29 +356,7 @@ SOURCE=..\..\common\jk_logger_win32_message.mc -!IF "$(CFG)" == "mod_jk2 - Win32 Release" - -# Begin Custom Build -InputDir=\WRKPLACE\PROJECTS\jtc\jk\native2\common -InputPath=..\..\common\jk_logger_win32_message.mc - -"..\..\common\jk_logger_win32_message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - mc -h $(InputDir) -r $(InputDir) $(InputPath) - -# End Custom Build - -!ELSEIF "$(CFG)" == "mod_jk2 - Win32 Debug" - -# Begin Custom Build -InputDir=\WRKPLACE\PROJECTS\jtc\jk\native2\common -InputPath=..\..\common\jk_logger_win32_message.mc - -"..\..\common\jk_logger_win32_message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - mc -h $(InputDir) -r $(InputDir) $(InputPath) - -# End Custom Build - -!ELSEIF "$(CFG)" == "mod_jk2 - Win32 Debug APR" +!IF "$(CFG)" == "mod_jk2 - Win32 Debug" # Begin Custom Build InputDir=\WRKPLACE\PROJECTS\jtc\jk\native2\common @@ -445,7 +367,7 @@ # End Custom Build -!ELSEIF "$(CFG)" == "mod_jk2 - Win32 Release APR" +!ELSEIF "$(CFG)" == "mod_jk2 - Win32 Release" # Begin Custom Build InputDir=\WRKPLACE\PROJECTS\jtc\jk\native2\common
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
