[jbossnative-commits] JBoss Native SVN: r1213 - in trunk/httpd: srclib/apr-util and 1 other directory.
Author: mladen.turk(a)jboss.com
Date: 2007-12-14 06:54:33 -0500 (Fri, 14 Dec 2007)
New Revision: 1213
Modified:
trunk/httpd/NMAKElibhttpd
trunk/httpd/srclib/apr-util/NMAKEmakefile
Log:
Build static APR versions as well for tool
Modified: trunk/httpd/NMAKElibhttpd
===================================================================
--- trunk/httpd/NMAKElibhttpd 2007-12-14 10:02:17 UTC (rev 1212)
+++ trunk/httpd/NMAKElibhttpd 2007-12-14 11:54:33 UTC (rev 1213)
@@ -82,16 +82,19 @@
$(BUILDAPR) :
cd $(SRCDIR)\srclib\apr
$(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) install
+ $(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) APR_DECLARE_STATIC=1 install
cd ..\..
$(BUILDAPU) :
cd $(SRCDIR)\srclib\apr-util
$(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) install
+ $(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) APR_DECLARE_STATIC=1 install
cd ..\..
$(BUILDAPI) :
cd $(SRCDIR)\srclib\apr-iconv
$(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) install
+ $(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) APR_DECLARE_STATIC=1 install
cd ..\..
$(BUILDPCRE) :
Modified: trunk/httpd/srclib/apr-util/NMAKEmakefile
===================================================================
--- trunk/httpd/srclib/apr-util/NMAKEmakefile 2007-12-14 10:02:17 UTC (rev 1212)
+++ trunk/httpd/srclib/apr-util/NMAKEmakefile 2007-12-14 11:54:33 UTC (rev 1213)
@@ -58,9 +58,8 @@
LDIRS = /libpath:"$(WITH_APR)\$(WORKDIR)"
/libpath:"$(WITH_API)\$(WORKDIR)"
-LFLAGS = $(LFLAGS) $(APR_LIB) $(API_LIB)
!IF "$(TARGET)" == "DLL"
-LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
$(APR_LIB) $(API_LIB)
!ENDIF
INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\include\private -I$(SRCDIR)\xml\expat\lib
-I$(WITH_APR)\include -I$(WITH_API)\include