[aaf-commits] AAF unixaafsdk.mak,1.17,1.18

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

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

Modified Files:
	unixaafsdk.mak 
Log Message:
Refactor all makefiles to enable make driven MSVC++ build.
 - All "make check" tests can now be run under MS Windows
 - $(LINK_AAF_APP) is now used in makefiles to link all AAF client
   applications (tests & examples), simplifying makefiles
 - The Debug-static conditionals have been cleaned out of makefiles and
   replaced by a single conditional in build/common.mk
 - $(APP_RUN_ENV) replaces the previous setting of LD_LIBRARY_PATH in
   makefiles for setting up the environment to run tests


Index: unixaafsdk.mak
===================================================================
RCS file: /cvsroot/aaf/AAF/unixaafsdk.mak,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** unixaafsdk.mak	13 Apr 2007 17:09:13 -0000	1.17
--- unixaafsdk.mak	15 May 2007 17:47:16 -0000	1.18
***************
*** 296,300 ****
  endif
  
! 
  
  #
--- 296,310 ----
  endif
  
! #
! # The names of the dynamic libraries vary for historical reasons
! #
! DYN_LIB_COMAPI=libcom-api
! DYN_LIB_AAFINTP=libaafintp
! DYN_LIB_AAFPGAPI=libaafpgapi
! ifeq ($(AAFPLATFORM),Win)
!     DYN_LIB_COMAPI=AAFCOAPI
!     DYN_LIB_AAFINTP=AAFINTP
!     DYN_LIB_AAFPGAPI=AAFPGAPI
! endif
  
  #
***************
*** 302,308 ****
  #
  RELEASE_DLL_FILES = \
! 	$(AAFSDK_BIN)/libcom-api$(DLL) \
! 	$(AAFSDK_BIN_EXT)/libaafintp$(DLL) \
! 	$(AAFSDK_BIN_EXT)/libaafpgapi$(DLL)
  
  #
--- 312,318 ----
  #
  RELEASE_DLL_FILES = \
! 	$(AAFSDK_BIN)/$(DYN_LIB_COMAPI)$(DLL) \
! 	$(AAFSDK_BIN_EXT)/$(DYN_LIB_AAFINTP)$(DLL) \
! 	$(AAFSDK_BIN_EXT)/$(DYN_LIB_AAFPGAPI)$(DLL)
  
  #
***************
*** 310,316 ****
  #
  DEBUG_DLL_FILES = \
! 	$(AAFSDK_BIN_DEBUG)/libcom-api$(DLL) \
! 	$(AAFSDK_BIN_DEBUG_EXT)/libaafintp$(DLL) \
! 	$(AAFSDK_BIN_DEBUG_EXT)/libaafpgapi$(DLL)
  
  
--- 320,326 ----
  #
  DEBUG_DLL_FILES = \
! 	$(AAFSDK_BIN_DEBUG)/$(DYN_LIB_COMAPI)$(DLL) \
! 	$(AAFSDK_BIN_DEBUG_EXT)/$(DYN_LIB_AAFINTP)$(DLL) \
! 	$(AAFSDK_BIN_DEBUG_EXT)/$(DYN_LIB_AAFPGAPI)$(DLL)
  
  
***************
*** 597,620 ****
  # Dependency and build rules for the Release DLL targets.
  #
! $(AAFSDK_BIN)/libcom-api$(DLL) : $(TOOLKIT_COMAPI_RELEASE)/libcom-api$(DLL)
! 	$(CP) $(CP_OPTS) $(TOOLKIT_COMAPI_RELEASE)/libcom-api$(DLL) $@
  
! $(AAFSDK_BIN_EXT)/libaafintp$(DLL) : $(TOOLKIT_REFIMPL_RELEASE_EXT)/libaafintp$(DLL)
! 	$(CP) $(CP_OPTS) $(TOOLKIT_REFIMPL_RELEASE_EXT)/libaafintp$(DLL) $@
  
! $(AAFSDK_BIN_EXT)/libaafpgapi$(DLL) : $(TOOLKIT_REFIMPL_RELEASE_EXT)/libaafpgapi$(DLL)
! 	$(CP) $(CP_OPTS) $(TOOLKIT_REFIMPL_RELEASE_EXT)/libaafpgapi$(DLL) $@
  
  #
  # Dependency and build rules for the Debug DLL targets.
  #
! $(AAFSDK_BIN_DEBUG)/libcom-api$(DLL) : $(TOOLKIT_COMAPI_DEBUG)/libcom-api$(DLL)
! 	$(CP) $(CP_OPTS) $(TOOLKIT_COMAPI_DEBUG)/libcom-api$(DLL) $@
  
! $(AAFSDK_BIN_DEBUG_EXT)/libaafintp$(DLL) : $(TOOLKIT_REFIMPL_DEBUG_EXT)/libaafintp$(DLL)
! 	$(CP) $(CP_OPTS) $(TOOLKIT_REFIMPL_DEBUG_EXT)/libaafintp$(DLL) $@
  
! $(AAFSDK_BIN_DEBUG_EXT)/libaafpgapi$(DLL) : $(TOOLKIT_REFIMPL_DEBUG_EXT)/libaafpgapi$(DLL)
! 	$(CP) $(CP_OPTS) $(TOOLKIT_REFIMPL_DEBUG_EXT)/libaafpgapi$(DLL) $@
  
  #
--- 607,630 ----
  # Dependency and build rules for the Release DLL targets.
  #
! $(AAFSDK_BIN)/$(DYN_LIB_COMAPI)$(DLL) : $(TOOLKIT_COMAPI_RELEASE)/$(DYN_LIB_COMAPI)$(DLL)
! 	$(CP) $(CP_OPTS) $(TOOLKIT_COMAPI_RELEASE)/$(DYN_LIB_COMAPI)$(DLL) $@
  
! $(AAFSDK_BIN_EXT)/$(DYN_LIB_AAFINTP)$(DLL) : $(TOOLKIT_REFIMPL_RELEASE_EXT)/$(DYN_LIB_AAFINTP)$(DLL)
! 	$(CP) $(CP_OPTS) $(TOOLKIT_REFIMPL_RELEASE_EXT)/$(DYN_LIB_AAFINTP)$(DLL) $@
  
! $(AAFSDK_BIN_EXT)/$(DYN_LIB_AAFPGAPI)$(DLL) : $(TOOLKIT_REFIMPL_RELEASE_EXT)/$(DYN_LIB_AAFPGAPI)$(DLL)
! 	$(CP) $(CP_OPTS) $(TOOLKIT_REFIMPL_RELEASE_EXT)/$(DYN_LIB_AAFPGAPI)$(DLL) $@
  
  #
  # Dependency and build rules for the Debug DLL targets.
  #
! $(AAFSDK_BIN_DEBUG)/$(DYN_LIB_COMAPI)$(DLL) : $(TOOLKIT_COMAPI_DEBUG)/$(DYN_LIB_COMAPI)$(DLL)
! 	$(CP) $(CP_OPTS) $(TOOLKIT_COMAPI_DEBUG)/$(DYN_LIB_COMAPI)$(DLL) $@
  
! $(AAFSDK_BIN_DEBUG_EXT)/$(DYN_LIB_AAFINTP)$(DLL) : $(TOOLKIT_REFIMPL_DEBUG_EXT)/$(DYN_LIB_AAFINTP)$(DLL)
! 	$(CP) $(CP_OPTS) $(TOOLKIT_REFIMPL_DEBUG_EXT)/$(DYN_LIB_AAFINTP)$(DLL) $@
  
! $(AAFSDK_BIN_DEBUG_EXT)/$(DYN_LIB_AAFPGAPI)$(DLL) : $(TOOLKIT_REFIMPL_DEBUG_EXT)/$(DYN_LIB_AAFPGAPI)$(DLL)
! 	$(CP) $(CP_OPTS) $(TOOLKIT_REFIMPL_DEBUG_EXT)/$(DYN_LIB_AAFPGAPI)$(DLL) $@
  
  #