wrowe 2002/07/20 16:57:26
Modified: . Apache.dsw
. libapriconv.dsp
. libaprutil.dsp
Log:
Unless I'm missing something obvious, apr-iconv never needs to be it's
own .dll/.so library. In the case of libapriconv, we need to anticipate
that the library will be incorporated into libaprutil and exposed through
the apr_xlate_() API. In the case of the aprutil we can use the same
approach.
After this patch, one never includes the libapriconv or apriconv in any
application. Including libaprutil or aprutil is sufficient.
Revision Changes Path
1.84 +3 -3 httpd-2.0/Apache.dsw
Index: Apache.dsw
===================================================================
RCS file: /home/cvs/httpd-2.0/Apache.dsw,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- Apache.dsw 19 Jul 2002 08:51:48 -0000 1.83
+++ Apache.dsw 20 Jul 2002 23:57:26 -0000 1.84
@@ -54,9 +54,6 @@
Project_Dep_Name Apache
End Project Dependency
Begin Project Dependency
- Project_Dep_Name apriconv
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name ApacheMonitor
End Project Dependency
Begin Project Dependency
@@ -287,6 +284,9 @@
Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name apriconv
+ End Project Dependency
Begin Project Dependency
Project_Dep_Name gen_uri_delims
End Project Dependency
1.2 +23 -29 apr-iconv/libapriconv.dsp
Index: libapriconv.dsp
===================================================================
RCS file: /home/cvs/apr-iconv/libapriconv.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libapriconv.dsp 26 Jul 2001 23:15:53 -0000 1.1
+++ libapriconv.dsp 20 Jul 2002 23:57:26 -0000 1.2
@@ -2,7 +2,7 @@
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=libapriconv - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -17,8 +17,8 @@
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "libapriconv - Win32 Release" (based on "Win32 (x86) Dynamic-Link
Library")
-!MESSAGE "libapriconv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link
Library")
+!MESSAGE "libapriconv - Win32 Release" (based on "Win32 (x86) Static
Library")
+!MESSAGE "libapriconv - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -26,60 +26,54 @@
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
-MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "libapriconv - 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 Output_Dir "LibR"
+# PROP BASE Intermediate_Dir "LibR"
# 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 Output_Dir "LibR"
+# PROP Intermediate_Dir "LibR"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD
/c
-# ADD CPP /nologo /MD /W3 /O2 /I "../apr/include" /D "NDEBUG" /D
"API_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Release\libapriconv" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# ADD CPP /nologo /MD /W3 /O2 /I "../apr/include" /D "NDEBUG" /D
"API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibR\libapriconv" /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib
/nologo /base:"0x6EE00000" /subsystem:windows /dll /map /machine:I386 /OPT:NOREF
-# ADD LINK32 kernel32.lib /nologo /base:"0x6ED80000" /subsystem:windows /dll
/map /machine:I386 /OPT:NOREF
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "libapriconv - 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 Output_Dir "LibD"
+# PROP BASE Intermediate_Dir "LibD"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
+# PROP Output_Dir "LibD"
+# PROP Intermediate_Dir "LibD"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# 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 /I "../apr/include" /D "NDEBUG" /D
"API_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Debug\libapriconv" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../apr/include" /D "_DEBUG" /D
"API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibD\libapriconv" /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib
/nologo /base:"0x6EE00000" /subsystem:windows /dll /incremental:no /map /debug
/machine:I386 /OPT:NOREF
-# ADD LINK32 kernel32.lib /nologo /base:"0x6ED80000" /subsystem:windows /dll
/incremental:no /map /debug /machine:I386 /OPT:NOREF
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
!ENDIF
1.40 +2 -2 apr-util/libaprutil.dsp
Index: libaprutil.dsp
===================================================================
RCS file: /home/cvs/apr-util/libaprutil.dsp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libaprutil.dsp 20 Jul 2002 22:30:25 -0000 1.39
+++ libaprutil.dsp 20 Jul 2002 23:57:26 -0000 1.40
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD
/c
-# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I
"./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I
"./xml/expat/lib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DECLARE_EXPORT"
/D "APU_USE_SDBM" /Fd"Release\aprutil" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I
"./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I
"./xml/expat/lib" /D "API_DECLARE_STATIC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"Release\aprutil" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# 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 /I "./include" /I "../apr/include" /I
"./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I
"./xml/expat/lib" /I "./expat/lib" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D
"APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"Debug\aprutil" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "../apr/include" /I
"./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I
"./xml/expat/lib" /I "./expat/lib" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D
"API_DECLARE_STATIC" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM"
/Fd"Debug\aprutil" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "_DEBUG"
