Author: jfrederic.clere(a)jboss.com Date: 2014-01-30 03:10:03 -0500 (Thu, 30 Jan 2014) New Revision: 3232 Modified: trunk/httpd/httpd-2.4/modules/core/NMAKEwatchdog trunk/httpd/httpd-2.4/modules/filters/NMAKEdeflate trunk/httpd/httpd-2.4/modules/mappers/NMAKErewrite 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/ssl/NMAKEssl Log: Arrange makefiles. Modified: trunk/httpd/httpd-2.4/modules/core/NMAKEwatchdog =================================================================== --- trunk/httpd/httpd-2.4/modules/core/NMAKEwatchdog 2014-01-30 07:54:19 UTC (rev 3231) +++ trunk/httpd/httpd-2.4/modules/core/NMAKEwatchdog 2014-01-30 08:10:03 UTC (rev 3232) @@ -34,7 +34,7 @@ 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 +CFLAGS = $(CFLAGS) -DAP_WD_DECLARE_EXPORT INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src Modified: trunk/httpd/httpd-2.4/modules/filters/NMAKEdeflate =================================================================== --- trunk/httpd/httpd-2.4/modules/filters/NMAKEdeflate 2014-01-30 07:54:19 UTC (rev 3231) +++ trunk/httpd/httpd-2.4/modules/filters/NMAKEdeflate 2014-01-30 08:10:03 UTC (rev 3232) @@ -36,7 +36,7 @@ LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) $(ZLIB) CFLAGS = $(CFLAGS) -DHAVE_ZUTIL_H -INCLUDES = -I$(SRCDIR) -I$(BUILDINC) +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../ssl PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src BUILDBIN = $(WORKDIR)\$(PROJECT).so Modified: trunk/httpd/httpd-2.4/modules/mappers/NMAKErewrite =================================================================== --- trunk/httpd/httpd-2.4/modules/mappers/NMAKErewrite 2014-01-30 07:54:19 UTC (rev 3231) +++ trunk/httpd/httpd-2.4/modules/mappers/NMAKErewrite 2014-01-30 08:10:03 UTC (rev 3232) @@ -35,7 +35,7 @@ LDIRS = /libpath:"$(BUILDLIB)" LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) -INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I..\ssl +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I..\ssl -I..\database PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src BUILDBIN = $(WORKDIR)\$(PROJECT).so Modified: trunk/httpd/httpd-2.4/modules/session/NMAKEsession =================================================================== --- trunk/httpd/httpd-2.4/modules/session/NMAKEsession 2014-01-30 07:54:19 UTC (rev 3231) +++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession 2014-01-30 08:10:03 UTC (rev 3232) @@ -34,7 +34,7 @@ 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 +CFLAGS = $(CFLAGS) -DSESSION_DECLARE_EXPORT INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src Modified: trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie =================================================================== --- trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie 2014-01-30 07:54:19 UTC (rev 3231) +++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie 2014-01-30 08:10:03 UTC (rev 3232) @@ -34,7 +34,7 @@ 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 +CFLAGS = $(CFLAGS) -DSESSION_DECLARE_EXPORT INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src Modified: trunk/httpd/httpd-2.4/modules/session/NMAKEsession_crypto =================================================================== --- trunk/httpd/httpd-2.4/modules/session/NMAKEsession_crypto 2014-01-30 07:54:19 UTC (rev 3231) +++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession_crypto 2014-01-30 08:10:03 UTC (rev 3232) @@ -34,7 +34,7 @@ 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 +CFLAGS = $(CFLAGS) -DSESSION_DECLARE_EXPORT INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src Modified: trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd =================================================================== --- trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd 2014-01-30 07:54:19 UTC (rev 3231) +++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd 2014-01-30 08:10:03 UTC (rev 3232) @@ -34,7 +34,7 @@ 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 +CFLAGS = $(CFLAGS) -DSESSION_DECLARE_EXPORT INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src Modified: trunk/httpd/httpd-2.4/modules/ssl/NMAKEssl =================================================================== --- trunk/httpd/httpd-2.4/modules/ssl/NMAKEssl 2014-01-30 07:54:19 UTC (rev 3231) +++ trunk/httpd/httpd-2.4/modules/ssl/NMAKEssl 2014-01-30 08:10:03 UTC (rev 3232) @@ -50,7 +50,6 @@ OBJECTS = \ $(WORKDIR)\ssl_engine_config.obj \ - $(WORKDIR)\ssl_engine_dh.obj \ $(WORKDIR)\ssl_engine_init.obj \ $(WORKDIR)\ssl_engine_io.obj \ $(WORKDIR)\ssl_engine_kernel.obj \ @@ -59,14 +58,10 @@ $(WORKDIR)\ssl_engine_pphrase.obj \ $(WORKDIR)\ssl_engine_rand.obj \ $(WORKDIR)\ssl_engine_vars.obj \ - $(WORKDIR)\ssl_expr.obj \ - $(WORKDIR)\ssl_expr_eval.obj \ - $(WORKDIR)\ssl_expr_parse.obj \ - $(WORKDIR)\ssl_expr_scan.obj \ + $(WORKDIR)\ssl_engine_ocsp.c \ + $(WORKDIR)\ssl_util_ocsp.c \ $(WORKDIR)\ssl_scache.obj \ - $(WORKDIR)\ssl_scache_dbm.obj \ - $(WORKDIR)\ssl_scache_shmcb.obj \ - $(WORKDIR)\ssl_scache_dc.obj \ + $(WORKDIR)\ssl_util_stapling.obj \ $(WORKDIR)\ssl_util.obj \ $(WORKDIR)\ssl_util_ssl.obj \ $(WORKDIR)\mod_ssl.obj