Author: mladen.turk(a)jboss.com Date: 2007-12-18 05:07:23 -0500 (Tue, 18 Dec 2007) New Revision: 1238 Added: trunk/httpd/httpd-2.2/modules/filters/NMAKEdeflate trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile Log: Add deflate module with statically linked zlib Added: trunk/httpd/httpd-2.2/modules/filters/NMAKEdeflate =================================================================== --- trunk/httpd/httpd-2.2/modules/filters/NMAKEdeflate (rev 0) +++ trunk/httpd/httpd-2.2/modules/filters/NMAKEdeflate 2007-12-18 10:07:23 UTC (rev 1238) @@ -0,0 +1,63 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile deflate module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_deflate + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!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 +CFLAGS = $(CFLAGS) -DHAVE_ZUTIL_H -DZLIB_WINAPI + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).so +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="deflate_module for Apache" + +OBJECTS = \ + $(WORKDIR)\mod_deflate.obj + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +install: $(BUILDBIN) Property changes on: trunk/httpd/httpd-2.2/modules/filters/NMAKEdeflate ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile (rev 0) +++ trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile 2007-12-18 10:07:23 UTC (rev 1238) @@ -0,0 +1,43 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile Master HTTPD filter modules makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +MODULES = \ + $(SRCDIR)\NMAKEdeflate + +$(MODULES): + @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + +$(WORKDIR): + @$(MAKEWORKDIR) + +install: $(WORKDIR) $(MODULES) + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL Property changes on: trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile ___________________________________________________________________ Name: svn:eol-style + native