Until we are building loadable iconv modules, the core iconv will always

  be carried around with aprutil.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96134 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.win b/Makefile.win
index fe13f0196e1f771c7e7804149ad6b523b8db9187..a1892ee50ffdd895f220aeabf2a8f70bf0bab1c5 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -357,7 +357,6 @@ _install:
        copy $(LONG)\Apache.exe "$(INSTDIR)\bin" <.y
        copy $(LONG)\libhttpd.dll "$(INSTDIR)\bin" <.y
        copy srclib\apr\$(LONG)\libapr.dll "$(INSTDIR)\bin" <.y
-       copy srclib\apr-iconv\$(LONG)\libapriconv.dll "$(INSTDIR)\bin" <.y
        copy srclib\apr-util\$(LONG)\libaprutil.dll "$(INSTDIR)\bin" <.y
        copy modules\aaa\$(LONG)\mod_access.so "$(INSTDIR)\modules" <.y
        copy modules\aaa\$(LONG)\mod_auth.so "$(INSTDIR)\modules" <.y
@@ -406,7 +405,6 @@ _install:
        copy $(LONG)\Apache.pdb "$(INSTDIR)\bin" <.y
        copy $(LONG)\libhttpd.pdb "$(INSTDIR)\bin" <.y
        copy srclib\apr\$(LONG)\libapr.pdb "$(INSTDIR)\bin" <.y
-       copy srclib\apr-iconv\$(LONG)\libapriconv.pdb "$(INSTDIR)\bin" <.y
        copy srclib\apr-util\$(LONG)\libaprutil.pdb "$(INSTDIR)\bin" <.y
        copy modules\aaa\$(LONG)\mod_access.pdb "$(INSTDIR)\modules" <.y
        copy modules\aaa\$(LONG)\mod_auth.pdb "$(INSTDIR)\modules" <.y
@@ -603,7 +601,6 @@ BEGIN {
        xcopy include\*.h "$(INSTDIR)\include" /d < .a
        xcopy docs\icons "$(INSTDIR)\icons" /s /d < .a
        copy srclib\apr\Lib$(SHORT)\apr.lib "$(INSTDIR)\lib" <.y
-       copy srclib\apr-iconv\Lib$(SHORT)\apriconv.lib "$(INSTDIR)\lib" <.y
        copy srclib\apr-util\Lib$(SHORT)\aprutil.lib "$(INSTDIR)\lib" <.y
        copy srclib\pcre\Lib$(SHORT)\pcre.lib "$(INSTDIR)\lib" <.y
        copy srclib\pcre\Lib$(SHORT)\pcreposix.lib "$(INSTDIR)\lib" <.y
@@ -612,8 +609,6 @@ BEGIN {
        copy srclib\apr-util\xml\expat\lib\Lib$(SHORT)\xml.lib "$(INSTDIR)\lib\expat.lib" <.y
        copy srclib\apr\$(LONG)\libapr.lib "$(INSTDIR)\lib" <.y
        copy srclib\apr\$(LONG)\libapr.exp "$(INSTDIR)\lib" <.y
-       copy srclib\apr-iconv\$(LONG)\libapriconv.lib "$(INSTDIR)\lib" <.y
-       copy srclib\apr-iconv\$(LONG)\libapriconv.exp "$(INSTDIR)\lib" <.y
        copy srclib\apr-util\$(LONG)\libaprutil.lib "$(INSTDIR)\lib" <.y
        copy srclib\apr-util\$(LONG)\libaprutil.exp "$(INSTDIR)\lib" <.y
        copy $(LONG)\libhttpd.exp "$(INSTDIR)\lib" <.y