[jbossnative-commits] JBoss Native SVN: r1220 - in trunk/httpd/httpd-2.2: srclib/apr and 4 other directories.

Author: mladen.turk(a)jboss.com Date: 2007-12-15 07:32:07 -0500 (Sat, 15 Dec 2007) New Revision: 1220 Modified: trunk/httpd/httpd-2.2/NMAKElibhttpd trunk/httpd/httpd-2.2/NMAKEmakefile trunk/httpd/httpd-2.2/srclib/apr-iconv/NMAKEmakefile trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile trunk/httpd/httpd-2.2/srclib/apr/NMAKEmakefile trunk/httpd/httpd-2.2/srclib/pcre/NMAKEmakefile trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile Log: Update make files Modified: trunk/httpd/httpd-2.2/NMAKElibhttpd =================================================================== --- trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-14 17:47:49 UTC (rev 1219) +++ trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-15 12:32:07 UTC (rev 1220) @@ -15,7 +15,7 @@ # # ==================================================================== # -# NMAKEmakefile Master HTTPD makefile. +# NMAKEmakefile HTTPD core library makefile. # Usage: # DEBUG=1 Build DEBUG version of HTTPD # @@ -32,48 +32,83 @@ SRCDIR = . !ENDIF +CFLAGS = $(CFLAGS) -DAP_DECLARE_EXPORT -DPCRE_STATIC + !include <NMAKEcommon.inc> +!include <NMAKEhttpd.inc> -LDIRS = /libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR)" /libpath:"$(SRCDIR)\srclib\apr-iconv\$(WORKDIR)" /libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR)" -LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib libapr-1.lib libapriconv-1.lib libaprutil-1.lib +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBAPI) $(PCRE) -INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\srclib\apr\include -I$(SRCDIR)\srclib\apr-util\include +INCLUDES = -I$(SRCDIR)\include -I$(BUILDINC) PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src OBJECTS = \ - $(WORKDIR)\main.obj + $(WORKDIR)\buildmark.obj \ + $(WORKDIR)\config.obj \ + $(WORKDIR)\connection.obj \ + $(WORKDIR)\core.obj \ + $(WORKDIR)\core_filters.obj \ + $(WORKDIR)\log.obj \ + $(WORKDIR)\protocol.obj \ + $(WORKDIR)\request.obj \ + $(WORKDIR)\vhost.obj \ + $(WORKDIR)\eoc_bucket.obj \ + $(WORKDIR)\error_bucket.obj \ + $(WORKDIR)\mpm_common.obj \ + $(WORKDIR)\scoreboard.obj \ + $(WORKDIR)\util.obj \ + $(WORKDIR)\util_cfgtree.obj \ + $(WORKDIR)\util_filter.obj \ + $(WORKDIR)\util_md5.obj \ + $(WORKDIR)\util_pcre.obj \ + $(WORKDIR)\util_script.obj \ + $(WORKDIR)\util_time.obj \ + $(WORKDIR)\util_xml.obj \ + $(WORKDIR)\listen.obj \ + $(WORKDIR)\byterange_filter.obj \ + $(WORKDIR)\chunk_filter.obj \ + $(WORKDIR)\http_core.obj \ + $(WORKDIR)\http_etag.obj \ + $(WORKDIR)\http_filters.obj \ + $(WORKDIR)\http_protocol.obj \ + $(WORKDIR)\http_request.obj \ + $(WORKDIR)\modules.obj \ + $(WORKDIR)\util_win32.obj \ + $(WORKDIR)\ap_regkey.obj \ + $(WORKDIR)\mod_win32.obj \ + $(WORKDIR)\child.obj \ + $(WORKDIR)\mpm_winnt.obj \ + $(WORKDIR)\nt_eventlog.obj \ + $(WORKDIR)\service.obj \ + $(WORKDIR)\mod_so.obj HEADERS = \ $(SRCDIR)\include\os.h \ $(SRCDIR)\include\mpm.h \ - $(SRCDIR)\include\mpm_default.h + $(SRCDIR)\include\mpm_default.h \ + $(SRCDIR)\include\mod_cgi.h \ + $(SRCDIR)\include\mod_core.h \ + $(SRCDIR)\include\mod_dav.h \ + $(SRCDIR)\include\mod_include.h \ + $(SRCDIR)\include\mod_proxy.h \ + $(SRCDIR)\include\mod_so.h \ + $(SRCDIR)\server\test_char.h -BUILDINC = $(PREFIX)\include -BUILDLIB = $(PREFIX)\lib -BUILDOUT = $(PREFIX)\bin - BUILDBIN = $(WORKDIR)\$(PROJECT).dll -BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb BUILDRES = $(WORKDIR)\$(PROJECT).res -BUILDMAN = $(BUILDBIN).manifest +BUILDMFT = $(BUILDBIN).manifest RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).dll" /d LONG_NAME="Apache HTTP Server Core" -BUILDAPR = $(SRCDIR)\srclib\apr\$(WORKDIR)\libapr-1.dll -BUILDAPI = $(SRCDIR)\srclib\apr-iconv\$(WORKDIR)\libapriconv-1.dll -BUILDAPU = $(SRCDIR)\srclib\apr-util\$(WORKDIR)\libaprutil-1.dll -BUILDPCRE = $(SRCDIR)\srclib\pcre\$(WORKDIR_LIB)\pcre.lib +BUILDAPR = $(BUILDOUT)\libapr-1.dll +BUILDAPI = $(BUILDOUT)\libapriconv-1.dll +BUILDAPU = $(BUILDOUT)\libaprutil-1.dll +BUILDPCRE = $(BUILDLIB)\pcre.lib +BUILDTCHR = $(SRCDIR)\server\$(WORKDIR_EXE)\gen_test_char.exe -all : $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDBIN) +all : $(BUILDINS) $(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) @@ -102,30 +137,69 @@ $(MAKE) -f NMAKEmakefile PCRE_STATIC=1 PREFIX=$(PREFIX) install cd ..\.. +$(BUILDTCHR) : + cd $(SRCDIR)\server + $(MAKE) -f NMAKEmakefile PREFIX=$(PREFIX) + cd .. + +$(SRCDIR)\server\test_char.h : $(BUILDAPR) $(BUILDTCHR) + $(BUILDTCHR) > $@ + {$(SRCDIR)\server}.c{$(WORKDIR)}.obj: $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< -$(SRCDIR)\include\os.h: - @copy /Y $(SRCDIR)\os\win32\os.h $@ >NUL +{$(SRCDIR)\modules\http}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< -$(SRCDIR)\include\mpm.h: - @copy /Y $(SRCDIR)\server\mpm\winnt\mpm.h $@ >NUL +{$(SRCDIR)\os\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< -$(SRCDIR)\include\mpm_default.h: - @copy /Y $(SRCDIR)\server\mpm\winnt\mpm_default.h $@ >NUL +{$(SRCDIR)\server\mpm\winnt}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< +{$(SRCDIR)\modules\arch\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\modules\mappers}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\os\win32}.h{$(SRCDIR)\include}.h: + @copy /Y $< $@ >NUL + +{$(SRCDIR)\modules\arch\win32}.h{$(SRCDIR)\include}.h: + @copy /Y $< $@ >NUL + +{$(SRCDIR)\server\mpm\winnt}.h{$(SRCDIR)\include}.h: + @copy /Y $< $@ >NUL + +{$(SRCDIR)\modules\http}.h{$(SRCDIR)\include}.h: + @copy /Y $< $@ >NUL + +{$(SRCDIR)\modules\filters}.h{$(SRCDIR)\include}.h: + @copy /Y $< $@ >NUL + +{$(SRCDIR)\modules\generators}.h{$(SRCDIR)\include}.h: + @copy /Y $< $@ >NUL + +{$(SRCDIR)\modules\proxy}.h{$(SRCDIR)\include}.h: + @copy /Y $< $@ >NUL + +{$(SRCDIR)\modules\mappers}.h{$(SRCDIR)\include}.h: + @copy /Y $< $@ >NUL + +{$(SRCDIR)\modules\dav\main}.h{$(SRCDIR)\include}.h: + @copy /Y $< $@ >NUL + $(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) $(OBJECTS) $(BUILDRES) $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) - IF EXIST $(BUILDMAN) \ - mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 clean: @$(CLEANTARGET) install: $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDBIN) @xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q - @xcopy "$(WORKDIR)\*.exp" "$(BUILDLIB)" /Y /Q 2>NUL @xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL - @xcopy "$(WORKDIR)\*.pdb" "$(BUILDOUT)" /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/NMAKEmakefile 2007-12-14 17:47:49 UTC (rev 1219) +++ trunk/httpd/httpd-2.2/NMAKEmakefile 2007-12-15 12:32:07 UTC (rev 1220) @@ -37,36 +37,28 @@ !ENDIF !include <NMAKEcommon.inc> +!include <NMAKEhttpd.inc> -LDIRS = /libpath:"$(SRCDIR)\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)" +LDIRS = /libpath:"$(BUILDLIB)" LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib -LIBS = $(LIBS) libapr-1.lib libaprutil-1.lib libhttpd.lib +LIBS = $(LIBS) $(LIBAPR) $(LIBAPU) $(LIBHTTPD) -INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\srclib\apr\include -I$(SRCDIR)\srclib\apr-util\include +INCLUDES = -I$(BUILDINC) PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src OBJECTS = \ $(WORKDIR)\main.obj -BUILDLIB = $(PREFIX)\lib -BUILDOUT = $(PREFIX)\bin - BUILDBIN = $(WORKDIR)\$(PROJECT).exe BUILDPDB = $(WORKDIR)\$(PROJECT).pdb BUILDRES = $(WORKDIR)\$(PROJECT).res -BUILDMAN = $(BUILDBIN).manifest +BUILDMFT = $(BUILDBIN).manifest RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).exe" /d LONG_NAME="Apache HTTP Server" /d ICON_FILE="apache.ico" -BUILDDEP = $(WORKDIR_DLL)\libhttpd.dll +BUILDDEP = $(BUILDBIN)\libhttpd.dll -all : $(WORKDIR) $(BUILDLIB) $(BUILDOUT) $(BUILDDEP) $(BUILDBIN) +all : $(BUILDINS) $(WORKDIR) $(BUILDBIN) -$(BUILDLIB) : - @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" - -$(BUILDOUT) : - @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)" - $(WORKDIR) : @$(MAKEWORKDIR) @@ -80,11 +72,20 @@ $(RC) $(RCFLAGS) /i "$(SRCDIR)\build\win32" /i "$(SRCDIR)\include" /i "$(SRCDIR)\srclib\apr\include" /fo $(BUILDRES) build\win32\httpd.rc $(BUILDBIN): $(WORKDIR) $(BUILDDEP) $(OBJECTS) $(BUILDRES) $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) - IF EXIST $(BUILDMAN) \ - mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 clean: @$(CLEANTARGET) -install: $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN) +install: $(BUILDINS) $(WORKDIR) $(BUILDBIN) @xcopy "$(WORKDIR)\*.exe" "$(BUILDOUT)" /Y /Q 2>NUL - @xcopy "$(WORKDIR)\*.pdb" "$(BUILDOUT)" /Y /Q 2>NUL + @xcopy "$(SRCDIR)\docs\manual" "$(BUILDMAN)" /Y /Q /E + @xcopy "$(SRCDIR)\docs\error" "$(BUILDERR)" /Y /Q /E + @xcopy "$(SRCDIR)\docs\icons" "$(BUILDICO)" /Y /Q /E + @xcopy "$(SRCDIR)\docs\docroot" "$(BUILDDOC)" /Y /Q /E + @xcopy "$(SRCDIR)\docs\conf\extra" "$(BUILDCFG)\extra" /Y /Q + @copy /Y "$(SRCDIR)\docs\conf\httpd-win.conf" "$(BUILDCFG)\httpd.conf" >NUL + @copy /Y "$(SRCDIR)\docs\conf\charset.conv" "$(BUILDCFG)" >NUL + @copy /Y "$(SRCDIR)\docs\conf\mime.types" "$(BUILDCFG)" >NUL + @copy /Y "$(SRCDIR)\docs\conf\magic" "$(BUILDCFG)" >NUL + @copy /Y "$(SRCDIR)\docs\cgi-examples\printenv" "$(BUILDCGI)\printenv.pl" >NUL Modified: trunk/httpd/httpd-2.2/srclib/apr/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/srclib/apr/NMAKEmakefile 2007-12-14 17:47:49 UTC (rev 1219) +++ trunk/httpd/httpd-2.2/srclib/apr/NMAKEmakefile 2007-12-15 12:32:07 UTC (rev 1220) @@ -40,6 +40,7 @@ !ENDIF !include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\include\arch -I$(SRCDIR)\include\arch\win32 -I$(SRCDIR)\include\arch\unix PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src @@ -113,29 +114,17 @@ HEADERS = $(SRCDIR)\include\apr.h -BUILDINC = $(PREFIX)\include -BUILDLIB = $(PREFIX)\lib -BUILDOUT = $(PREFIX)\bin !IF "$(TARGET)" == "DLL" BUILDBIN = $(WORKDIR)\$(PROJECT).dll BUILDPDB = $(WORKDIR)\$(PROJECT).pdb BUILDRES = $(WORKDIR)\$(PROJECT).res -BUILDMAN = $(BUILDBIN).manifest +BUILDMFT = $(BUILDBIN).manifest !ELSE BUILDBIN = $(WORKDIR)\$(PROJECT).lib !ENDIF -all : $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDBIN) +all : $(BUILDINS) $(WORKDIR) $(HEADERS) $(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) @@ -214,8 +203,8 @@ $(RC) $(RCFLAGS) /i "$(SRCDIR)\include" /d "APR_VERSION_ONLY" /fo $(BUILDRES) libapr.rc $(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) $(BUILDRES) $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) - IF EXIST $(BUILDMAN) \ - mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 !ELSE $(BUILDBIN): $(WORKDIR) $(OBJECTS) $(LINK) $(LFLAGS) $(OBJECTS) /out:$(BUILDBIN) @@ -224,11 +213,9 @@ clean: @$(CLEANTARGET) -install: $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDBIN) +install: $(BUILDINS) $(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)\*.exp" "$(BUILDLIB)" /Y /Q 2>NUL @xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL - @xcopy "$(WORKDIR)\*.pdb" "$(BUILDOUT)" /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/srclib/apr-iconv/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/srclib/apr-iconv/NMAKEmakefile 2007-12-14 17:47:49 UTC (rev 1219) +++ trunk/httpd/httpd-2.2/srclib/apr-iconv/NMAKEmakefile 2007-12-15 12:32:07 UTC (rev 1220) @@ -43,6 +43,7 @@ !ENDIF !include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> !IFNDEF WITH_APR WITH_APR = ..\apr @@ -281,27 +282,17 @@ $(WORKDIR)\iconv_uc.obj -BUILDOUT = $(PREFIX)\bin -BUILDLIB = $(PREFIX)\lib -BUILDINC = $(PREFIX)\include - !IF "$(TARGET)" == "DLL" BUILDBIN = $(WORKDIR)\$(PROJECT).dll BUILDPDB = $(WORKDIR)\$(PROJECT).pdb BUILDRES = $(WORKDIR)\$(PROJECT).res -BUILDMAN = $(BUILDBIN).manifest +BUILDMFT = $(BUILDBIN).manifest !ELSE BUILDBIN = $(WORKDIR)\$(PROJECT).lib !ENDIF -all : $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN) +all : $(BUILDINS) $(WORKDIR) $(BUILDBIN) -$(BUILDLIB) : - @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" - -$(BUILDOUT) : - @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)" - $(WORKDIR) : @$(MAKEWORKDIR) @@ -322,8 +313,8 @@ $(RC) $(RCFLAGS) /i "$(WITH_APR)\include" /i "$(SRCDIR)\include" /d "API_VERSION_ONLY" /fo $(BUILDRES) $(SRCDIR)\libapriconv.rc $(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES) $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) - IF EXIST $(BUILDMAN) \ - mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 !ELSE $(BUILDBIN): $(WORKDIR) $(OBJECTS) $(LINK) $(LFLAGS) $(OBJECTS) $(LDIRS) /out:$(BUILDBIN) @@ -332,9 +323,7 @@ clean: @$(CLEANTARGET) -install: $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN) +install: $(BUILDINS) $(WORKDIR) $(BUILDBIN) @xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q - @xcopy "$(WORKDIR)\*.exp" "$(BUILDLIB)" /Y /Q 2>NUL @xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL - @xcopy "$(WORKDIR)\*.pdb" "$(BUILDOUT)" /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2007-12-14 17:47:49 UTC (rev 1219) +++ trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2007-12-15 12:32:07 UTC (rev 1220) @@ -47,6 +47,7 @@ !ENDIF !include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> !IFNDEF WITH_APR WITH_APR=..\apr @@ -122,27 +123,17 @@ $(SRCDIR)\xml\expat\lib\config.h \ $(SRCDIR)\xml\expat\lib\expat.h -BUILDOUT = $(PREFIX)\bin -BUILDLIB = $(PREFIX)\lib -BUILDINC = $(PREFIX)\include - !IF "$(TARGET)" == "DLL" BUILDBIN = $(WORKDIR)\$(PROJECT).dll BUILDPDB = $(WORKDIR)\$(PROJECT).pdb BUILDRES = $(WORKDIR)\$(PROJECT).res -BUILDMAN = $(BUILDBIN).manifest +BUILDMFT = $(BUILDBIN).manifest !ELSE BUILDBIN = $(WORKDIR)\$(PROJECT).lib !ENDIF -all : $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDBIN) +all : $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDBIN) -$(BUILDLIB) : - @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" - -$(BUILDOUT) : - @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)" - $(WORKDIR) : @$(MAKEWORKDIR) @@ -209,8 +200,8 @@ $(RC) $(RCFLAGS) /i "$(WITH_APR)\include" /i "$(SRCDIR)\include" /d "APU_VERSION_ONLY" /fo $(BUILDRES) libaprutil.rc $(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) $(BUILDRES) $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) - IF EXIST $(BUILDMAN) \ - mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 !ELSE $(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) $(LINK) $(LFLAGS) $(OBJECTS) $(LDIRS) /out:$(BUILDBIN) @@ -219,9 +210,7 @@ clean: @$(CLEANTARGET) -install: $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN) +install: $(BUILDINS) $(WORKDIR) $(BUILDBIN) @xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q - @xcopy "$(WORKDIR)\*.exp" "$(BUILDLIB)" /Y /Q 2>NUL @xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL - @xcopy "$(WORKDIR)\*.pdb" "$(BUILDOUT)" /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/srclib/pcre/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/srclib/pcre/NMAKEmakefile 2007-12-14 17:47:49 UTC (rev 1219) +++ trunk/httpd/httpd-2.2/srclib/pcre/NMAKEmakefile 2007-12-15 12:32:07 UTC (rev 1220) @@ -41,6 +41,7 @@ !ENDIF !include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> !IF "$(TARGET)" == "DLL" LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib @@ -59,24 +60,17 @@ $(SRCDIR)\config.h -BUILDOUT = $(PREFIX)\bin -BUILDLIB = $(PREFIX)\lib -BUILDINC = $(PREFIX)\include - !IF "$(TARGET)" == "DLL" BUILDBIN = $(WORKDIR)\$(PROJECT).dll BUILDPDB = $(WORKDIR)\$(PROJECT).pdb BUILDRES = $(WORKDIR)\$(PROJECT).res -BUILDMAN = $(BUILDBIN).manifest +BUILDMFT = $(BUILDBIN).manifest !ELSE BUILDBIN = $(WORKDIR)\$(PROJECT).lib !ENDIF -all : $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(HEADERS) $(BUILDBIN) +all : $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDBIN) -$(BUILDLIB) : - @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" - $(WORKDIR) : @$(MAKEWORKDIR) @@ -92,8 +86,8 @@ !IF "$(TARGET)" == "DLL" $(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) - IF EXIST $(BUILDMAN) \ - mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 !ELSE $(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) $(LINK) $(LFLAGS) $(OBJECTS) $(LDIRS) /out:$(BUILDBIN) @@ -102,9 +96,7 @@ clean: @$(CLEANTARGET) -install: $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN) +install: $(BUILDINS) $(WORKDIR) $(BUILDBIN) @xcopy "$(SRCDIR)\pcre.h" "$(BUILDINC)" /Y /Q @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q - @xcopy "$(WORKDIR)\*.exp" "$(BUILDLIB)" /Y /Q 2>NUL @xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL - @xcopy "$(WORKDIR)\*.pdb" "$(BUILDOUT)" /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile 2007-12-14 17:47:49 UTC (rev 1219) +++ trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile 2007-12-15 12:32:07 UTC (rev 1220) @@ -47,6 +47,7 @@ !ENDIF !include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> INCLUDES = -I$(SRCDIR) PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src @@ -83,29 +84,17 @@ ASM_OBJECTS = !ENDIF -BUILDINC = $(PREFIX)\include\apr-1 -BUILDLIB = $(PREFIX)\lib -BUILDOUT = $(PREFIX)\lib !IF "$(TARGET)" == "DLL" BUILDBIN = $(WORKDIR)\$(PROJECT).dll BUILDPDB = $(WORKDIR)\$(PROJECT).pdb BUILDRES = $(WORKDIR)\$(PROJECT).res -BUILDMAN = $(BUILDBIN).manifest +BUILDMFT = $(BUILDBIN).manifest !ELSE BUILDBIN = $(WORKDIR)\$(PROJECT).lib !ENDIF -all : $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN) +all : $(BUILDINS) $(WORKDIR) $(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) @@ -136,8 +125,8 @@ $(RC) $(RCFLAGS) /fo $(BUILDRES) win32/zlib1.rc $(BUILDBIN): $(WORKDIR) $(OBJECTS) $(ASM_OBJECTS) $(BUILDRES) $(LINK) $(LFLAGS) $(OBJECTS) $(ASM_OBJECTS) $(BUILDRES) $(LIBS) /def:win32/zlib.def /pdb:$(BUILDPDB) /out:$(BUILDBIN) - IF EXIST $(BUILDMAN) \ - mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 !ELSE $(BUILDBIN): $(WORKDIR) $(OBJECTS) $(ASM_OBJECTS) $(LINK) $(LFLAGS) $(OBJECTS) $(ASM_OBJECTS) /out:$(BUILDBIN) @@ -146,11 +135,9 @@ clean: @$(CLEANTARGET) -install: $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN) +install: $(BUILDINS) $(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)\*.exp" "$(BUILDLIB)" /Y /Q 2>NUL @xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL - @xcopy "$(WORKDIR)\*.pdb" "$(BUILDOUT)" /Y /Q 2>NUL