Author: mladen.turk(a)jboss.com Date: 2008-10-12 10:00:49 -0400 (Sun, 12 Oct 2008) New Revision: 1947 Modified: trunk/httpd/httpd-2.2/modules/advertise/NMAKEadvertise trunk/httpd/httpd-2.2/modules/cache/NMAKEmemcache trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmanager trunk/httpd/httpd-2.2/modules/mod_slotmem/NMAKEslotmem trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile trunk/httpd/httpd-2.2/modules/proxy/NMAKEproxycluster trunk/httpd/httpd-2.2/srclib/iconv/NMAKEmakefile Log: Allow building httpd 2.2.9+. Modified: trunk/httpd/httpd-2.2/modules/advertise/NMAKEadvertise =================================================================== --- trunk/httpd/httpd-2.2/modules/advertise/NMAKEadvertise 2008-10-12 11:16:44 UTC (rev 1946) +++ trunk/httpd/httpd-2.2/modules/advertise/NMAKEadvertise 2008-10-12 14:00:49 UTC (rev 1947) @@ -60,4 +60,9 @@ IF EXIST $(BUILDMFT) \ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 +!IF EXIST($(SRCDIR)\mod_advertise.c) install: $(BUILDBIN) +!ELSE +install: + @echo Skipping $(PROJECT) build. +!ENDIF Modified: trunk/httpd/httpd-2.2/modules/cache/NMAKEmemcache =================================================================== --- trunk/httpd/httpd-2.2/modules/cache/NMAKEmemcache 2008-10-12 11:16:44 UTC (rev 1946) +++ trunk/httpd/httpd-2.2/modules/cache/NMAKEmemcache 2008-10-12 14:00:49 UTC (rev 1947) @@ -46,6 +46,9 @@ RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="mem_cache_module for Apache" OBJECTS = \ + $(WORKDIR)\cache_cache.obj \ + $(WORKDIR)\cache_hash.obj \ + $(WORKDIR)\cache_pqueue.obj \ $(WORKDIR)\mod_mem_cache.obj \ {$(SRCDIR)}.c{$(WORKDIR)}.obj: Modified: trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmanager =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmanager 2008-10-12 11:16:44 UTC (rev 1946) +++ trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmanager 2008-10-12 14:00:49 UTC (rev 1947) @@ -64,4 +64,9 @@ IF EXIST $(BUILDMFT) \ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 +!IF EXIST($(SRCDIR)\mod_manager.c) install: $(BUILDBIN) +!ELSE +install: + @echo Skipping $(PROJECT) build. +!ENDIF Modified: trunk/httpd/httpd-2.2/modules/mod_slotmem/NMAKEslotmem =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_slotmem/NMAKEslotmem 2008-10-12 11:16:44 UTC (rev 1946) +++ trunk/httpd/httpd-2.2/modules/mod_slotmem/NMAKEslotmem 2008-10-12 14:00:49 UTC (rev 1947) @@ -61,4 +61,9 @@ IF EXIST $(BUILDMFT) \ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 +!IF EXIST($(SRCDIR)\mod_sharedmem.c) install: $(BUILDBIN) +!ELSE +install: + @echo Skipping $(PROJECT) build. +!ENDIF Modified: trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile 2008-10-12 11:16:44 UTC (rev 1946) +++ trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile 2008-10-12 14:00:49 UTC (rev 1947) @@ -36,13 +36,8 @@ $(SRCDIR)\NMAKEproxyhttp \ $(SRCDIR)\NMAKEproxyftp \ $(SRCDIR)\NMAKEproxyconnect \ - $(SRCDIR)\NMAKEproxybalancer - -!IF EXIST($(SRCDIR)\mod_proxy_cluster.c) -MODULES = \ - $(MODULES) \ + $(SRCDIR)\NMAKEproxybalancer \ $(SRCDIR)\NMAKEproxycluster -!ENDIF $(MODULES): @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install Modified: trunk/httpd/httpd-2.2/modules/proxy/NMAKEproxycluster =================================================================== --- trunk/httpd/httpd-2.2/modules/proxy/NMAKEproxycluster 2008-10-12 11:16:44 UTC (rev 1946) +++ trunk/httpd/httpd-2.2/modules/proxy/NMAKEproxycluster 2008-10-12 14:00:49 UTC (rev 1947) @@ -60,5 +60,10 @@ IF EXIST $(BUILDMFT) \ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 +!IF EXIST($(SRCDIR)\mod_proxy_cluster.c) install: $(BUILDBIN) @xcopy "$(WORKDIR)\$(PROJECT).lib" "$(BUILDLIB)" /Y /Q +!ELSE +install: + @echo Skipping $(PROJECT) build. +!ENDIF Modified: trunk/httpd/httpd-2.2/srclib/iconv/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/srclib/iconv/NMAKEmakefile 2008-10-12 11:16:44 UTC (rev 1946) +++ trunk/httpd/httpd-2.2/srclib/iconv/NMAKEmakefile 2008-10-12 14:00:49 UTC (rev 1947) @@ -112,7 +112,12 @@ clean: @$(CLEANTARGET) +!IF EXIST($(SRCDIR)\include\iconv.h) install: $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDBIN) @xcopy "$(SRCDIR)\include\iconv.h" "$(BUILDINC)" /Y /Q @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q @xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL +!ELSE +install: + @echo Skipping $(PROJECT) build. +!ENDIF