Author: mladen.turk(a)jboss.com Date: 2008-04-21 02:43:53 -0400 (Mon, 21 Apr 2008) New Revision: 1545 Modified: trunk/httpd/httpd-2.2/NMAKEhttpd.inc trunk/httpd/httpd-2.2/modules/filters/NMAKEdeflate trunk/httpd/httpd-2.2/modules/proxy/NMAKEproxyajp trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile Log: Some fixes for windows makefiles Modified: trunk/httpd/httpd-2.2/NMAKEhttpd.inc =================================================================== --- trunk/httpd/httpd-2.2/NMAKEhttpd.inc 2008-04-20 05:38:07 UTC (rev 1544) +++ trunk/httpd/httpd-2.2/NMAKEhttpd.inc 2008-04-21 06:43:53 UTC (rev 1545) @@ -46,7 +46,10 @@ LIBZLIB = libzlib-1.lib LIBHTTPD = libhttpd.lib +!IF "$(TARGET)" != "LIB" LFLAGS = $(LFLAGS) /version:2.2 +!ENDIF + DISTSUBDIRS = \ $(PREFIX)\include\arch\win32\~ \ $(PREFIX)\lib\~ \ Modified: trunk/httpd/httpd-2.2/modules/filters/NMAKEdeflate =================================================================== --- trunk/httpd/httpd-2.2/modules/filters/NMAKEdeflate 2008-04-20 05:38:07 UTC (rev 1544) +++ trunk/httpd/httpd-2.2/modules/filters/NMAKEdeflate 2008-04-21 06:43:53 UTC (rev 1545) @@ -34,7 +34,7 @@ LDIRS = /libpath:"$(BUILDLIB)" 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 +CFLAGS = $(CFLAGS) -DHAVE_ZUTIL_H INCLUDES = -I$(SRCDIR) -I$(BUILDINC) PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src Modified: trunk/httpd/httpd-2.2/modules/proxy/NMAKEproxyajp =================================================================== --- trunk/httpd/httpd-2.2/modules/proxy/NMAKEproxyajp 2008-04-20 05:38:07 UTC (rev 1544) +++ trunk/httpd/httpd-2.2/modules/proxy/NMAKEproxyajp 2008-04-21 06:43:53 UTC (rev 1545) @@ -51,6 +51,10 @@ $(WORKDIR)\ajp_msg.obj \ $(WORKDIR)\mod_proxy_ajp.obj +!IF EXISTS($(SRCDIR)\ajp_utils.c) +OBJECTS = $(OBJECTS) $(WORKDIR)\ajp_utils.obj +!ENDIF + {$(SRCDIR)}.c{$(WORKDIR)}.obj: $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< Modified: trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile 2008-04-20 05:38:07 UTC (rev 1544) +++ trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile 2008-04-21 06:43:53 UTC (rev 1545) @@ -48,7 +48,6 @@ BUILDMFT = $(BUILDBIN).manifest !ELSE PROJECT = zlib-1 -CFLAGS = -DZLIB_WINAPI $(CFLAGS) BUILDBIN = $(WORKDIR)\$(PROJECT).lib !ENDIF