[jbossnative-commits] JBoss Native SVN: r1236 - in trunk/httpd/httpd-2.2: srclib/zlib and 1 other directory.
Author: mladen.turk(a)jboss.com
Date: 2007-12-18 04:58:54 -0500 (Tue, 18 Dec 2007)
New Revision: 1236
Modified:
trunk/httpd/httpd-2.2/NMAKElibhttpd
trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile
Log:
Add zlib to the build dependencies
Modified: trunk/httpd/httpd-2.2/NMAKElibhttpd
===================================================================
--- trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-18 09:39:45 UTC (rev 1235)
+++ trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-18 09:58:54 UTC (rev 1236)
@@ -105,10 +105,11 @@
BUILDAPR = $(BUILDOUT)\libapr-1.dll
BUILDAPI = $(BUILDOUT)\libapriconv-1.dll
BUILDAPU = $(BUILDOUT)\libaprutil-1.dll
+BUILDZLIB = $(BUILDLIB)\zlib-1.lib
BUILDPCRE = $(BUILDLIB)\pcre.lib
BUILDTCHR = $(SRCDIR)\server\$(WORKDIR_EXE)\gen_test_char.exe
-all: $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE)
$(BUILDBIN)
+all: $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE)
$(BUILDZLIB) $(BUILDBIN)
$(WORKDIR):
@$(MAKEWORKDIR)
@@ -141,6 +142,11 @@
@$(MAKE) -nologo -f NMAKEmakefile PCRE_STATIC=1 PREFIX=$(PREFIX) install
cd ..\..
+$(BUILDZLIB):
+ cd $(SRCDIR)\srclib\zlib
+ @$(MAKE) -nologo -f NMAKEmakefile ZLIB_DECLARE_STATIC=1 PREFIX=$(PREFIX) install
+ cd ..\..
+
$(BUILDTCHR):
cd $(SRCDIR)\server
@$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX)
@@ -196,7 +202,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)
$(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
Modified: trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile 2007-12-18 09:39:45 UTC (rev 1235)
+++ trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile 2007-12-18 09:58:54 UTC (rev 1236)
@@ -1,4 +1,4 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
+# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,7 @@
# ASM=1 Use Masm
# DEBUG=1 Build DEBUG version of Zlib
#
-# Originally contributed by Mladen Turk <mturk jboss.com>
+# Originally contributed by Mladen Turk <mturk redhat.com>
#
# ====================================================================
#
@@ -29,17 +29,18 @@
!IF !DEFINED(ZLIB_DECLARE_STATIC) || "$(ZLIB_DECLARE_STATIC)" == ""
TARGET=DLL
PROJECT = libzlib-1
-CFLAGS = -DZLIB_DLL -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS)
+CFLAGS = -DZLIB_DLL $(CFLAGS)
!ELSE
TARGET=LIB
PROJECT = zlib-1
-CFLAGS = -DZLIB_WINAPI -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS)
+CFLAGS = -DZLIB_WINAPI $(CFLAGS)
!ENDIF
!IF "$(CPU)" != "I386"
CFLAGS = -GS- $(CFLAGS)
!ENDIF
+CFLAGS = $(CFLAGS) -D_CRT_SECURE_NO_DEPRECATE
# CFLAGS = -wd4996 $(CFLAGS)
!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
@@ -93,7 +94,7 @@
BUILDBIN = $(WORKDIR)\$(PROJECT).lib
!ENDIF
-all : $(BUILDINS) $(WORKDIR) $(BUILDBIN)
+all : $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
$(WORKDIR) :
@$(MAKEWORKDIR)
@@ -135,7 +136,7 @@
clean:
@$(CLEANTARGET)
-install: $(BUILDINS) $(WORKDIR) $(BUILDBIN)
+install: $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
@xcopy "$(SRCDIR)\zlib.h" "$(BUILDINC)" /Y /Q
@xcopy "$(SRCDIR)\zconf.h" "$(BUILDINC)" /Y /Q
@xcopy "$(SRCDIR)\zutil.h" "$(BUILDINC)" /Y /Q