Author: jfrederic.clere(a)jboss.com Date: 2014-01-27 11:02:37 -0500 (Mon, 27 Jan 2014) New Revision: 3208 Modified: trunk/srclib/apr/apr-1.5/NMAKEmakefile Log: the 1.4 will probably do better. Modified: trunk/srclib/apr/apr-1.5/NMAKEmakefile =================================================================== --- trunk/srclib/apr/apr-1.5/NMAKEmakefile 2014-01-27 15:46:40 UTC (rev 3207) +++ trunk/srclib/apr/apr-1.5/NMAKEmakefile 2014-01-27 16:02:37 UTC (rev 3208) @@ -1,4 +1,4 @@ -# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# Copyright 2001-2009 The Apache Software Foundation or its licensors, as # applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -39,57 +39,60 @@ SRCDIR = . !ENDIF -!include <..\..\NMAKEcommon.inc> -!include <..\..\NMAKEhttpd.inc> +!include <..\common\NMAKEcommon.inc> +!IF "$(TARGET)" != "LIB" +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)\copy.obj \ + $(WORKDIR)\fileacc.obj \ + $(WORKDIR)\filepath_util.obj \ + $(WORKDIR)\fullrw.obj \ + $(WORKDIR)\mktemp.obj \ + $(WORKDIR)\tempdir.obj \ + $(WORKDIR)\buffer.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)\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)\select.obj \ $(WORKDIR)\multicast.obj \ + $(WORKDIR)\sockaddr.obj \ $(WORKDIR)\sendrecv.obj \ - $(WORKDIR)\sockaddr.obj \ $(WORKDIR)\sockets.obj \ $(WORKDIR)\sockopt.obj \ $(WORKDIR)\apr_getpass.obj \ + $(WORKDIR)\select.obj \ $(WORKDIR)\apr_random.obj \ $(WORKDIR)\sha2.obj \ $(WORKDIR)\sha2_glue.obj \ @@ -109,34 +112,32 @@ $(WORKDIR)\time.obj \ $(WORKDIR)\timestr.obj \ $(WORKDIR)\groupinfo.obj \ - $(WORKDIR)\userinfo.obj + $(WORKDIR)\userinfo.obj \ + $(WORKDIR)\poll.obj \ + $(WORKDIR)\pollset.obj -!IF EXIST($(SRCDIR)\file_io\win32\buffer.c) -OBJECTS = $(OBJECTS) \ - $(WORKDIR)\buffer.obj -!ENDIF - -HEADERS = $(SRCDIR)\include\apr.h - +BUILDINC = $(PREFIX)\include\apr-1 +BUILDLIB = $(PREFIX)\lib !IF "$(TARGET)" == "DLL" BUILDBIN = $(WORKDIR)\$(PROJECT).dll BUILDPDB = $(WORKDIR)\$(PROJECT).pdb BUILDRES = $(WORKDIR)\$(PROJECT).res -BUILDMFT = $(BUILDBIN).manifest +BUILDMAN = $(BUILDBIN).manifest !ELSE BUILDBIN = $(WORKDIR)\$(PROJECT).lib !ENDIF -all : $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDBIN) +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) -.SUFFIXES : .hw - -{$(SRCDIR)\include}.hw{$(SRCDIR)\include}.h: - @copy /Y $< $@ >NUL - {$(SRCDIR)\atomic\win32}.c{$(WORKDIR)}.obj: $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< @@ -203,12 +204,12 @@ $(OBJECTS): $(SRCDIR)\include\*.h $(SRCDIR)\include\arch\*.h $(SRCDIR)\include\arch\win32\*.h $(SRCDIR)\include\arch\unix\*.h !IF "$(TARGET)" == "DLL" -$(BUILDRES): libapr.rc $(HEADERS) $(SRCDIR)\include\*.h +$(BUILDRES): libapr.rc $(SRCDIR)\include\*.h $(RC) $(RCFLAGS) /i "$(SRCDIR)\include" /d "APR_VERSION_ONLY" /fo $(BUILDRES) libapr.rc -$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) $(BUILDRES) +$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES) $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) - IF EXIST $(BUILDMFT) \ - mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 !ELSE $(BUILDBIN): $(WORKDIR) $(OBJECTS) $(LINK) $(LFLAGS) $(OBJECTS) /out:$(BUILDBIN) @@ -217,9 +218,9 @@ clean: @$(CLEANTARGET) -install: $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDBIN) +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" "$(BUILDOUT)" /Y /Q 2>NUL + @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL