Author: jfrederic.clere(a)jboss.com Date: 2014-01-27 07:43:33 -0500 (Mon, 27 Jan 2014) New Revision: 3202 Added: trunk/httpd/httpd-2.4/modules/cluster/ trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartmonitor trunk/httpd/httpd-2.4/modules/cluster/NMAKEmakefile trunk/httpd/httpd-2.4/modules/core/ trunk/httpd/httpd-2.4/modules/core/NMAKEmacro trunk/httpd/httpd-2.4/modules/core/NMAKEmakefile trunk/httpd/httpd-2.4/modules/core/NMAKEso trunk/httpd/httpd-2.4/modules/core/NMAKEwatchdog trunk/httpd/httpd-2.4/modules/debugging/ trunk/httpd/httpd-2.4/modules/session/ trunk/httpd/httpd-2.4/modules/session/NMAKEmakefile trunk/httpd/httpd-2.4/modules/session/NMAKEsession trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie trunk/httpd/httpd-2.4/modules/session/NMAKEsession_crypto trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd trunk/httpd/httpd-2.4/modules/slotmem/ trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem_plain trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem_shm Removed: trunk/httpd/httpd-2.4/modules/debug/ trunk/httpd/httpd-2.4/modules/mod_slotmem/ trunk/httpd/httpd-2.4/modules/slotmem/Makefile.in trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem trunk/httpd/httpd-2.4/modules/slotmem/config5.m4 Modified: trunk/httpd/httpd-2.4/modules/NMAKEmakefile trunk/httpd/httpd-2.4/modules/slotmem/NMAKEmakefile Log: Add some modules. Modified: trunk/httpd/httpd-2.4/modules/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.4/modules/NMAKEmakefile 2014-01-27 10:44:40 UTC (rev 3201) +++ trunk/httpd/httpd-2.4/modules/NMAKEmakefile 2014-01-27 12:43:33 UTC (rev 3202) @@ -34,6 +34,8 @@ aaa\~ \ arch\win32\~ \ cache\~ \ + core\~ \ + cluster\~ \ dav\main\~ \ dav\fs\~ \ echo\~ \ @@ -44,10 +46,12 @@ loggers\~ \ mappers\~ \ metadata\~ \ + session\~ \ ssl\~ \ + slotmem\~ \ proxy\~ \ advertise\~ \ - mod_slotmem\~ \ + mod_cluster_slotmem\~ \ mod_manager\~ \ jk\~ Added: trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat =================================================================== --- trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat (rev 0) +++ trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat 2014-01-27 12:43:33 UTC (rev 3202) @@ -0,0 +1,68 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile mod_heartbeat module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_heartbeat + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) +CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).so +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="mod_heartbeat module for Apache" + +OBJECTS = \ + $(WORKDIR)\mod_heartbeat.obj + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +!IF EXIST($(SRCDIR)\mod_heartbeat.c) +install: $(BUILDBIN) +!ELSE +install: + @echo Skipping $(PROJECT) build. +!ENDIF Added: trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartmonitor =================================================================== --- trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartmonitor (rev 0) +++ trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartmonitor 2014-01-27 12:43:33 UTC (rev 3202) @@ -0,0 +1,68 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile mod_heartmonitor module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_heartmonitor + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) +CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).so +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="mod_heartmonitor module for Apache" + +OBJECTS = \ + $(WORKDIR)\mod_heartmonitor.obj + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +!IF EXIST($(SRCDIR)\mod_heartmonitor.c) +install: $(BUILDBIN) +!ELSE +install: + @echo Skipping $(PROJECT) build. +!ENDIF Added: trunk/httpd/httpd-2.4/modules/cluster/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.4/modules/cluster/NMAKEmakefile (rev 0) +++ trunk/httpd/httpd-2.4/modules/cluster/NMAKEmakefile 2014-01-27 12:43:33 UTC (rev 3202) @@ -0,0 +1,47 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile Master HTTPD cluster module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +MODULES = \ + $(SRCDIR)\NMAKEheartbeat\~ \ + $(SRCDIR)\NMAKEheartmonitor\~ + +all: $(WORKDIR) $(MODULES) + @echo Building cluster module ... + +$(MODULES): + @$(MAKE) -nologo -f $(@D) install + +$(WORKDIR): + @$(MAKEWORKDIR) + +install: all + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL Added: trunk/httpd/httpd-2.4/modules/core/NMAKEmacro =================================================================== --- trunk/httpd/httpd-2.4/modules/core/NMAKEmacro (rev 0) +++ trunk/httpd/httpd-2.4/modules/core/NMAKEmacro 2014-01-27 12:43:33 UTC (rev 3202) @@ -0,0 +1,68 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile mod_macro module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_macro + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) +CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).so +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="mod_macro module for Apache" + +OBJECTS = \ + $(WORKDIR)\mod_macro.obj + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +!IF EXIST($(SRCDIR)\mod_macro.c) +install: $(BUILDBIN) +!ELSE +install: + @echo Skipping $(PROJECT) build. +!ENDIF Added: trunk/httpd/httpd-2.4/modules/core/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.4/modules/core/NMAKEmakefile (rev 0) +++ trunk/httpd/httpd-2.4/modules/core/NMAKEmakefile 2014-01-27 12:43:33 UTC (rev 3202) @@ -0,0 +1,48 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile Master HTTPD core module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +MODULES = \ + $(SRCDIR)\NMAKEmacro\~ \ + $(SRCDIR)\NMAKEso\~ \ + $(SRCDIR)\NMAKEwatchdog\~ + +all: $(WORKDIR) $(MODULES) + @echo Building core module ... + +$(MODULES): + @$(MAKE) -nologo -f $(@D) install + +$(WORKDIR): + @$(MAKEWORKDIR) + +install: all + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL Added: trunk/httpd/httpd-2.4/modules/core/NMAKEso =================================================================== --- trunk/httpd/httpd-2.4/modules/core/NMAKEso (rev 0) +++ trunk/httpd/httpd-2.4/modules/core/NMAKEso 2014-01-27 12:43:33 UTC (rev 3202) @@ -0,0 +1,68 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile mod_so module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_so + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) +CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).so +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="mod_so module for Apache" + +OBJECTS = \ + $(WORKDIR)\mod_so.obj + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +!IF EXIST($(SRCDIR)\mod_so.c) +install: $(BUILDBIN) +!ELSE +install: + @echo Skipping $(PROJECT) build. +!ENDIF Added: trunk/httpd/httpd-2.4/modules/core/NMAKEwatchdog =================================================================== --- trunk/httpd/httpd-2.4/modules/core/NMAKEwatchdog (rev 0) +++ trunk/httpd/httpd-2.4/modules/core/NMAKEwatchdog 2014-01-27 12:43:33 UTC (rev 3202) @@ -0,0 +1,68 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile mod_watchdog module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_watchdog + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) +CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).so +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="mod_watchdog module for Apache" + +OBJECTS = \ + $(WORKDIR)\mod_watchdog.obj + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +!IF EXIST($(SRCDIR)\mod_watchdog.c) +install: $(BUILDBIN) +!ELSE +install: + @echo Skipping $(PROJECT) build. +!ENDIF Added: trunk/httpd/httpd-2.4/modules/session/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.4/modules/session/NMAKEmakefile (rev 0) +++ trunk/httpd/httpd-2.4/modules/session/NMAKEmakefile 2014-01-27 12:43:33 UTC (rev 3202) @@ -0,0 +1,49 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile Master HTTPD session module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +MODULES = \ + $(SRCDIR)\NMAKEsession\~ \ + $(SRCDIR)\NMAKEsession_cookie\~ \ + $(SRCDIR)\NMAKEsession_dbd\~ \ + $(SRCDIR)\NMAKEsession_crypto\~ + +all: $(WORKDIR) $(MODULES) + @echo Building core module ... + +$(MODULES): + @$(MAKE) -nologo -f $(@D) install + +$(WORKDIR): + @$(MAKEWORKDIR) + +install: all + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL Added: trunk/httpd/httpd-2.4/modules/session/NMAKEsession =================================================================== --- trunk/httpd/httpd-2.4/modules/session/NMAKEsession (rev 0) +++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession 2014-01-27 12:43:33 UTC (rev 3202) @@ -0,0 +1,68 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile mod_session module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_session + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) +CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).so +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="mod_session module for Apache" + +OBJECTS = \ + $(WORKDIR)\mod_session.obj + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +!IF EXIST($(SRCDIR)\mod_session.c) +install: $(BUILDBIN) +!ELSE +install: + @echo Skipping $(PROJECT) build. +!ENDIF Added: trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie =================================================================== --- trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie (rev 0) +++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie 2014-01-27 12:43:33 UTC (rev 3202) @@ -0,0 +1,68 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile mod_session_cookie module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_session_cookie + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) +CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).so +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="mod_session_cookie module for Apache" + +OBJECTS = \ + $(WORKDIR)\mod_session_cookie.obj + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +!IF EXIST($(SRCDIR)\mod_session_cookie.c) +install: $(BUILDBIN) +!ELSE +install: + @echo Skipping $(PROJECT) build. +!ENDIF Added: trunk/httpd/httpd-2.4/modules/session/NMAKEsession_crypto =================================================================== --- trunk/httpd/httpd-2.4/modules/session/NMAKEsession_crypto (rev 0) +++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession_crypto 2014-01-27 12:43:33 UTC (rev 3202) @@ -0,0 +1,68 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile mod_session_crypto module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_session_crypto + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) +CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).so +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="mod_session_crypto module for Apache" + +OBJECTS = \ + $(WORKDIR)\mod_session_crypto.obj + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +!IF EXIST($(SRCDIR)\mod_session_crypto.c) +install: $(BUILDBIN) +!ELSE +install: + @echo Skipping $(PROJECT) build. +!ENDIF Added: trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd =================================================================== --- trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd (rev 0) +++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd 2014-01-27 12:43:33 UTC (rev 3202) @@ -0,0 +1,68 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile mod_session_dbd module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_session_dbd + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) +CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).so +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="mod_session_dbd module for Apache" + +OBJECTS = \ + $(WORKDIR)\mod_session_dbd.obj + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +!IF EXIST($(SRCDIR)\mod_session_dbd.c) +install: $(BUILDBIN) +!ELSE +install: + @echo Skipping $(PROJECT) build. +!ENDIF Deleted: trunk/httpd/httpd-2.4/modules/slotmem/Makefile.in =================================================================== --- trunk/httpd/httpd-2.4/modules/mod_slotmem/Makefile.in 2014-01-27 10:44:40 UTC (rev 3201) +++ trunk/httpd/httpd-2.4/modules/slotmem/Makefile.in 2014-01-27 12:43:33 UTC (rev 3202) @@ -1,3 +0,0 @@ - -include $(top_srcdir)/build/special.mk - Modified: trunk/httpd/httpd-2.4/modules/slotmem/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.4/modules/mod_slotmem/NMAKEmakefile 2014-01-27 10:44:40 UTC (rev 3201) +++ trunk/httpd/httpd-2.4/modules/slotmem/NMAKEmakefile 2014-01-27 12:43:33 UTC (rev 3202) @@ -15,7 +15,7 @@ # # ==================================================================== # -# NMAKEmakefile Master HTTPD cluster module makefile. +# NMAKEmakefile Master HTTPD slotmem module makefile. # # Originally contributed by Mladen Turk <mturk redhat.com> # @@ -31,7 +31,8 @@ !include <..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKEslotmem\~ + $(SRCDIR)\NMAKEslotmem_plain\~ \ + $(SRCDIR)\NMAKEslotmem_shm\~ all: $(WORKDIR) $(MODULES) @echo Building slotmem module ... Deleted: trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem =================================================================== --- trunk/httpd/httpd-2.4/modules/mod_slotmem/NMAKEslotmem 2014-01-27 10:44:40 UTC (rev 3201) +++ trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem 2014-01-27 12:43:33 UTC (rev 3202) @@ -1,69 +0,0 @@ -# Copyright 2001-2007 The Apache Software Foundation or its licensors, as -# applicable. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ==================================================================== -# -# NMAKEmakefile mod_sharedmem module makefile. -# -# Originally contributed by Mladen Turk <mturk redhat.com> -# -# ==================================================================== -# - -TARGET=DLL -PROJECT = mod_cluster_slotmem - -!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" -SRCDIR = . -!ENDIF - -!include <..\..\NMAKEcommon.inc> -!include <..\..\NMAKEhttpd.inc> - -LDIRS = /libpath:"$(BUILDLIB)" -LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) -CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT - -INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy -PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src - -BUILDBIN = $(WORKDIR)\$(PROJECT).so -BUILDPDB = $(WORKDIR)\$(PROJECT).pdb -BUILDRES = $(WORKDIR)\$(PROJECT).res -BUILDMFT = $(BUILDBIN).manifest - -RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="mod_cluster_slotmem module for Apache" - -OBJECTS = \ - $(WORKDIR)\sharedmem_util.obj \ - $(WORKDIR)\mod_sharedmem.obj - -{$(SRCDIR)}.c{$(WORKDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -$(BUILDRES): ..\..\build\win32\httpd.rc - $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc - -$(BUILDBIN): $(OBJECTS) $(BUILDRES) - $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) - 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 Added: trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem_plain =================================================================== --- trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem_plain (rev 0) +++ trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem_plain 2014-01-27 12:43:33 UTC (rev 3202) @@ -0,0 +1,68 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile mod_slotmem_plain module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_slotmem_plain + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) +CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).so +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="mod_slotmem_plain module for Apache" + +OBJECTS = \ + $(WORKDIR)\mod_slotmem_plain.obj + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +!IF EXIST($(SRCDIR)\mod_slotmem_plain.c) +install: $(BUILDBIN) +!ELSE +install: + @echo Skipping $(PROJECT) build. +!ENDIF Added: trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem_shm =================================================================== --- trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem_shm (rev 0) +++ trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem_shm 2014-01-27 12:43:33 UTC (rev 3202) @@ -0,0 +1,68 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile mod_slotmem_shm module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_slotmem_shm + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) +CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).so +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="mod_slotmem_shm module for Apache" + +OBJECTS = \ + $(WORKDIR)\mod_slotmem_shm.obj + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +!IF EXIST($(SRCDIR)\mod_slotmem_shm.c) +install: $(BUILDBIN) +!ELSE +install: + @echo Skipping $(PROJECT) build. +!ENDIF Deleted: trunk/httpd/httpd-2.4/modules/slotmem/config5.m4 =================================================================== --- trunk/httpd/httpd-2.4/modules/mod_slotmem/config5.m4 2014-01-27 10:44:40 UTC (rev 3201) +++ trunk/httpd/httpd-2.4/modules/slotmem/config5.m4 2014-01-27 12:43:33 UTC (rev 3202) @@ -1,17 +0,0 @@ -dnl modules enabled in this directory by default - -APACHE_MODPATH_INIT(mod_slotmem) - -if test "$enable_mod_slotmem" = "shared"; then - mod_slotmem_mods_enable=shared -elif test "$enable_mod_slotmem" = "yes"; then - mod_slotmem_mods_enable=yes -else - mod_slotmem_mods_enable=no -fi - -slotmem_objects="mod_sharedmem.lo sharedmem_util.lo" - -APACHE_MODULE(slotmem, A slotmem provider for mod_cluster, $slotmem_objects, , $mod_slotmem_mods_enable) - -APACHE_MODPATH_FINISH