Author: mturk
Date: Thu Feb 23 14:35:43 2012
New Revision: 1292818
URL: http://svn.apache.org/viewvc?rev=1292818&view=rev
Log:
Use correct set of files for apr-1.4.x
Modified:
tomcat/native/branches/1.1.x/native/srclib/apr/NMAKEmakefile
tomcat/native/branches/1.1.x/native/srclib/apr/NMAKEmakefile.inc
Modified: tomcat/native/branches/1.1.x/native/srclib/apr/NMAKEmakefile
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/srclib/apr/NMAKEmakefile?rev=1292818&r1=1292817&r2=1292818&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/srclib/apr/NMAKEmakefile (original)
+++ tomcat/native/branches/1.1.x/native/srclib/apr/NMAKEmakefile Thu Feb 23
14:35:43 2012
@@ -50,52 +50,54 @@ PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\
OBJECTS = \
$(WORKDIR)\apr_atomic.obj \
$(WORKDIR)\dso.obj \
- $(WORKDIR)\copy.obj \
- $(WORKDIR)\fileacc.obj \
- $(WORKDIR)\filepath_util.obj \
- $(WORKDIR)\fullrw.obj \
- $(WORKDIR)\mktemp.obj \
- $(WORKDIR)\tempdir.obj \
$(WORKDIR)\buffer.obj \
+ $(WORKDIR)\copy.obj \
$(WORKDIR)\dir.obj \
+ $(WORKDIR)\fileacc.obj \
$(WORKDIR)\filedup.obj \
$(WORKDIR)\filepath.obj \
+ $(WORKDIR)\filepath_util.obj \
$(WORKDIR)\filestat.obj \
$(WORKDIR)\filesys.obj \
$(WORKDIR)\flock.obj \
+ $(WORKDIR)\fullrw.obj \
+ $(WORKDIR)\mktemp.obj \
$(WORKDIR)\open.obj \
$(WORKDIR)\pipe.obj \
$(WORKDIR)\readwrite.obj \
$(WORKDIR)\seek.obj \
+ $(WORKDIR)\tempdir.obj \
$(WORKDIR)\proc_mutex.obj \
$(WORKDIR)\thread_cond.obj \
$(WORKDIR)\thread_mutex.obj \
$(WORKDIR)\thread_rwlock.obj \
$(WORKDIR)\apr_pools.obj \
- $(WORKDIR)\errorcodes.obj \
- $(WORKDIR)\getopt.obj \
- $(WORKDIR)\otherchild.obj \
- $(WORKDIR)\version.obj \
+ $(WORKDIR)\apr_app.obj \
$(WORKDIR)\charset.obj \
$(WORKDIR)\env.obj \
+ $(WORKDIR)\errorcodes.obj \
+ $(WORKDIR)\getopt.obj \
$(WORKDIR)\internal.obj \
$(WORKDIR)\misc.obj \
+ $(WORKDIR)\otherchild.obj \
$(WORKDIR)\rand.obj \
$(WORKDIR)\start.obj \
$(WORKDIR)\utf8.obj \
+ $(WORKDIR)\version.obj \
$(WORKDIR)\common.obj \
$(WORKDIR)\mmap.obj \
$(WORKDIR)\inet_ntop.obj \
$(WORKDIR)\inet_pton.obj \
$(WORKDIR)\multicast.obj \
- $(WORKDIR)\sockaddr.obj \
$(WORKDIR)\sendrecv.obj \
+ $(WORKDIR)\sockaddr.obj \
$(WORKDIR)\sockets.obj \
+ $(WORKDIR)\socket_util.obj \
$(WORKDIR)\sockopt.obj \
$(WORKDIR)\apr_getpass.obj \
+ $(WORKDIR)\poll.obj \
$(WORKDIR)\pollcb.obj \
$(WORKDIR)\pollset.obj \
- $(WORKDIR)\poll.obj \
$(WORKDIR)\select.obj \
$(WORKDIR)\apr_random.obj \
$(WORKDIR)\sha2.obj \
@@ -113,7 +115,6 @@ OBJECTS = \
$(WORKDIR)\signals.obj \
$(WORKDIR)\thread.obj \
$(WORKDIR)\threadpriv.obj \
- $(WORKDIR)\access.obj \
$(WORKDIR)\time.obj \
$(WORKDIR)\timestr.obj \
$(WORKDIR)\groupinfo.obj \
@@ -141,6 +142,9 @@ $(BUILDLIB) :
$(WORKDIR) :
@$(MAKEWORKDIR)
+$(SRCDIR)\include\apr.h: $(SRCDIR)\include\apr.hw
+ -@copy $(SRCDIR)\include\apr.hw $(SRCDIR)\include\apr.h
+
{$(SRCDIR)\atomic\win32}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
@@ -204,10 +208,10 @@ $(WORKDIR) :
{$(SRCDIR)\user\win32}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-$(OBJECTS): $(SRCDIR)\include\*.h $(SRCDIR)\include\arch\*.h
$(SRCDIR)\include\arch\win32\*.h $(SRCDIR)\include\arch\unix\*.h
+$(OBJECTS): $(SRCDIR)\include\apr.h
!IF "$(TARGET)" == "DLL"
-$(BUILDRES): libapr.rc $(SRCDIR)\include\*.h
+$(BUILDRES): libapr.rc $(SRCDIR)\include\apr.h
$(RC) $(RCFLAGS) /i "$(SRCDIR)\include" /d "APR_VERSION_ONLY" /fo
$(BUILDRES) libapr.rc
$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) /pdb:$(BUILDPDB)
/out:$(BUILDBIN)
@@ -227,3 +231,4 @@ install: $(BUILDINC) $(BUILDLIB) $(WORKD
@xcopy "$(SRCDIR)\include\arch\win32\*.h" "$(BUILDINC)\arch\win32" /Y /Q
@xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q
@xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL
+
Modified: tomcat/native/branches/1.1.x/native/srclib/apr/NMAKEmakefile.inc
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/srclib/apr/NMAKEmakefile.inc?rev=1292818&r1=1292817&r2=1292818&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/srclib/apr/NMAKEmakefile.inc (original)
+++ tomcat/native/branches/1.1.x/native/srclib/apr/NMAKEmakefile.inc Thu Feb 23
14:35:43 2012
@@ -13,334 +13,221 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# @author Mladen Turk
-#
-#
# ====================================================================
#
-# Makefile.inc Master makefile definitions.
-# This file defines CPU architecture and basic compiler
-# and linker parameters.
-# Common params:
-# CPU Compile for specified CPU. Supported CPU's are:
-# X86 (Common x86 architecture)
-# X64 (AMD64/EMT64 architecture)
-# I64 (Intel IA64 architecture)
-# If not specified it will default to the
-# PROCESSOR_ARCHITECTURE environment variable
-# or to the X86 if not specified.
-# WINVER Compile for specified Windows version
-# WINNT for Windows 2000 and up(default)
-# WINXP for Windows XP and up
-# WIN2003 for Windows 2003 and up
-# VSITA for Windows Vista and up
-# Deprecated targets (may not even compile):
-# NT4 for Windows NT4 and up
-# WIN9X for Windows 95, 98 and Me
-# BUILD Build version
-# RETAIL or RELEASE (default)
-# DEBUG
-# TARGET Build application target
-# EXE Console executable (default)
-# GUI Windows GUI executable
-# DLL Dynamic Link Library
-# LIB Static library
-# UNICODE Build unicode version
-# If definded and not empty -D_UNICODE is added
-# to CFLAGS; -D_MBCS is added otherwise
-# Environment variables used:
-# EXTRA_CFLAGS Added to the common CFLAGS
-# EXTRA_CXXFLAGS Added to the common CXXFLAGS
-# EXTRA_LIBS Added to the common LIBS
-# EXTRA_LFLAGS Added to the common LFLAGS
-# EXTRA_RCFLAGS Added to the common RCFLAGS
-#
-# Compiler tools environment variables:
-# CC C compiler (defaults to cl.exe)
-# CXX C++ compiler (defaults to $CC -TP)
-# CPP C preprocessor (defaults to $CC -EP)
-# LINK Linker (defaults to link.exe)
-# RC Resource compiler (defaults to rc.exe)
-# MT Manifest toolkit (defaults to mt.exe)
-# ML Assembler (defaults to ml.exe or ml64.exe)
+# NMAKEmakefile Master APR makefile.
+# Usage:
+# DLL=1 Build DLL version
+# DEBUG=1 Build DEBUG version of APR
#
-# Originally contributed by Mladen Turk <mturk jboss.com>
+# Originally contributed by Mladen Turk <mturk redhat.com>
#
# ====================================================================
#
-# C/C++ compiler
-!IF !DEFINED(CC) || "$(CC)" == ""
-CC = cl.exe
-!ENDIF
-!IF !DEFINED(CXX) || "$(CXX)" == ""
-CXX = $(CC) -TP
-!ENDIF
-!IF !DEFINED(CPP) || "$(CPP)" == ""
-CPP = $(CC) -EP
-!ENDIF
-# Linker
-!IF !DEFINED(LINK) || "$(LINK)" == ""
-LINK = link.exe
-!ENDIF
-# Resource Compiler
-!IF !DEFINED(RC) || "$(RC)" == ""
-RC = rc.exe
-!ENDIF
-# Manifest toolkit
-!IF !DEFINED(MT) || "$(MT)" == ""
-MT = mt.exe
-!ENDIF
-
-# Use BUILD_CPU if CPU was not set
-!IF !DEFINED(CPU) || "$(CPU)" == ""
-!IF "$(BUILD_CPU)" == "i386" || "$(BUILD_CPU)" == "x86" || "$(BUILD_CPU)" ==
"i686"
-CPU=X86
-!ENDIF
-!IF "$(BUILD_CPU)" == "amd64" || "$(BUILD_CPU)" == "x86_64" || "$(BUILD_CPU)"
== "x64"
-CPU=X64
-!ENDIF
-!IF "$(BUILD_CPU)" == "ia64" || "$(BUILD_CPU)" == "i64"
-CPU=I64
-!ENDIF
-!ENDIF
-# Figure out CPU from the current host
-!IF !DEFINED(CPU) || "$(CPU)" == ""
-!IF "$(PROCESSOR_ARCHITECTURE)" == ""
-!IF "$(PROCESSOR_ARCHITEW6432)" == ""
-CPU=X86
-!ELSE
-CPU=$(PROCESSOR_ARCHITEW6432)
-!ENDIF
-!ELSE
-CPU=$(PROCESSOR_ARCHITECTURE)
-!ENDIF
-!ENDIF
-
-!IF "$(CPU)" != "X86"
-!IF "$(CPU)" != "X64"
-!IF "$(CPU)" != "I64"
-!ERROR Must specify CPU environment variable (X86, X64, I64) $(CPU)
-!ENDIF
-!ENDIF
-!ENDIF
-
-!IF !DEFINED(TARGET) || "$(TARGET)" == ""
-TARGET=EXE
-!ENDIF
-
-!IF "$(TARGET)" != "EXE"
-!IF "$(TARGET)" != "GUI"
-!IF "$(TARGET)" != "DLL"
-!IF "$(TARGET)" != "LIB"
-!ERROR Must specify TARGET environment variable (EXE, GUI, DLL, LIB)
-!ENDIF
-!ENDIF
-!ENDIF
-!ENDIF
-
-!IF !DEFINED(WINVER) || "$(WINVER)" == ""
-WINVER=WINXP
-!ENDIF
-
-
-!IF "$(WINVER)" != "WINNT"
-!IF "$(WINVER)" != "WINXP"
-!IF "$(WINVER)" != "WIN2003"
-!IF "$(WINVER)" != "VISTA"
-!IF "$(WINVER)" != "WIN7"
-!ERROR Must specify WINVER environment variable (WINNT, WINXP, WIN2003, VISTA,
WIN7)
-!ENDIF
-!ENDIF
-!ENDIF
-!ENDIF
-!ENDIF
-
-!IF "$(WINVER)" == "WINNT"
-NMAKE_WINVER = 0x0500
-_WIN32_IE = 0x0500
-!ELSEIF "$(WINVER)" == "WINXP"
-NMAKE_WINVER = 0x0501
-_WIN32_IE = 0x0600
-!ELSEIF "$(WINVER)" == "WIN2003"
-NMAKE_WINVER = 0x0502
-_WIN32_IE = 0x0600
-!ELSEIF "$(WINVER)" == "VISTA"
-NMAKE_WINVER = 0x0600
-_WIN32_IE = 0x0700
-!ELSEIF "$(WINVER)" == "WIN7"
-NMAKE_WINVER = 0x0700
-_WIN32_IE = 0x0800
-!ELSE
-!ERROR Must specify WINVER environment variable (WINNT, WINXP, WIN2003, VISTA,
WIN7)
-!ENDIF
-
-NMAKE_WINNT = -DWINNT -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER)
-DWINVER=$(NMAKE_WINVER) -D_WIN32_IE=$(_WIN32_IE)
-
-!IF !DEFINED(BUILD) || "$(BUILD)" == ""
-BUILD=RELEASE
-!ENDIF
-!IFDEF RELEASE
-BUILD=RELEASE
-!ENDIF
-!IFDEF DEBUG
-BUILD=DEBUG
-!ENDIF
-!IFDEF NODEBUG
-BUILD=RELEASE
-!ENDIF
-
-!IF "$(BUILD)" != "RELEASE"
-!IF "$(BUILD)" != "DEBUG"
-!ERROR Must specify BUILD environment variable (RELEASE, DEBUG)
-!ENDIF
-!ENDIF
-
-# Common flags for all platforms
-CMN_CFLAGS = -c -nologo -DWIN32 -D_WIN32 -D_WINDOWS $(NMAKE_WINNT) -W3
-!IF "$(TARGET)" == "EXE"
-CMN_CFLAGS = $(CMN_CFLAGS) -D_CONSOLE
-!ENDIF
-# Mark that extern C newer throws C++ exception
-CMN_CFLAGS = $(CMN_CFLAGS) -EHsc
-
-!IF !DEFINED(UNICODE) || "$(UNICODE)" == ""
-CMN_CFLAGS = $(CMN_CFLAGS) -D_MBCS -DMBCS
-!ELSE
-CMN_CFLAGS = $(CMN_CFLAGS) -D_UNICODE -DUNICODE
-!ENDIF
-
-!IF "$(CPU)" == "X86"
-CPU_CFLAGS = -D_X86_=1
-MACHINE=X86
-MACHINE_LC=i386
-!ELSEIF "$(CPU)" == "X64"
-CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64
-MACHINE=AMD64
-MACHINE_LC=amd64
-!ELSEIF "$(CPU)" == "I64"
-CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64
-MACHINE=IA64
-MACHINE_LC=ia64
-!ENDIF
-
-!IF "$(BUILD)" == "RELEASE"
-!IF "$(CPU)" == "X86"
-OPT_CFLAGS = -O2 -Ob2 -Oy- -Zi -DNDEBUG
+!IF !DEFINED(APR_DECLARE_STATIC) || "$(APR_DECLARE_STATIC)" == ""
+TARGET=DLL
+EXTRA_CFLAGS = -DAPR_DECLARE_EXPORT
+PROJECT = libapr-1
!ELSE
-OPT_CFLAGS = -O2 -Ob2 -Zi -DNDEBUG
-!ENDIF
-!ELSE
-OPT_CFLAGS = -Od -Zi -DDEBUG -D_DEBUG
-!ENDIF
-
-!IF DEFINED(STATIC_CRT)
-CRT_CFLAGS = -D_MT -MT
-!ELSE
-CRT_CFLAGS = -D_MT -MD
-!ENDIF
-
-!IF "$(BUILD)" == "DEBUG"
-CRT_CFLAGS = $(CRT_CFLAGS)d
-!ENDIF
-
-CFLAGS = $(CMN_CFLAGS) $(CPU_CFLAGS) $(OPT_CFLAGS) $(CRT_CFLAGS)
-
-!IF DEFINED(EXTRA_CFLAGS)
-CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS)
-!ENDIF
-
-# Cleanup CXXFLAGS
-CXXFLAGS =
-!IF DEFINED(EXTRA_CXXFLAGS)
-CXXFLAGS = $(EXTRA_CXXFLAGS)
+TARGET=LIB
+EXTRA_CFLAGS = -DAPR_DECLARE_STATIC
+PROJECT = apr-1
!ENDIF
-# Linker section
-LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
rpcrt4.lib
-# Extra libs from command line or env
-!IF DEFINED(EXTRA_LIBS)
-LIBS = $(LIBS) $(EXTRA_LIBS)
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
!ENDIF
-# Run-Time Error Checks
-!IF "$(BUILD)" == "DEBUG"
-!IF DEFINED(RTC_CHECK)
-LIBS = $(LIBS) RunTmChk.lib
-CFLAGS = $(CFLAGS) -RTC1
-!ENDIF
-!ENDIF
-
-COMMON_LFLAGS = /NOLOGO
-
-# Always add debugging to the linker
-OPT_LFLAGS = /INCREMENTAL:NO /DEBUG
-!IF "$(BUILD)" == "RELEASE"
-OPT_LFLAGS = /OPT:REF
-!ENDIF
-
-!IF "$(TARGET)" == "EXE"
-LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:CONSOLE /MACHINE:$(MACHINE)
-!ELSEIF "$(TARGET)" == "GUI"
-LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:WINDOWS /MACHINE:$(MACHINE)
-!ELSEIF "$(TARGET)" == "DLL"
-LFLAGS = $(COMMON_LFLAGS) /DLL /SUBSYSTEM:WINDOWS /MACHINE:$(MACHINE)
-!ELSEIF "$(TARGET)" == "LIB"
-LFLAGS = -lib $(COMMON_LFLAGS)
-!ENDIF
+!include <NMAKEMakefile.inc>
-!IF DEFINED(EXTRA_LFLAGS)
-LFLAGS = $(LFLAGS) $(EXTRA_LFLAGS)
-!ENDIF
!IF "$(TARGET)" != "LIB"
-LFLAGS = $(LFLAGS) $(OPT_LFLAGS)
-!ENDIF
-
-# Resource compiler flags
-
-RCFLAGS=/l 0x409
-!IF "$(BUILD)" == "RELEASE"
-RCFLAGS = $(RCFLAGS) /d "NDEBUG"
-!ELSE
-RCFLAGS = $(RCFLAGS) /d "_DEBUG" /d "DEBUG"
-!ENDIF
-RCFLAGS = $(RCFLAGS)
-!IF DEFINED(EXTRA_RCFLAGS)
-RCFLAGS = $(RCFLAGS) $(EXTRA_RCFLAGS)
-!ENDIF
-
-
-# Build Target dir e.g. WINNT_I386_RELEASE_DLL
-!IF !DEFINED(WORKDIR) || "$(WORKDIR)" == ""
-!IF !DEFINED(WORKDIR_EXT) || "$(WORKDIR_EXT)" == ""
-WORKDIR = $(WINVER)_$(CPU)_$(TARGET)_$(BUILD)
-WORKDIR_DLL = $(WINVER)_$(CPU)_DLL_$(BUILD)
-WORKDIR_LIB = $(WINVER)_$(CPU)_LIB_$(BUILD)
-WORKDIR_EXE = $(WINVER)_$(CPU)_EXE_$(BUILD)
-!ELSE
-WORKDIR = $(WINVER)_$(CPU)_$(BUILDIR_EXT)_$(BUILD)
-!ENDIF
-!ENDIF
-
-CLEANTARGET=if exist "$(WORKDIR)\$(NULL)" rd /s /q $(WORKDIR)
-MAKEWORKDIR=if not exist "$(WORKDIR)\$(NULL)" mkdir $(WORKDIR)
-MAKEINSTALL=if not exist "$(INSTALLLOC)\$(NULL)" mkdir $(INSTALLLOC)
-
-!IF DEFINED(JAVA_HOME) && "$(JAVA_HOME)" != ""
-JAVA_INCLUDES=-I "$(JAVA_HOME)\include" -I "$(JAVA_HOME)\include\win32"
-!ENDIF
-
-# Assembler Section
-!IF !DEFINED(ML) || "$(ML)" == ""
-!IF "$(CPU)" == "X86"
-ML = ml.exe
-AFLAGS = /coff /Zi /c
-!ELSEIF "$(CPU)" == "X64"
-ML = ml64.exe
-AFLAGS = /Zi /c
-!ELSEIF "$(CPU)" == "I64"
-ML = ml64.exe
-AFLAGS = /coff /Zi /c
-!ENDIF
+LFLAGS = $(LFLAGS) /version:1.4
!ENDIF
+INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\include\arch
-I$(SRCDIR)\include\arch\win32 -I$(SRCDIR)\include\arch\unix
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+OBJECTS = \
+ $(WORKDIR)\apr_atomic.obj \
+ $(WORKDIR)\dso.obj \
+ $(WORKDIR)\buffer.obj \
+ $(WORKDIR)\copy.obj \
+ $(WORKDIR)\dir.obj \
+ $(WORKDIR)\fileacc.obj \
+ $(WORKDIR)\filedup.obj \
+ $(WORKDIR)\filepath.obj \
+ $(WORKDIR)\filepath_util.obj \
+ $(WORKDIR)\filestat.obj \
+ $(WORKDIR)\filesys.obj \
+ $(WORKDIR)\flock.obj \
+ $(WORKDIR)\fullrw.obj \
+ $(WORKDIR)\mktemp.obj \
+ $(WORKDIR)\open.obj \
+ $(WORKDIR)\pipe.obj \
+ $(WORKDIR)\readwrite.obj \
+ $(WORKDIR)\seek.obj \
+ $(WORKDIR)\tempdir.obj \
+ $(WORKDIR)\proc_mutex.obj \
+ $(WORKDIR)\thread_cond.obj \
+ $(WORKDIR)\thread_mutex.obj \
+ $(WORKDIR)\thread_rwlock.obj \
+ $(WORKDIR)\apr_pools.obj \
+ $(WORKDIR)\apr_app.obj \
+ $(WORKDIR)\charset.obj \
+ $(WORKDIR)\env.obj \
+ $(WORKDIR)\errorcodes.obj \
+ $(WORKDIR)\getopt.obj \
+ $(WORKDIR)\internal.obj \
+ $(WORKDIR)\misc.obj \
+ $(WORKDIR)\otherchild.obj \
+ $(WORKDIR)\rand.obj \
+ $(WORKDIR)\start.obj \
+ $(WORKDIR)\utf8.obj \
+ $(WORKDIR)\version.obj \
+ $(WORKDIR)\common.obj \
+ $(WORKDIR)\mmap.obj \
+ $(WORKDIR)\inet_ntop.obj \
+ $(WORKDIR)\inet_pton.obj \
+ $(WORKDIR)\multicast.obj \
+ $(WORKDIR)\sendrecv.obj \
+ $(WORKDIR)\sockaddr.obj \
+ $(WORKDIR)\sockets.obj \
+ $(WORKDIR)\socket_util.obj \
+ $(WORKDIR)\sockopt.obj \
+ $(WORKDIR)\apr_getpass.obj \
+ $(WORKDIR)\poll.obj \
+ $(WORKDIR)\pollcb.obj \
+ $(WORKDIR)\pollset.obj \
+ $(WORKDIR)\select.obj \
+ $(WORKDIR)\apr_random.obj \
+ $(WORKDIR)\sha2.obj \
+ $(WORKDIR)\sha2_glue.obj \
+ $(WORKDIR)\shm.obj \
+ $(WORKDIR)\apr_cpystrn.obj \
+ $(WORKDIR)\apr_fnmatch.obj \
+ $(WORKDIR)\apr_snprintf.obj \
+ $(WORKDIR)\apr_strings.obj \
+ $(WORKDIR)\apr_strnatcmp.obj \
+ $(WORKDIR)\apr_strtok.obj \
+ $(WORKDIR)\apr_hash.obj \
+ $(WORKDIR)\apr_tables.obj \
+ $(WORKDIR)\proc.obj \
+ $(WORKDIR)\signals.obj \
+ $(WORKDIR)\thread.obj \
+ $(WORKDIR)\threadpriv.obj \
+ $(WORKDIR)\time.obj \
+ $(WORKDIR)\timestr.obj \
+ $(WORKDIR)\groupinfo.obj \
+ $(WORKDIR)\userinfo.obj
+
+BUILDINC = $(PREFIX)\include\apr-1
+BUILDLIB = $(PREFIX)\lib
+!IF "$(TARGET)" == "DLL"
+BUILDBIN = $(WORKDIR)\$(PROJECT).dll
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMAN = $(BUILDBIN).manifest
+!ELSE
+BUILDBIN = $(WORKDIR)\$(PROJECT).lib
+!ENDIF
+
+all : $(WORKDIR) $(BUILDBIN)
+
+$(BUILDINC) :
+ @if not exist "$(BUILDINC)\arch\win32\$(NULL)" mkdir
"$(BUILDINC)\arch\win32"
+
+$(BUILDLIB) :
+ @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
+
+$(WORKDIR) :
+ @$(MAKEWORKDIR)
+
+$(SRCDIR)\include\apr.h: $(SRCDIR)\include\apr.hw
+ -@copy $(SRCDIR)\include\apr.hw $(SRCDIR)\include\apr.h
+
+{$(SRCDIR)\atomic\win32}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\dso\win32}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\file_io\unix}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\file_io\win32}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\locks\win32}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\memory\unix}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\misc\unix}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\misc\win32}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\mmap\unix}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\mmap\win32}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\network_io\unix}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\network_io\win32}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\passwd}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\poll\unix}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\random\unix}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\shmem\win32}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\strings}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\tables}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\threadproc\win32}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\time\win32}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\user\win32}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+$(OBJECTS): $(SRCDIR)\include\apr.h
+
+!IF "$(TARGET)" == "DLL"
+$(BUILDRES): libapr.rc $(SRCDIR)\include\apr.h
+ $(RC) $(RCFLAGS) /i "$(SRCDIR)\include" /d "APR_VERSION_ONLY" /fo
$(BUILDRES) libapr.rc
+$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES)
+ $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) /pdb:$(BUILDPDB)
/out:$(BUILDBIN)
+ IF EXIST $(BUILDMAN) \
+ mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2
+!ELSE
+$(BUILDBIN): $(WORKDIR) $(OBJECTS)
+ $(LINK) $(LFLAGS) $(OBJECTS) /out:$(BUILDBIN)
+!ENDIF
+
+clean:
+ @$(CLEANTARGET)
+
+install: $(BUILDINC) $(BUILDLIB) $(WORKDIR) $(BUILDBIN)
+ @xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q
+ @xcopy "$(SRCDIR)\include\arch\apr_private_common.h" "$(BUILDINC)\arch" /Y
/Q
+ @xcopy "$(SRCDIR)\include\arch\win32\*.h" "$(BUILDINC)\arch\win32" /Y /Q
+ @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q
+ @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
