[jbossnative-commits] JBoss Native SVN: r1546 - in trunk/srclib: apr-iconv and 2 other directories.

Author: mladen.turk(a)jboss.com Date: 2008-04-21 02:47:58 -0400 (Mon, 21 Apr 2008) New Revision: 1546 Modified: trunk/srclib/apr-iconv/NMAKEmakefile trunk/srclib/apr-util/NMAKEmakefile trunk/srclib/apr/NMAKEmakefile trunk/srclib/zlib/NMAKEmakefile Log: Make sure /version is not defined for lib targets Modified: trunk/srclib/apr/NMAKEmakefile =================================================================== --- trunk/srclib/apr/NMAKEmakefile 2008-04-21 06:43:53 UTC (rev 1545) +++ trunk/srclib/apr/NMAKEmakefile 2008-04-21 06:47:58 UTC (rev 1546) @@ -41,7 +41,9 @@ !include <..\..\NMAKEcommon.inc> +!IF "$(TARGET)" != "LIB" LFLAGS = $(LFLAGS) /version:1.2 +!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 = \ Modified: trunk/srclib/apr-iconv/NMAKEmakefile =================================================================== --- trunk/srclib/apr-iconv/NMAKEmakefile 2008-04-21 06:43:53 UTC (rev 1545) +++ trunk/srclib/apr-iconv/NMAKEmakefile 2008-04-21 06:47:58 UTC (rev 1546) @@ -49,8 +49,9 @@ !ENDIF LDIRS = /libpath:"$(WITH_APR)\lib" - +!IF "$(TARGET)" != "LIB" LFLAGS = $(LFLAGS) /version:1.2 +!ENDIF LFLAGS = $(LFLAGS) $(APR_LIB) !IF "$(TARGET)" == "DLL" LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib Modified: trunk/srclib/apr-util/NMAKEmakefile =================================================================== --- trunk/srclib/apr-util/NMAKEmakefile 2008-04-21 06:43:53 UTC (rev 1545) +++ trunk/srclib/apr-util/NMAKEmakefile 2008-04-21 06:47:58 UTC (rev 1546) @@ -52,7 +52,9 @@ LDIRS = /libpath:"$(WITH_APR)\lib" +!IF "$(TARGET)" != "LIB" LFLAGS = $(LFLAGS) /version:1.2 +!ENDIF LFLAGS = $(LFLAGS) $(APR_LIB) !IF "$(TARGET)" == "DLL" LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib Modified: trunk/srclib/zlib/NMAKEmakefile =================================================================== --- trunk/srclib/zlib/NMAKEmakefile 2008-04-21 06:43:53 UTC (rev 1545) +++ trunk/srclib/zlib/NMAKEmakefile 2008-04-21 06:47:58 UTC (rev 1546) @@ -33,20 +33,23 @@ !ELSE TARGET=LIB PROJECT = zlib-1 -CFLAGS = -DZLIB_WINAPI -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS) +CFLAGS = -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS) !ENDIF -!IF "$(CPU)" != "X86" -CFLAGS = -GS- $(CFLAGS) -!ENDIF - !IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" SRCDIR = . !ENDIF !include <..\..\NMAKEcommon.inc> +!IF "$(CPU)" != "X86" +CFLAGS = $(CFLAGS) -GS- +!ENDIF + +!IF "$(TARGET)" != "LIB" LFLAGS = $(LFLAGS) /version:1.3 +!ENDIF + INCLUDES = -I$(SRCDIR) PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src OBJECTS = \