[jbossnative-commits] JBoss Native SVN: r3114 - in trunk/httpd/httpd-2.2: modules/advertise and 18 other directories.

Author: mladen.turk(a)jboss.com Date: 2013-06-13 09:54:00 -0400 (Thu, 13 Jun 2013) New Revision: 3114 Modified: trunk/httpd/httpd-2.2/modules/aaa/NMAKEmakefile trunk/httpd/httpd-2.2/modules/advertise/NMAKEmakefile trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEmakefile trunk/httpd/httpd-2.2/modules/cache/NMAKEmakefile trunk/httpd/httpd-2.2/modules/database/NMAKEmakefile trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEmakefile trunk/httpd/httpd-2.2/modules/dav/main/NMAKEmakefile trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile trunk/httpd/httpd-2.2/modules/generators/NMAKEmakefile trunk/httpd/httpd-2.2/modules/http/NMAKEmakefile trunk/httpd/httpd-2.2/modules/jk/NMAKEmakefile trunk/httpd/httpd-2.2/modules/ldap/NMAKEmakefile trunk/httpd/httpd-2.2/modules/loggers/NMAKEmakefile trunk/httpd/httpd-2.2/modules/mappers/NMAKEmakefile trunk/httpd/httpd-2.2/modules/metadata/NMAKEmakefile trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmakefile trunk/httpd/httpd-2.2/modules/mod_slotmem/NMAKEmakefile trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile trunk/httpd/httpd-2.2/modules/ssl/NMAKEmakefile trunk/httpd/httpd-2.2/support/NMAKEmakefile Log: Fix httpd nmakefile dependencies Modified: trunk/httpd/httpd-2.2/modules/aaa/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/aaa/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -31,25 +31,28 @@ !include <..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKEauthbasic \ - $(SRCDIR)\NMAKEauthdigest \ - $(SRCDIR)\NMAKEauthnanon \ - $(SRCDIR)\NMAKEauthndbd \ - $(SRCDIR)\NMAKEauthndbm \ - $(SRCDIR)\NMAKEauthndefault \ - $(SRCDIR)\NMAKEauthnfile \ - $(SRCDIR)\NMAKEauthnzldap \ - $(SRCDIR)\NMAKEauthzdbm \ - $(SRCDIR)\NMAKEauthzdefault \ - $(SRCDIR)\NMAKEauthzgroupfile \ - $(SRCDIR)\NMAKEauthzhost \ - $(SRCDIR)\NMAKEauthzuser + $(SRCDIR)\NMAKEauthbasic\~ \ + $(SRCDIR)\NMAKEauthdigest\~ \ + $(SRCDIR)\NMAKEauthnanon\~ \ + $(SRCDIR)\NMAKEauthndbd\~ \ + $(SRCDIR)\NMAKEauthndbm\~ \ + $(SRCDIR)\NMAKEauthndefault\~ \ + $(SRCDIR)\NMAKEauthnfile\~ \ + $(SRCDIR)\NMAKEauthnzldap\~ \ + $(SRCDIR)\NMAKEauthzdbm\~ \ + $(SRCDIR)\NMAKEauthzdefault\~ \ + $(SRCDIR)\NMAKEauthzgroupfile\~ \ + $(SRCDIR)\NMAKEauthzhost\~ \ + $(SRCDIR)\NMAKEauthzuser\~ +all: $(WORKDIR) $(MODULES) + @echo Building aaa modules ... + $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) PREFIX=$(PREFIX) install $(WORKDIR): @$(MAKEWORKDIR) -install: $(WORKDIR) $(MODULES) - @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL +install: all + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/modules/advertise/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/advertise/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/modules/advertise/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -31,13 +31,16 @@ !include <..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKEadvertise + $(SRCDIR)\NMAKEadvertise\~ +all: $(WORKDIR) $(MODULES) + @echo Building aaa modules ... + $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) PREFIX=$(PREFIX) install $(WORKDIR): @$(MAKEWORKDIR) -install: $(WORKDIR) $(MODULES) - @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL +install: all + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -31,13 +31,16 @@ !include <..\..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKEisapi + $(SRCDIR)\NMAKEisapi\~ +all: $(WORKDIR) $(MODULES) + @echo Building win32 modules ... + $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) install $(WORKDIR): @$(MAKEWORKDIR) -install: $(WORKDIR) $(MODULES) - @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL +install: all + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/modules/cache/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/cache/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/modules/cache/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -31,13 +31,16 @@ !include <..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKEcache \ - $(SRCDIR)\NMAKEdiskcache \ - $(SRCDIR)\NMAKEfilecache \ - $(SRCDIR)\NMAKEmemcache + $(SRCDIR)\NMAKEcache\~ \ + $(SRCDIR)\NMAKEdiskcache\~ \ + $(SRCDIR)\NMAKEfilecache\~ \ + $(SRCDIR)\NMAKEmemcache\~ +all: $(WORKDIR) $(MODULES) + @echo Building cache modules ... + $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) install $(WORKDIR): @$(MAKEWORKDIR) Modified: trunk/httpd/httpd-2.2/modules/database/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/database/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/modules/database/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -31,13 +31,16 @@ !include <..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKEdbd + $(SRCDIR)\NMAKEdbd\~ +all: $(WORKDIR) $(MODULES) + @echo Building database modules ... + $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) install $(WORKDIR): @$(MAKEWORKDIR) install: $(WORKDIR) $(MODULES) - @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -31,12 +31,16 @@ !include <..\..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKEdavfs + $(SRCDIR)\NMAKEdavfs\~ +all: $(WORKDIR) $(MODULES) + @echo Building dav fs modules ... + $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) install $(WORKDIR): @$(MAKEWORKDIR) -install: $(WORKDIR) $(MODULES) +install: all + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/modules/dav/main/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/dav/main/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/modules/dav/main/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -31,13 +31,16 @@ !include <..\..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKEdav + $(SRCDIR)\NMAKEdav\~ +all: $(WORKDIR) $(MODULES) + @echo Building dav modules ... + $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) install $(WORKDIR): @$(MAKEWORKDIR) -install: $(WORKDIR) $(MODULES) - @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL +install: all + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -31,17 +31,20 @@ !include <..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKEdeflate \ - $(SRCDIR)\NMAKEcharsetlite \ - $(SRCDIR)\NMAKEfilter \ - $(SRCDIR)\NMAKEextfilter \ - $(SRCDIR)\NMAKEinclude + $(SRCDIR)\NMAKEdeflate\~ \ + $(SRCDIR)\NMAKEcharsetlite\~ \ + $(SRCDIR)\NMAKEfilter\~ \ + $(SRCDIR)\NMAKEextfilter\~ \ + $(SRCDIR)\NMAKEinclude\~ +all: $(WORKDIR) $(MODULES) + @echo Building filter modules ... + $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) install $(WORKDIR): @$(MAKEWORKDIR) -install: $(WORKDIR) $(MODULES) - @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL +install: all + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/modules/generators/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/generators/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/modules/generators/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -31,17 +31,20 @@ !include <..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKEasis \ - $(SRCDIR)\NMAKEautoindex \ - $(SRCDIR)\NMAKEcgi \ - $(SRCDIR)\NMAKEinfo \ - $(SRCDIR)\NMAKEstatus + $(SRCDIR)\NMAKEasis\~ \ + $(SRCDIR)\NMAKEautoindex\~ \ + $(SRCDIR)\NMAKEcgi\~ \ + $(SRCDIR)\NMAKEinfo\~ \ + $(SRCDIR)\NMAKEstatus\~ +all: $(WORKDIR) $(MODULES) + @echo Building generator modules ... + $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) PREFIX=$(PREFIX) install $(WORKDIR): @$(MAKEWORKDIR) -install: $(WORKDIR) $(MODULES) - @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL +install: all + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/modules/http/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/http/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/modules/http/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -31,13 +31,16 @@ !include <..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKEmime + $(SRCDIR)\NMAKEmime\~ +all: $(WORKDIR) $(MODULES) + @echo Building http modules ... + $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) install $(WORKDIR): @$(MAKEWORKDIR) -install: $(WORKDIR) $(MODULES) - @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL +install: all + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/modules/jk/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/jk/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/modules/jk/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -31,13 +31,16 @@ !include <..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKEmodjk + $(SRCDIR)\NMAKEmodjk\~ +all: $(WORKDIR) $(MODULES) + @echo Building mod_jk module ... + $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) install $(WORKDIR): @$(MAKEWORKDIR) -install: $(WORKDIR) $(MODULES) - @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL +install: all + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/modules/ldap/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/ldap/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/modules/ldap/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -31,13 +31,16 @@ !include <..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKEldap + $(SRCDIR)\NMAKEldap\~ +all: $(WORKDIR) $(MODULES) + @echo Building ldap modules ... + $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) install $(WORKDIR): @$(MAKEWORKDIR) -install: $(WORKDIR) $(MODULES) - @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL +install: all + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/modules/loggers/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/loggers/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/modules/loggers/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -31,15 +31,19 @@ !include <..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKElogconfig \ - $(SRCDIR)\NMAKElogforensic \ - $(SRCDIR)\NMAKElogio + $(SRCDIR)\NMAKElogconfig\~ \ + $(SRCDIR)\NMAKElogforensic\~ \ + $(SRCDIR)\NMAKElogio\~ +all: $(WORKDIR) $(MODULES) + @echo Building logger modules ... + $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) install $(WORKDIR): @$(MAKEWORKDIR) -install: $(WORKDIR) $(MODULES) - @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL +install: all + @xcopy "$(SRCDIR)\*.h" "$(BUILDINC)" /I /Y /Q + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/modules/mappers/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/mappers/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/modules/mappers/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -31,21 +31,24 @@ !include <..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKEactions \ - $(SRCDIR)\NMAKEalias \ - $(SRCDIR)\NMAKEdir \ - $(SRCDIR)\NMAKEimagemap \ - $(SRCDIR)\NMAKEnegotiation \ - $(SRCDIR)\NMAKErewrite \ - $(SRCDIR)\NMAKEspeling \ - $(SRCDIR)\NMAKEuserdir \ - $(SRCDIR)\NMAKEvhostalias + $(SRCDIR)\NMAKEactions\~ \ + $(SRCDIR)\NMAKEalias\~ \ + $(SRCDIR)\NMAKEdir\~ \ + $(SRCDIR)\NMAKEimagemap\~ \ + $(SRCDIR)\NMAKEnegotiation\~ \ + $(SRCDIR)\NMAKErewrite\~ \ + $(SRCDIR)\NMAKEspeling\~ \ + $(SRCDIR)\NMAKEuserdir\~ \ + $(SRCDIR)\NMAKEvhostalias\~ +all: $(WORKDIR) $(MODULES) + @echo Building mapper modules ... + $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) install $(WORKDIR): @$(MAKEWORKDIR) -install: $(WORKDIR) $(MODULES) - @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL +install: all + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/modules/metadata/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/metadata/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/modules/metadata/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -31,22 +31,25 @@ !include <..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKEcernmeta \ - $(SRCDIR)\NMAKEenv \ - $(SRCDIR)\NMAKEexpires \ - $(SRCDIR)\NMAKEheaders \ - $(SRCDIR)\NMAKEident \ - $(SRCDIR)\NMAKEmimemagic \ - $(SRCDIR)\NMAKEsetenvif \ - $(SRCDIR)\NMAKEuniqueid \ - $(SRCDIR)\NMAKEusertrack \ - $(SRCDIR)\NMAKEversion + $(SRCDIR)\NMAKEcernmeta\~ \ + $(SRCDIR)\NMAKEenv\~ \ + $(SRCDIR)\NMAKEexpires\~ \ + $(SRCDIR)\NMAKEheaders\~ \ + $(SRCDIR)\NMAKEident\~ \ + $(SRCDIR)\NMAKEmimemagic\~ \ + $(SRCDIR)\NMAKEsetenvif\~ \ + $(SRCDIR)\NMAKEuniqueid\~ \ + $(SRCDIR)\NMAKEusertrack\~ \ + $(SRCDIR)\NMAKEversion\~ +all: $(WORKDIR) $(MODULES) + @echo Building metadata modules ... + $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) install $(WORKDIR): @$(MAKEWORKDIR) -install: $(WORKDIR) $(MODULES) +install: all @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -31,13 +31,16 @@ !include <..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKEmanager + $(SRCDIR)\NMAKEmanager\~ +all: $(WORKDIR) $(MODULES) + @echo Building manager module ... + $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) install $(WORKDIR): @$(MAKEWORKDIR) -install: $(WORKDIR) $(MODULES) +install: all @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/modules/mod_slotmem/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_slotmem/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/modules/mod_slotmem/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -31,13 +31,16 @@ !include <..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKEslotmem + $(SRCDIR)\NMAKEslotmem\~ +all: $(WORKDIR) $(MODULES) + @echo Building slotmem module ... + $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) install $(WORKDIR): @$(MAKEWORKDIR) -install: $(WORKDIR) $(MODULES) +install: all @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -39,11 +39,23 @@ $(SRCDIR)\NMAKEproxybalancer \ $(SRCDIR)\NMAKEproxycluster +MODULES = \ + $(SRCDIR)\NMAKEproxy\~ \ + $(SRCDIR)\NMAKEproxyajp\~ \ + $(SRCDIR)\NMAKEproxyhttp\~ \ + $(SRCDIR)\NMAKEproxyftp\~ \ + $(SRCDIR)\NMAKEproxyconnect\~ \ + $(SRCDIR)\NMAKEproxybalancer\~ \ + $(SRCDIR)\NMAKEproxycluster\~ + +all: $(WORKDIR) $(MODULES) + @echo Building proxy modules ... + $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) install $(WORKDIR): @$(MAKEWORKDIR) -install: $(WORKDIR) $(MODULES) - @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL +install: all + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL Modified: trunk/httpd/httpd-2.2/modules/ssl/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/ssl/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/modules/ssl/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -31,17 +31,20 @@ !include <..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKEssl + $(SRCDIR)\NMAKEssl\~ +all: $(WORKDIR) $(MODULES) + @echo Building ssl modules ... + $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) install $(WORKDIR): @$(MAKEWORKDIR) !IF DEFINED(WITH_OPENSSL) && "$(WITH_OPENSSL)" != "no" install: $(WORKDIR) $(MODULES) - @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL !ELSE install: @echo *** OpenSSL libraries are not defined or are disabled. Modified: trunk/httpd/httpd-2.2/support/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/support/NMAKEmakefile 2013-06-13 13:53:36 UTC (rev 3113) +++ trunk/httpd/httpd-2.2/support/NMAKEmakefile 2013-06-13 13:54:00 UTC (rev 3114) @@ -31,20 +31,22 @@ !include <..\NMAKEhttpd.inc> UTILS = \ - $(SRCDIR)\NMAKEhtdbm \ - $(SRCDIR)\NMAKEhtcacheclean \ - $(SRCDIR)\NMAKEhtdigest \ - $(SRCDIR)\NMAKEhtpasswd \ - $(SRCDIR)\NMAKElogresolve \ - $(SRCDIR)\NMAKErotatelogs \ - $(SRCDIR)\NMAKEab + $(SRCDIR)\NMAKEhtdbm\~ \ + $(SRCDIR)\NMAKEhtcacheclean\~ \ + $(SRCDIR)\NMAKEhtdigest\~ \ + $(SRCDIR)\NMAKEhtpasswd\~ \ + $(SRCDIR)\NMAKElogresolve\~ \ + $(SRCDIR)\NMAKErotatelogs\~ \ + $(SRCDIR)\NMAKEab\~ +all: $(WORKDIR) $(UTILS) + @echo Building support utilities -$(UTILS): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install - $(WORKDIR): @$(MAKEWORKDIR) -all: $(WORKDIR) $(UTILS) - @xcopy "$(WORKDIR)\*.exe" "$(BUILDOUT)" /Y /Q 2>NUL +$(UTILS): + @$(MAKE) -nologo -f $(@D) PREFIX=$(PREFIX) install + +install: all + @xcopy "$(WORKDIR)\*.exe" "$(BUILDOUT)" /I /Y /Q 2>NUL