[jbossnative-commits] JBoss Native SVN: r1674 - trunk/httpd/httpd-2.2.
Author: mladen.turk(a)jboss.com
Date: 2008-06-09 06:58:07 -0400 (Mon, 09 Jun 2008)
New Revision: 1674
Modified:
trunk/httpd/httpd-2.2/NMAKElibhttpd
Log:
Add GNU Iconv to the build
Modified: trunk/httpd/httpd-2.2/NMAKElibhttpd
===================================================================
--- trunk/httpd/httpd-2.2/NMAKElibhttpd 2008-06-09 10:53:56 UTC (rev 1673)
+++ trunk/httpd/httpd-2.2/NMAKElibhttpd 2008-06-09 10:58:07 UTC (rev 1674)
@@ -108,6 +108,7 @@
BUILDZLIB = $(BUILDLIB)\$(ZLIB)
BUILDPCRE = $(BUILDLIB)\$(PCRE)
BUILDTCHR = $(SRCDIR)\server\gen_test_char.exe
+BUILDICONV = $(BUILDOUT)\$(LIBICONV)
all: $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE)
$(BUILDZLIB) $(BUILDBIN)
@@ -119,6 +120,11 @@
$(BUILDINS): $(DISTSUBDIRS)
@copy /Y LICENSE $(@D) >NUL
+$(BUILDICONV):
+ @cd $(SRCDIR)\srclib\iconv
+ @$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) install
+ @cd ..\..
+
$(BUILDAPR):
@cd $(SRCDIR)\srclib\apr
@$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) install
@@ -203,7 +209,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) $(BUILDAPU) $(BUILDPCRE)
$(BUILDZLIB) $(OBJECTS) $(BUILDRES)
+$(BUILDBIN): $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDICONV) $(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