Author: jfrederic.clere(a)jboss.com Date: 2014-01-30 07:58:07 -0500 (Thu, 30 Jan 2014) New Revision: 3239 Added: trunk/httpd/httpd-2.4/modules/cache/NMAKEsocachememcache Removed: trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthzdefault trunk/httpd/httpd-2.4/modules/cache/NMAKEmemcache Modified: trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile trunk/httpd/httpd-2.4/modules/ssl/NMAKEssl Log: Ajust more stuff. Deleted: trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthzdefault =================================================================== --- trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthzdefault 2014-01-30 10:42:48 UTC (rev 3238) +++ trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthzdefault 2014-01-30 12:58:07 UTC (rev 3239) @@ -1,63 +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 authz_default module makefile. -# -# Originally contributed by Mladen Turk <mturk redhat.com> -# -# ==================================================================== -# - -TARGET=DLL -PROJECT = mod_authz_default - -!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) -DAAA_DECLARE_EXPORT - -INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I..\database -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="authz_default_module for Apache" - -OBJECTS = \ - $(WORKDIR)\mod_authz_default.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 - -install: $(BUILDBIN) Modified: trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile 2014-01-30 10:42:48 UTC (rev 3238) +++ trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile 2014-01-30 12:58:07 UTC (rev 3239) @@ -39,7 +39,6 @@ $(SRCDIR)\NMAKEauthnfile\~ \ $(SRCDIR)\NMAKEauthnzldap\~ \ $(SRCDIR)\NMAKEauthzdbm\~ \ - $(SRCDIR)\NMAKEauthzdefault\~ \ $(SRCDIR)\NMAKEauthzgroupfile\~ \ $(SRCDIR)\NMAKEauthzhost\~ \ $(SRCDIR)\NMAKEauthzuser\~ Modified: trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile 2014-01-30 10:42:48 UTC (rev 3238) +++ trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile 2014-01-30 12:58:07 UTC (rev 3239) @@ -34,7 +34,7 @@ $(SRCDIR)\NMAKEcache\~ \ $(SRCDIR)\NMAKEcachedisk\~ \ $(SRCDIR)\NMAKEfilecache\~ \ - $(SRCDIR)\NMAKEmemcache\~ \ + $(SRCDIR)\NMAKEsocachememcache\~ \ $(SRCDIR)\NMAKEcachesocache\~ \ $(SRCDIR)\NMAKEsocachedbm\~ \ $(SRCDIR)\NMAKEsocache_dc\~ Deleted: trunk/httpd/httpd-2.4/modules/cache/NMAKEmemcache =================================================================== --- trunk/httpd/httpd-2.4/modules/cache/NMAKEmemcache 2014-01-30 10:42:48 UTC (rev 3238) +++ trunk/httpd/httpd-2.4/modules/cache/NMAKEmemcache 2014-01-30 12:58:07 UTC (rev 3239) @@ -1,65 +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 mem_cache module makefile. -# -# Originally contributed by Mladen Turk <mturk redhat.com> -# -# ==================================================================== -# - -TARGET=DLL -PROJECT = mod_mem_cache - -!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) $(WORKDIR)\mod_cache.lib - -INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -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="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: - $(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 - -install: $(BUILDBIN) Copied: trunk/httpd/httpd-2.4/modules/cache/NMAKEsocachememcache (from rev 3201, trunk/httpd/httpd-2.4/modules/cache/NMAKEmemcache) =================================================================== --- trunk/httpd/httpd-2.4/modules/cache/NMAKEsocachememcache (rev 0) +++ trunk/httpd/httpd-2.4/modules/cache/NMAKEsocachememcache 2014-01-30 12:58:07 UTC (rev 3239) @@ -0,0 +1,62 @@ +# 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 mem_cache module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_socache_memcache + +!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) $(WORKDIR)\mod_cache.lib + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) +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_socache_memcache for Apache" + +OBJECTS = \ + $(WORKDIR)\mod_socache_memcache.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 + +install: $(BUILDBIN) Modified: trunk/httpd/httpd-2.4/modules/ssl/NMAKEssl =================================================================== --- trunk/httpd/httpd-2.4/modules/ssl/NMAKEssl 2014-01-30 10:42:48 UTC (rev 3238) +++ trunk/httpd/httpd-2.4/modules/ssl/NMAKEssl 2014-01-30 12:58:07 UTC (rev 3239) @@ -58,8 +58,8 @@ $(WORKDIR)\ssl_engine_pphrase.obj \ $(WORKDIR)\ssl_engine_rand.obj \ $(WORKDIR)\ssl_engine_vars.obj \ - $(WORKDIR)\ssl_engine_ocsp.c \ - $(WORKDIR)\ssl_util_ocsp.c \ + $(WORKDIR)\ssl_engine_ocsp.obj \ + $(WORKDIR)\ssl_util_ocsp.obj \ $(WORKDIR)\ssl_scache.obj \ $(WORKDIR)\ssl_util_stapling.obj \ $(WORKDIR)\ssl_util.obj \