1:22 a.m.
Author: mladen.turk(a)jboss.com
Date: 2007-12-19 02:22:43 -0500 (Wed, 19 Dec 2007)
New Revision: 1251
Modified:
trunk/httpd/httpd-2.2/NMAKEhttpd.inc
trunk/httpd/httpd-2.2/NMAKElibhttpd
trunk/httpd/httpd-2.2/modules/filters/NMAKEdeflate
trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile
Log:
Use variable for zlib library name
Modified: trunk/httpd/httpd-2.2/NMAKEhttpd.inc
===================================================================
--- trunk/httpd/httpd-2.2/NMAKEhttpd.inc 2007-12-18 16:44:26 UTC (rev 1250)
+++ trunk/httpd/httpd-2.2/NMAKEhttpd.inc 2007-12-19 07:22:43 UTC (rev 1251)
@@ -42,6 +42,8 @@
APU = aprutil-1.lib
API = apriconv-1.lib
PCRE = pcre.lib
+ZLIB = zlib-1.lib
+LIBZLIB = libzlib-1.lib
LIBHTTPD = libhttpd.lib
DISTSUBDIRS = \
Modified: trunk/httpd/httpd-2.2/NMAKElibhttpd
===================================================================
--- trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-18 16:44:26 UTC (rev 1250)
+++ trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-19 07:22:43 UTC (rev 1251)
@@ -117,7 +117,7 @@
.SUFFIXES : .h
$(BUILDINS): $(DISTSUBDIRS)
- @copy /Y LICENSE $@ >NUL
+ @copy /Y LICENSE $(@D) >NUL
$(BUILDAPR):
@cd $(SRCDIR)\srclib\apr
@@ -202,14 +202,14 @@
$(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) $(BUILDTCHR) $(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
clean:
@$(CLEANTARGET)
-install: $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDBIN)
+install: $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU)
$(BUILDPCRE) $(BUILDZLIB) $(BUILDBIN)
@xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q
@xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q
@xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL
Modified: trunk/httpd/httpd-2.2/modules/filters/NMAKEdeflate
===================================================================
--- trunk/httpd/httpd-2.2/modules/filters/NMAKEdeflate 2007-12-18 16:44:26 UTC (rev 1250)
+++ trunk/httpd/httpd-2.2/modules/filters/NMAKEdeflate 2007-12-19 07:22:43 UTC (rev 1251)
@@ -33,7 +33,7 @@
!include <..\..\NMAKEhttpd.inc>
LDIRS = /libpath:"$(BUILDLIB)"
-LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
$(LIBAPR) $(LIBAPU) $(LIBHTTPD) zlib-1.lib
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
$(LIBAPR) $(LIBAPU) $(LIBHTTPD) $(ZLIB)
CFLAGS = $(CFLAGS) -DHAVE_ZUTIL_H -DZLIB_WINAPI
INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
Modified: trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile 2007-12-18 16:44:26 UTC (rev 1250)
+++ trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile 2007-12-19 07:22:43 UTC (rev 1251)
@@ -28,12 +28,28 @@
!IF !DEFINED(ZLIB_DECLARE_STATIC) || "$(ZLIB_DECLARE_STATIC)" == ""
TARGET=DLL
-PROJECT = libzlib-1
+!ELSE
+TARGET=LIB
+!ENDIF
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
+
+!IF "$(TARGET)" == "DLL"
+PROJECT = $(ZLIB)
CFLAGS = -DZLIB_DLL $(CFLAGS)
+BUILDBIN = $(WORKDIR)\$(PROJECT).dll
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
!ELSE
-TARGET=LIB
-PROJECT = zlib-1
+PROJECT = $(LIBZLIB)
CFLAGS = -DZLIB_WINAPI $(CFLAGS)
+BUILDBIN = $(WORKDIR)\$(PROJECT).lib
!ENDIF
!IF "$(CPU)" != "I386"
@@ -41,15 +57,7 @@
!ENDIF
CFLAGS = $(CFLAGS) -D_CRT_SECURE_NO_DEPRECATE
-# CFLAGS = -wd4996 $(CFLAGS)
-!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
-SRCDIR = .
-!ENDIF
-
-!include <..\..\NMAKEcommon.inc>
-!include <..\..\NMAKEhttpd.inc>
-
INCLUDES = -I$(SRCDIR)
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
OBJECTS = \