[jbossnative-commits] JBoss Native SVN: r1252 - trunk/httpd/httpd-2.2.
Author: mladen.turk(a)jboss.com
Date: 2007-12-19 02:31:36 -0500 (Wed, 19 Dec 2007)
New Revision: 1252
Modified:
trunk/httpd/httpd-2.2/NMAKElibhttpd
Log:
Use variables for library names
Modified: trunk/httpd/httpd-2.2/NMAKElibhttpd
===================================================================
--- trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-19 07:22:43 UTC (rev 1251)
+++ trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-19 07:31:36 UTC (rev 1252)
@@ -102,11 +102,11 @@
RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).dll" /d LONG_NAME="Apache
HTTP Server Core"
-BUILDAPR = $(BUILDOUT)\libapr-1.dll
-BUILDAPI = $(BUILDOUT)\libapriconv-1.dll
-BUILDAPU = $(BUILDOUT)\libaprutil-1.dll
-BUILDZLIB = $(BUILDLIB)\zlib-1.lib
-BUILDPCRE = $(BUILDLIB)\pcre.lib
+BUILDAPR = $(BUILDOUT)\$(LIBAPR).dll
+BUILDAPI = $(BUILDOUT)\$(LIBAPI).dll
+BUILDAPU = $(BUILDOUT)\$(LIBAPU).dll
+BUILDZLIB = $(BUILDLIB)\$(ZLIB).lib
+BUILDPCRE = $(BUILDLIB)\$(PCRE).lib
BUILDTCHR = $(SRCDIR)\server\gen_test_char.exe
all: $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE)
$(BUILDZLIB) $(BUILDBIN)
@@ -152,9 +152,6 @@
@$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) install
@cd ..
-$(SRCDIR)\server\test_char.h : $(BUILDAPR) $(BUILDTCHR)
- @$(BUILDTCHR) > $@
-
{$(SRCDIR)\server}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
@@ -173,6 +170,9 @@
{$(SRCDIR)\modules\mappers}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+$(SRCDIR)\server\test_char.h : $(BUILDAPR) $(BUILDTCHR)
+ @$(BUILDTCHR) > $@
+
{$(SRCDIR)\os\win32}.h{$(SRCDIR)\include}.h:
@copy /Y $< $@ >NUL
@@ -202,10 +202,12 @@
$(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) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB)
/out:$(BUILDBIN)
IF EXIST $(BUILDMFT) \
mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
+
clean:
@$(CLEANTARGET)