You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2016/03/06 19:43:22 UTC
svn commit: r1733822 - /tomcat/native/trunk/native/srclib/apr/NMAKEmakefile
Author: rjung
Date: Sun Mar 6 18:43:22 2016
New Revision: 1733822
URL: http://svn.apache.org/viewvc?rev=1733822&view=rev
Log:
Update apr NMAKEmakefile for APR 1.5.2.
Modified:
tomcat/native/trunk/native/srclib/apr/NMAKEmakefile
Modified: tomcat/native/trunk/native/srclib/apr/NMAKEmakefile
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/apr/NMAKEmakefile?rev=1733822&r1=1733821&r2=1733822&view=diff
==============================================================================
--- tomcat/native/trunk/native/srclib/apr/NMAKEmakefile (original)
+++ tomcat/native/trunk/native/srclib/apr/NMAKEmakefile Sun Mar 6 18:43:22 2016
@@ -50,6 +50,7 @@ PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\
OBJECTS = \
$(WORKDIR)\apr_atomic.obj \
$(WORKDIR)\dso.obj \
+ $(WORKDIR)\apr_escape.obj \
$(WORKDIR)\buffer.obj \
$(WORKDIR)\copy.obj \
$(WORKDIR)\dir.obj \
@@ -144,13 +145,27 @@ $(WORKDIR) :
$(SRCDIR)\include\apr.h: $(SRCDIR)\include\apr.hw
-@copy $(SRCDIR)\include\apr.hw $(SRCDIR)\include\apr.h
-
+
+$(WORKDIR)\apr_escape_test_char.h: $(WORKDIR)\gen_test_char.exe
+ $(WORKDIR)\gen_test_char.exe > $(WORKDIR)\apr_escape_test_char.h
+
+$(WORKDIR)\gen_test_char.exe: $(WORKDIR)\gen_test_char.obj
+ $(LINK) $(WORKDIR)\gen_test_char.obj /out:$(WORKDIR)\gen_test_char.exe
+
+$(WORKDIR)\gen_test_char.obj: $(SRCDIR)\tools\gen_test_char.c
+ $(CC) $(CFLAGS) $(PDBFLAGS) $(SRCDIR)\tools\gen_test_char.c
+
{$(SRCDIR)\atomic\win32}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
{$(SRCDIR)\dso\win32}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+# Needs additional dynamically generated header file.
+# It is created in $(WORKDIR), so add it to header serach dirs.
+{$(SRCDIR)\encoding}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) -I$(WORKDIR) $(PDBFLAGS) $<
+
{$(SRCDIR)\file_io\unix}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
@@ -210,6 +225,8 @@ $(SRCDIR)\include\apr.h: $(SRCDIR)\inclu
$(OBJECTS): $(SRCDIR)\include\apr.h
+$(WORKDIR)\apr_escape.obj: $(WORKDIR)\apr_escape_test_char.h
+
!IF "$(TARGET)" == "DLL"
$(BUILDRES): libapr.rc $(SRCDIR)\include\apr.h
$(RC) $(RCFLAGS) /i "$(SRCDIR)\include" /d "APR_VERSION_ONLY" /fo $(BUILDRES) libapr.rc
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org