Author: jfrederic.clere(a)jboss.com Date: 2014-01-30 05:42:48 -0500 (Thu, 30 Jan 2014) New Revision: 3238 Modified: trunk/httpd/httpd-2.4/NMAKElibhttpd trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat trunk/httpd/httpd-2.4/support/NMAKEhtpasswd Log: some more adjustements. Modified: trunk/httpd/httpd-2.4/NMAKElibhttpd =================================================================== --- trunk/httpd/httpd-2.4/NMAKElibhttpd 2014-01-30 10:28:44 UTC (rev 3237) +++ trunk/httpd/httpd-2.4/NMAKElibhttpd 2014-01-30 10:42:48 UTC (rev 3238) @@ -60,6 +60,7 @@ $(WORKDIR)\scoreboard.obj \ $(WORKDIR)\util.obj \ $(WORKDIR)\util_cfgtree.obj \ + $(WORKDIR)\util_cookies.obj \ $(WORKDIR)\util_expr_eval.obj \ $(WORKDIR)\util_expr_scan.obj \ $(WORKDIR)\util_expr_parse.obj \ Modified: trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat =================================================================== --- trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat 2014-01-30 10:28:44 UTC (rev 3237) +++ trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat 2014-01-30 10:42:48 UTC (rev 3238) @@ -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 -I../core PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src Modified: trunk/httpd/httpd-2.4/support/NMAKEhtpasswd =================================================================== --- trunk/httpd/httpd-2.4/support/NMAKEhtpasswd 2014-01-30 10:28:44 UTC (rev 3237) +++ trunk/httpd/httpd-2.4/support/NMAKEhtpasswd 2014-01-30 10:42:48 UTC (rev 3238) @@ -48,6 +48,7 @@ OBJECTS = \ $(WORKDIR)\htpasswd.obj \ + $(WORKDIR)\passwd_common.obj {$(SRCDIR)}.c{$(WORKDIR)}.obj: $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<