costin 02/01/16 11:46:37
Modified: jk/native/apache-2.0 mod_jk.dsp
jk/native/common Makefile.in
jk/native/nt_service nt_service.dsp
Log:
Few build fixes.
Revision Changes Path
1.6 +7 -7 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.dsp
Index: mod_jk.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_jk.dsp 4 Oct 2001 13:09:42 -0000 1.5
+++ mod_jk.dsp 16 Jan 2002 19:46:37 -0000 1.6
@@ -42,8 +42,8 @@
# 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 "APACHE_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\common" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I
"$(APACHE2_HOME)\srclib\apr\include" /I "$(APACHE2_HOME)\srclib\apr-util\include" /I
"$(APACHE2_HOME)\os\win32" /D "_WIN32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D
"WIN32_LEAN_AND_MEAN" /D "_MBCS" /D "_USRDLL" /D "SHARED_MODULE" /FD /c
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /I "..\common"
/I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include"
/I "$(APACHE2_HOME)\srclib\apr\include" /I "$(APACHE2_HOME)\srclib\apr-util\include"
/Fd"Release\mod_jk" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -52,8 +52,8 @@
# 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 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386
/libpath:"$(APACHE2_HOME)\Release" /libpath:"$(APACHE2_HOME)\srclib\apr\Release"
/libpath:"$(APACHE2_HOME)\srclib\apr-util\Release"
+# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /dll /machine:I386
+# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib
advapi32.lib wsock32.lib /nologo /dll /machine:I386 /libpath:"$(APACHE2_HOME)\Release"
/libpath:"$(APACHE2_HOME)\srclib\apr\Release"
/libpath:"$(APACHE2_HOME)\srclib\apr-util\Release" /libpath:"$(APACHE2_HOME)\lib"
!ELSEIF "$(CFG)" == "apache - Win32 Debug"
@@ -68,8 +68,8 @@
# 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 "APACHE_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\common" /I "$(JAVA_HOME)\include"
/I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I
"$(APACHE2_HOME)\srclib\apr\include" /I "$(APACHE2_HOME)\srclib\apr-util\include" /I
"$(APACHE2_HOME)\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "SHARED_MODULE" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"
/FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /I
"..\common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I
"$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\srclib\apr\include" /I
"$(APACHE2_HOME)\srclib\apr-util\include" /Fd"Debug\mod_jk" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -79,7 +79,7 @@
# 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 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386
/pdbtype:sept /libpath:"$(APACHE2_HOME)/Debug"
/libpath:"$(APACHE2_HOME)\srclib\apr\Debug"
/libpath:"$(APACHE2_HOME)\srclib\apr-util\Debug"
+# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib
advapi32.lib wsock32.lib /nologo /dll /debug /machine:I386
/libpath:"$(APACHE2_HOME)/Debug" /libpath:"$(APACHE2_HOME)\srclib\apr\Debug"
/libpath:"$(APACHE2_HOME)\srclib\apr-util\Debug" /libpath:"$(APACHE2_HOME)\lib"
!ENDIF
1.7 +10 -0 jakarta-tomcat-connectors/jk/native/common/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in 4 Dec 2001 19:44:23 -0000 1.6
+++ Makefile.in 16 Jan 2002 19:46:37 -0000 1.7
@@ -1,4 +1,14 @@
#### XXXX DO we need this Makefile ????
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+top_builddir = ..
+
+LIBTOOL = @LIBTOOL@
+
OEXT=.lo
include list.mk
1.5 +10 -15 jakarta-tomcat-connectors/jk/native/nt_service/nt_service.dsp
Index: nt_service.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/nt_service/nt_service.dsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nt_service.dsp 7 Nov 2001 21:43:35 -0000 1.4
+++ nt_service.dsp 16 Jan 2002 19:46:37 -0000 1.5
@@ -113,23 +113,23 @@
SOURCE=..\common\jk_util.c
# End Source File
-# End Group
+# Begin Source File
SOURCE=..\common\jk_ajp14.c
# End Source File
-# End Group
+# Begin Source File
SOURCE=..\common\jk_ajp14_worker.c
# End Source File
-# End Group
+# Begin Source File
SOURCE=..\common\jk_md5.c
# End Source File
-# End Group
+# Begin Source File
SOURCE=..\common\jk_context.c
# End Source File
-# End Group
+# Begin Source File
SOURCE=..\common\jk_ajp_common.c
# End Source File
@@ -166,31 +166,26 @@
SOURCE=..\common\jk_util.h
# End Source File
-# End Group
+# Begin Source File
SOURCE=..\common\jk_ajp14.h
# End Source File
-# End Group
+# Begin Source File
SOURCE=..\common\jk_ajp14_worker.h
# End Source File
-# End Group
+# Begin Source File
SOURCE=..\common\jk_md5.h
# End Source File
-# End Group
+# Begin Source File
SOURCE=..\common\jk_context.h
# End Source File
-# End Group
+# Begin Source File
SOURCE=..\common\jk_ajp_common.h
# End Source File
-# End Group
-
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
