Author: jfrederic.clere(a)jboss.com
Date: 2014-08-23 11:50:45 -0400 (Sat, 23 Aug 2014)
New Revision: 3355
Modified:
trunk/httpd/httpd-2.4/NMAKElibhttpd
Log:
Remove the iconv dependency.
Modified: trunk/httpd/httpd-2.4/NMAKElibhttpd
===================================================================
--- trunk/httpd/httpd-2.4/NMAKElibhttpd 2014-08-23 14:34:07 UTC (rev 3354)
+++ trunk/httpd/httpd-2.4/NMAKElibhttpd 2014-08-23 15:50:45 UTC (rev 3355)
@@ -228,7 +228,7 @@
$(BUILDRES): build\win32\httpd.rc
$(RC) $(RCFLAGS) /i "$(SRCDIR)\build\win32" /i "$(SRCDIR)\include"
/i "$(SRCDIR)\srclib\apr\include" /fo $(BUILDRES) build\win32\httpd.rc
-$(BUILDBIN): $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDICONV) $(BUILDAPU)
$(BUILDPCRE) $(BUILDZLIB) $(OBJECTS) $(BUILDRES)
+$(BUILDBIN): $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE)
$(BUILDZLIB) $(OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB)
/out:$(BUILDBIN)
IF EXIST $(BUILDMFT) \
mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2