[jbossnative-commits] JBoss Native SVN: r1386 - in trunk/httpd/httpd-2.2: srclib/zlib and 1 other directory.

[jbossnative-commits at lists.jboss.org]

Author: mladen.turk at jboss.com
Date: 2008-02-22 03:35:30 -0500 (Fri, 22 Feb 2008)
New Revision: 1386

Modified:
   trunk/httpd/httpd-2.2/NMAKElibhttpd
   trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile
Log:
Fix target extensions for libraries

Modified: trunk/httpd/httpd-2.2/NMAKElibhttpd
===================================================================
--- trunk/httpd/httpd-2.2/NMAKElibhttpd	2008-02-22 07:51:35 UTC (rev 1385)
+++ trunk/httpd/httpd-2.2/NMAKElibhttpd	2008-02-22 08:35:30 UTC (rev 1386)
@@ -102,11 +102,11 @@
 
 RCFLAGS =  $(RCFLAGS) /d BIN_NAME="$(PROJECT).dll" /d LONG_NAME="Apache HTTP Server Core"
 
-BUILDAPR  = $(BUILDOUT)\$(LIBAPR).dll
-BUILDAPI  = $(BUILDOUT)\$(LIBAPI).dll
-BUILDAPU  = $(BUILDOUT)\$(LIBAPU).dll
-BUILDZLIB = $(BUILDLIB)\$(ZLIB).lib
-BUILDPCRE = $(BUILDLIB)\$(PCRE).lib
+BUILDAPR  = $(BUILDOUT)\$(LIBAPR)
+BUILDAPI  = $(BUILDOUT)\$(LIBAPI)
+BUILDAPU  = $(BUILDOUT)\$(LIBAPU)
+BUILDZLIB = $(BUILDLIB)\$(ZLIB)
+BUILDPCRE = $(BUILDLIB)\$(PCRE)
 BUILDTCHR = $(SRCDIR)\server\gen_test_char.exe
 
 all: $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDZLIB) $(BUILDBIN)

Modified: trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile	2008-02-22 07:51:35 UTC (rev 1385)
+++ trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile	2008-02-22 08:35:30 UTC (rev 1386)
@@ -40,14 +40,14 @@
 !include <..\..\NMAKEhttpd.inc>
 
 !IF "$(TARGET)" == "DLL"
-PROJECT = $(ZLIB)
+PROJECT = libzlib-1
 CFLAGS = -DZLIB_DLL $(CFLAGS)
 BUILDBIN = $(WORKDIR)\$(PROJECT).dll
 BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
 BUILDRES = $(WORKDIR)\$(PROJECT).res
 BUILDMFT = $(BUILDBIN).manifest
 !ELSE
-PROJECT = $(LIBZLIB)
+PROJECT = zlib-1
 CFLAGS = -DZLIB_WINAPI $(CFLAGS)
 BUILDBIN = $(WORKDIR)\$(PROJECT).lib
 !ENDIF
@@ -93,15 +93,6 @@
 ASM_OBJECTS =
 !ENDIF
 
-!IF "$(TARGET)" == "DLL"
-BUILDBIN = $(WORKDIR)\$(PROJECT).dll
-BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
-BUILDRES = $(WORKDIR)\$(PROJECT).res
-BUILDMFT = $(BUILDBIN).manifest
-!ELSE
-BUILDBIN = $(WORKDIR)\$(PROJECT).lib
-!ENDIF
-
 all : $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
 
 $(WORKDIR) :