[aaf-commits] AAF/build common.mk, 1.17, 1.18 pdefs-MipsIrix.mk, 1.12, 1.13 pdefs-PPCDarwin.mk, 1.8, 1.9 pdefs-SparcSolaris.mk, 1.5, 1.6 pdefs-Win.mk, 1.5, 1.6 pdefs-i386FreeBSD.mk, 1.2, 1.3 pdefs-i386OpenBSD.mk, 1.2, 1.3 pdefs-i586Linux.mk, 1.11, 1.12 pdefs-i686Linux.mk, 1.6, 1.7 pdefs-ppc64Linux.mk, 1.3, 1.4 pdefs-ppcLinux.mk, 1.1, 1.2 pdefs-x86_64Linux.mk, 1.4, 1.5

[Stuart C. <stu...@us...>]

Update of /cvsroot/aaf/AAF/build
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv13162/build

Modified Files:
	common.mk pdefs-MipsIrix.mk pdefs-PPCDarwin.mk 
	pdefs-SparcSolaris.mk pdefs-Win.mk pdefs-i386FreeBSD.mk 
	pdefs-i386OpenBSD.mk pdefs-i586Linux.mk pdefs-i686Linux.mk 
	pdefs-ppc64Linux.mk pdefs-ppcLinux.mk pdefs-x86_64Linux.mk 
Log Message:
Change LIB to LIBEXT in makefiles to avoid collision with LIB environment
variable set by MSVC on the MS Windows platform.


Index: pdefs-i386FreeBSD.mk
===================================================================
RCS file: /cvsroot/aaf/AAF/build/pdefs-i386FreeBSD.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pdefs-i386FreeBSD.mk	23 Feb 2006 16:10:20 -0000	1.2
--- pdefs-i386FreeBSD.mk	13 Apr 2007 17:09:14 -0000	1.3
***************
*** 38,42 ****
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIB, DLL,
  #	UUIDLIB
  #
--- 38,42 ----
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIBEXT, DLL,
  #	UUIDLIB
  #
***************
*** 104,108 ****
  OBJ ?= .o
  EXE ?= 
! LIB ?= .a
  DLL ?= .so
  
--- 104,108 ----
  OBJ ?= .o
  EXE ?= 
! LIBEXT ?= .a
  DLL ?= .so
  

Index: common.mk
===================================================================
RCS file: /cvsroot/aaf/AAF/build/common.mk,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** common.mk	12 Apr 2007 17:11:42 -0000	1.17
--- common.mk	13 Apr 2007 17:09:14 -0000	1.18
***************
*** 58,63 ****
  
  # check for SchemaSoft implementation libSSRW2C.a
! ifeq ($(wildcard $(AAFBUILDDIR)/sss-impl/libSSRW2C$(LIB)),$(AAFBUILDDIR)/sss-impl/libSSRW2C$(LIB))
! 	STORAGE_LIBS += $(AAFBUILDDIR)/sss-impl/libSSRW2C$(LIB)
  	LINK_STG += -L$(AAFBUILDDIR)/sss-impl -lSSRW2C
  	ADD_CFLAGS += -DOM_USE_SCHEMASOFT_SS
--- 58,63 ----
  
  # check for SchemaSoft implementation libSSRW2C.a
! ifeq ($(wildcard $(AAFBUILDDIR)/sss-impl/libSSRW2C$(LIBEXT)),$(AAFBUILDDIR)/sss-impl/libSSRW2C$(LIBEXT))
! 	STORAGE_LIBS += $(AAFBUILDDIR)/sss-impl/libSSRW2C$(LIBEXT)
  	LINK_STG += -L$(AAFBUILDDIR)/sss-impl -lSSRW2C
  	ADD_CFLAGS += -DOM_USE_SCHEMASOFT_SS
***************
*** 66,71 ****
  
  # Check for Microsoft Structured Storage Reference Implementation
! ifeq ($(wildcard $(AAFBUILDDIR)/ss-impl/$(AAFTARGETDIR)/librefstg$(LIB)),$(AAFBUILDDIR)/ss-impl/$(AAFTARGETDIR)/librefstg$(LIB))
! 	STORAGE_LIBS += $(AAFBUILDDIR)/ss-impl/$(AAFTARGETDIR)/librefstg$(LIB)
  	LINK_STG += -L$(AAFBUILDDIR)/ss-impl/$(AAFTARGETDIR) -lrefstg
  	ADD_CFLAGS += -DOM_USE_REFERENCE_SS
--- 66,71 ----
  
  # Check for Microsoft Structured Storage Reference Implementation
! ifeq ($(wildcard $(AAFBUILDDIR)/ss-impl/$(AAFTARGETDIR)/librefstg$(LIBEXT)),$(AAFBUILDDIR)/ss-impl/$(AAFTARGETDIR)/librefstg$(LIBEXT))
! 	STORAGE_LIBS += $(AAFBUILDDIR)/ss-impl/$(AAFTARGETDIR)/librefstg$(LIBEXT)
  	LINK_STG += -L$(AAFBUILDDIR)/ss-impl/$(AAFTARGETDIR) -lrefstg
  	ADD_CFLAGS += -DOM_USE_REFERENCE_SS

Index: pdefs-i586Linux.mk
===================================================================
RCS file: /cvsroot/aaf/AAF/build/pdefs-i586Linux.mk,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pdefs-i586Linux.mk	23 Feb 2006 16:10:20 -0000	1.11
--- pdefs-i586Linux.mk	13 Apr 2007 17:09:14 -0000	1.12
***************
*** 38,42 ****
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIB, DLL,
  #	UUIDLIB
  #
--- 38,42 ----
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIBEXT, DLL,
  #	UUIDLIB
  #
***************
*** 134,138 ****
  OBJ ?= .o
  EXE ?= 
! LIB ?= .a
  DLL ?= .so
  
--- 134,138 ----
  OBJ ?= .o
  EXE ?= 
! LIBEXT ?= .a
  DLL ?= .so
  

Index: pdefs-ppcLinux.mk
===================================================================
RCS file: /cvsroot/aaf/AAF/build/pdefs-ppcLinux.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pdefs-ppcLinux.mk	8 Jun 2006 17:06:30 -0000	1.1
--- pdefs-ppcLinux.mk	13 Apr 2007 17:09:14 -0000	1.2
***************
*** 38,42 ****
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIB, DLL,
  #
  #------------------------------------------------------------------------------
--- 38,42 ----
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIBEXT, DLL,
  #
  #------------------------------------------------------------------------------

Index: pdefs-MipsIrix.mk
===================================================================
RCS file: /cvsroot/aaf/AAF/build/pdefs-MipsIrix.mk,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** pdefs-MipsIrix.mk	23 Feb 2006 16:10:20 -0000	1.12
--- pdefs-MipsIrix.mk	13 Apr 2007 17:09:14 -0000	1.13
***************
*** 38,42 ****
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIB, DLL,
  #	UUIDLIB
  #
--- 38,42 ----
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIBEXT, DLL,
  #	UUIDLIB
  #
***************
*** 137,141 ****
  OBJ ?= .o
  EXE ?= 
! LIB ?= .a
  DLL ?= .so
  
--- 137,141 ----
  OBJ ?= .o
  EXE ?= 
! LIBEXT ?= .a
  DLL ?= .so
  

Index: pdefs-PPCDarwin.mk
===================================================================
RCS file: /cvsroot/aaf/AAF/build/pdefs-PPCDarwin.mk,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** pdefs-PPCDarwin.mk	23 Feb 2006 16:10:20 -0000	1.8
--- pdefs-PPCDarwin.mk	13 Apr 2007 17:09:14 -0000	1.9
***************
*** 39,43 ****
  # Sets:
  #	COMPILER, PLATFORM_CFLAGS, RPATH_OPT,
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIB, DLL,
  #	UUIDLIB, PLATFORMLIBS
  #
--- 39,43 ----
  # Sets:
  #	COMPILER, PLATFORM_CFLAGS, RPATH_OPT,
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIBEXT, DLL,
  #	UUIDLIB, PLATFORMLIBS
  #
***************
*** 105,109 ****
  OBJ ?= .o
  EXE ?=
! LIB ?= .a
  DLL ?= .dylib
  
--- 105,109 ----
  OBJ ?= .o
  EXE ?=
! LIBEXT ?= .a
  DLL ?= .dylib
  

Index: pdefs-i686Linux.mk
===================================================================
RCS file: /cvsroot/aaf/AAF/build/pdefs-i686Linux.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pdefs-i686Linux.mk	23 Feb 2006 16:10:20 -0000	1.6
--- pdefs-i686Linux.mk	13 Apr 2007 17:09:14 -0000	1.7
***************
*** 38,42 ****
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIB, DLL,
  #
  #------------------------------------------------------------------------------
--- 38,42 ----
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIBEXT, DLL,
  #
  #------------------------------------------------------------------------------

Index: pdefs-SparcSolaris.mk
===================================================================
RCS file: /cvsroot/aaf/AAF/build/pdefs-SparcSolaris.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pdefs-SparcSolaris.mk	23 Feb 2006 16:10:20 -0000	1.5
--- pdefs-SparcSolaris.mk	13 Apr 2007 17:09:14 -0000	1.6
***************
*** 38,42 ****
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIB, DLL,
  #	UUIDLIB
  #
--- 38,42 ----
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIBEXT, DLL,
  #	UUIDLIB
  #
***************
*** 122,126 ****
  OBJ ?= .o
  EXE ?= 
! LIB ?= .a
  DLL ?= .so
  
--- 122,126 ----
  OBJ ?= .o
  EXE ?= 
! LIBEXT ?= .a
  DLL ?= .so
  

Index: pdefs-Win.mk
===================================================================
RCS file: /cvsroot/aaf/AAF/build/pdefs-Win.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pdefs-Win.mk	12 Apr 2007 12:47:40 -0000	1.5
--- pdefs-Win.mk	13 Apr 2007 17:09:14 -0000	1.6
***************
*** 39,43 ****
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIB, DLL,
  #	UUIDLIB
  #
--- 39,43 ----
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIBEXT, DLL,
  #	UUIDLIB
  #
***************
*** 103,107 ****
  OBJ ?= .o
  EXE ?= 
! LIB ?= .a
  DLL ?= .so
  
--- 103,107 ----
  OBJ ?= .o
  EXE ?= 
! LIBEXT ?= .a
  DLL ?= .so
  

Index: pdefs-x86_64Linux.mk
===================================================================
RCS file: /cvsroot/aaf/AAF/build/pdefs-x86_64Linux.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pdefs-x86_64Linux.mk	23 Feb 2006 16:10:20 -0000	1.4
--- pdefs-x86_64Linux.mk	13 Apr 2007 17:09:14 -0000	1.5
***************
*** 38,42 ****
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIB, DLL,
  #
  #------------------------------------------------------------------------------
--- 38,42 ----
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIBEXT, DLL,
  #
  #------------------------------------------------------------------------------

Index: pdefs-i386OpenBSD.mk
===================================================================
RCS file: /cvsroot/aaf/AAF/build/pdefs-i386OpenBSD.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pdefs-i386OpenBSD.mk	23 Feb 2006 16:10:20 -0000	1.2
--- pdefs-i386OpenBSD.mk	13 Apr 2007 17:09:14 -0000	1.3
***************
*** 38,42 ****
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIB, DLL,
  #	UUIDLIB
  #
--- 38,42 ----
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIBEXT, DLL,
  #	UUIDLIB
  #

Index: pdefs-ppc64Linux.mk
===================================================================
RCS file: /cvsroot/aaf/AAF/build/pdefs-ppc64Linux.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pdefs-ppc64Linux.mk	23 Feb 2006 16:10:20 -0000	1.3
--- pdefs-ppc64Linux.mk	13 Apr 2007 17:09:14 -0000	1.4
***************
*** 38,42 ****
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIB, DLL,
  #
  #------------------------------------------------------------------------------
--- 38,42 ----
  # Sets:
  #	MIPS_ABI, COMPILER, PLATFORM_CFLAGS, RPATH_OPT, 
! #	LD, LD_STAT_LIB, LD_DYN_LIB, U_OPTS, OBJ, EXE, LIBEXT, DLL,
  #
  #------------------------------------------------------------------------------
***************
*** 137,141 ****
  OBJ ?= .o
  EXE ?= 
! LIB ?= .a
  DLL ?= .so
  
--- 137,141 ----
  OBJ ?= .o
  EXE ?= 
! LIBEXT ?= .a
  DLL ?= .so