Author: mladen.turk(a)jboss.com Date: 2007-12-14 02:52:11 -0500 (Fri, 14 Dec 2007) New Revision: 1210 Modified: trunk/httpd/NMAKElibhttpd trunk/httpd/NMAKEmakefile trunk/httpd/srclib/apr-iconv/NMAKEmakefile trunk/httpd/srclib/apr-util/NMAKEmakefile trunk/httpd/srclib/apr/NMAKEmakefile trunk/httpd/srclib/pcre/NMAKEmakefile trunk/httpd/srclib/zlib/NMAKEmakefile Log: Add temporary install target Modified: trunk/httpd/NMAKElibhttpd =================================================================== --- trunk/httpd/NMAKElibhttpd 2007-12-13 18:37:43 UTC (rev 1209) +++ trunk/httpd/NMAKElibhttpd 2007-12-14 07:52:11 UTC (rev 1210) @@ -47,7 +47,9 @@ $(SRCDIR)\include\mpm.h \ $(SRCDIR)\include\mpm_default.h +BUILDINC = $(PREFIX)\include BUILDLIB = $(PREFIX)\lib +BUILDOUT = $(PREFIX)\bin BUILDBIN = $(WORKDIR)\$(PROJECT).dll BUILDPDB = $(WORKDIR)\$(PROJECT).pdb @@ -61,11 +63,17 @@ BUILDAPU = $(SRCDIR)\srclib\apr-util\$(WORKDIR)\libaprutil-1.dll BUILDPCRE = $(SRCDIR)\srclib\pcre\$(WORKDIR_LIB)\pcre.lib -all : $(WORKDIR) $(BUILDLIB) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDBIN) +all : $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDBIN) +$(BUILDINC) : + @if not exist "$(BUILDINC)\arch\win32\$(NULL)" mkdir "$(BUILDINC)\arch\win32" + $(BUILDLIB) : @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" +$(BUILDOUT) : + @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)" + $(WORKDIR) : @$(MAKEWORKDIR) @@ -73,22 +81,22 @@ $(BUILDAPR) : cd $(SRCDIR)\srclib\apr - $(MAKE) -f NMAKEmakefile + $(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) install cd ..\.. $(BUILDAPU) : cd $(SRCDIR)\srclib\apr-util - $(MAKE) -f NMAKEmakefile + $(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) install cd ..\.. $(BUILDAPI) : cd $(SRCDIR)\srclib\apr-iconv - $(MAKE) -f NMAKEmakefile + $(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) install cd ..\.. $(BUILDPCRE) : cd $(SRCDIR)\srclib\pcre - $(MAKE) -f NMAKEmakefile PCRE_STATIC=1 + $(MAKE) -f NMAKEmakefile PCRE_STATIC=1 PREFIX=$(PREFIX) install cd ..\.. {$(SRCDIR)\server}.c{$(WORKDIR)}.obj: @@ -112,5 +120,7 @@ clean: @$(CLEANTARGET) -install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) - @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL +install: $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(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/NMAKEmakefile =================================================================== --- trunk/httpd/NMAKEmakefile 2007-12-13 18:37:43 UTC (rev 1209) +++ trunk/httpd/NMAKEmakefile 2007-12-14 07:52:11 UTC (rev 1210) @@ -32,6 +32,10 @@ SRCDIR = . !ENDIF +!IF !DEFINED(PREFIX) || "$(PREFIX)" == "" +PREFIX = $(SRCDIR)\dist\WINNT-$(CPU) +!ENDIF + !include <NMAKEcommon.inc> LDIRS = /libpath:"$(SRCDIR)\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)" @@ -54,16 +58,19 @@ BUILDDEP = $(WORKDIR_DLL)\libhttpd.dll -all : $(WORKDIR) $(BUILDLIB) $(BUILDDEP) $(BUILDBIN) +all : $(WORKDIR) $(BUILDLIB) $(BUILDOUT) $(BUILDDEP) $(BUILDBIN) $(BUILDLIB) : @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" +$(BUILDOUT) : + @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)" + $(WORKDIR) : @$(MAKEWORKDIR) $(BUILDDEP) : - $(MAKE) -f NMAKElibhttpd PREFIX=$(PREFIX) + $(MAKE) -f NMAKElibhttpd PREFIX=$(PREFIX) install {$(SRCDIR)\server}.c{$(WORKDIR)}.obj: $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< @@ -77,5 +84,5 @@ clean: @$(CLEANTARGET) -install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) - @xcopy "$(WORKDIR)\*.exe" "$(BUILDLIB)" /Y /Q 2>NUL +install: $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN) + @xcopy "$(WORKDIR)\*.exe" "$(BUILDOUT)" /Y /Q 2>NUL Modified: trunk/httpd/srclib/apr/NMAKEmakefile =================================================================== --- trunk/httpd/srclib/apr/NMAKEmakefile 2007-12-13 18:37:43 UTC (rev 1209) +++ trunk/httpd/srclib/apr/NMAKEmakefile 2007-12-14 07:52:11 UTC (rev 1210) @@ -115,6 +115,7 @@ BUILDINC = $(PREFIX)\include BUILDLIB = $(PREFIX)\lib +BUILDOUT = $(PREFIX)\bin !IF "$(TARGET)" == "DLL" BUILDBIN = $(WORKDIR)\$(PROJECT).dll BUILDPDB = $(WORKDIR)\$(PROJECT).pdb @@ -124,7 +125,7 @@ BUILDBIN = $(WORKDIR)\$(PROJECT).lib !ENDIF -all : $(BUILDINC) $(BUILDLIB) $(WORKDIR) $(HEADERS) $(BUILDBIN) +all : $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDBIN) $(BUILDINC) : @if not exist "$(BUILDINC)\arch\win32\$(NULL)" mkdir "$(BUILDINC)\arch\win32" @@ -132,6 +133,9 @@ $(BUILDLIB) : @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" +$(BUILDOUT) : + @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)" + $(WORKDIR) : @$(MAKEWORKDIR) @@ -220,9 +224,9 @@ clean: @$(CLEANTARGET) -install: $(BUILDINC) $(BUILDLIB) $(WORKDIR) $(HEADERS) $(BUILDBIN) +install: $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDBIN) @xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q @xcopy "$(SRCDIR)\include\arch\apr_private_common.h" "$(BUILDINC)\arch" /Y /Q @xcopy "$(SRCDIR)\include\arch\win32\*.h" "$(BUILDINC)\arch\win32" /Y /Q @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q - @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL + @xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL Modified: trunk/httpd/srclib/apr-iconv/NMAKEmakefile =================================================================== --- trunk/httpd/srclib/apr-iconv/NMAKEmakefile 2007-12-13 18:37:43 UTC (rev 1209) +++ trunk/httpd/srclib/apr-iconv/NMAKEmakefile 2007-12-14 07:52:11 UTC (rev 1210) @@ -281,6 +281,7 @@ $(WORKDIR)\iconv_uc.obj +BUILDOUT = $(PREFIX)\bin BUILDLIB = $(PREFIX)\lib BUILDINC = $(PREFIX)\include @@ -293,11 +294,14 @@ BUILDBIN = $(WORKDIR)\$(PROJECT).lib !ENDIF -all : $(BUILDLIB) $(WORKDIR) $(BUILDBIN) +all : $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN) $(BUILDLIB) : @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" +$(BUILDOUT) : + @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)" + $(WORKDIR) : @$(MAKEWORKDIR) @@ -328,7 +332,7 @@ clean: @$(CLEANTARGET) -install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) +install: $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN) @xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q - @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL + @xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL Modified: trunk/httpd/srclib/apr-util/NMAKEmakefile =================================================================== --- trunk/httpd/srclib/apr-util/NMAKEmakefile 2007-12-13 18:37:43 UTC (rev 1209) +++ trunk/httpd/srclib/apr-util/NMAKEmakefile 2007-12-14 07:52:11 UTC (rev 1210) @@ -123,7 +123,7 @@ $(SRCDIR)\xml\expat\lib\config.h \ $(SRCDIR)\xml\expat\lib\expat.h - +BUILDOUT = $(PREFIX)\bin BUILDLIB = $(PREFIX)\lib BUILDINC = $(PREFIX)\include @@ -136,11 +136,14 @@ BUILDBIN = $(WORKDIR)\$(PROJECT).lib !ENDIF -all : $(BUILDLIB) $(WORKDIR) $(HEADERS) $(BUILDBIN) +all : $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDBIN) $(BUILDLIB) : @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" +$(BUILDOUT) : + @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)" + $(WORKDIR) : @$(MAKEWORKDIR) @@ -217,7 +220,7 @@ clean: @$(CLEANTARGET) -install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) +install: $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN) @xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q - @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL + @xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL Modified: trunk/httpd/srclib/pcre/NMAKEmakefile =================================================================== --- trunk/httpd/srclib/pcre/NMAKEmakefile 2007-12-13 18:37:43 UTC (rev 1209) +++ trunk/httpd/srclib/pcre/NMAKEmakefile 2007-12-14 07:52:11 UTC (rev 1210) @@ -59,6 +59,7 @@ $(SRCDIR)\config.h +BUILDOUT = $(PREFIX)\bin BUILDLIB = $(PREFIX)\lib BUILDINC = $(PREFIX)\include @@ -71,7 +72,7 @@ BUILDBIN = $(WORKDIR)\$(PROJECT).lib !ENDIF -all : $(BUILDLIB) $(WORKDIR) $(HEADERS) $(BUILDBIN) +all : $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDBIN) $(BUILDLIB) : @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" @@ -101,7 +102,7 @@ clean: @$(CLEANTARGET) -install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) +install: $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN) @xcopy "$(SRCDIR)\pcre.h" "$(BUILDINC)" /Y /Q @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q - @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL + @xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL Modified: trunk/httpd/srclib/zlib/NMAKEmakefile =================================================================== --- trunk/httpd/srclib/zlib/NMAKEmakefile 2007-12-13 18:37:43 UTC (rev 1209) +++ trunk/httpd/srclib/zlib/NMAKEmakefile 2007-12-14 07:52:11 UTC (rev 1210) @@ -85,6 +85,7 @@ BUILDINC = $(PREFIX)\include\apr-1 BUILDLIB = $(PREFIX)\lib +BUILDOUT = $(PREFIX)\lib !IF "$(TARGET)" == "DLL" BUILDBIN = $(WORKDIR)\$(PROJECT).dll BUILDPDB = $(WORKDIR)\$(PROJECT).pdb @@ -94,7 +95,7 @@ BUILDBIN = $(WORKDIR)\$(PROJECT).lib !ENDIF -all : $(WORKDIR) $(BUILDBIN) +all : $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN) $(BUILDINC) : @if not exist "$(BUILDINC)\arch\win32\$(NULL)" mkdir "$(BUILDINC)\arch\win32" @@ -102,6 +103,9 @@ $(BUILDLIB) : @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" +$(BUILDOUT) : + @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)" + $(WORKDIR) : @$(MAKEWORKDIR) @@ -142,9 +146,9 @@ clean: @$(CLEANTARGET) -install: $(BUILDINC) $(BUILDLIB) $(WORKDIR) $(BUILDBIN) +install: $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN) @xcopy "$(SRCDIR)\zlib.h" "$(BUILDINC)" /Y /Q @xcopy "$(SRCDIR)\zconf.h" "$(BUILDINC)" /Y /Q @xcopy "$(SRCDIR)\zutil.h" "$(BUILDINC)" /Y /Q @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q - @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL + @xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL