[aaf-commits] AAF/test/com/MultiGenTest GNUmakefile,1.10,1.11

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

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

Modified Files:
	GNUmakefile 
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: GNUmakefile
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/MultiGenTest/GNUmakefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** GNUmakefile	23 Mar 2006 17:52:36 -0000	1.10
--- GNUmakefile	15 May 2007 17:47:20 -0000	1.11
***************
*** 50,71 ****
  
  .PHONY : all
! #all : $(OBJDIR) $(AAFSDKBINDIR)/MultiGenTest$(EXE)
! all : $(AAFSDKBINDIR)/MultiGenTest$(EXE)
! 
  
- # $(AAFSDKBINDIR)/MultiGenTest$(EXE) : $(CXXOBJS) MultiGenTests
- ifeq ($(AAFTARGET),Debug-static)
- $(AAFSDKBINDIR)/MultiGenTest$(EXE) : $(CXXOBJS) $(CXXOBJS2)
- 	$(LD) $(CXXOBJS) $(CXXOBJS2) $(STATIC_LINK_LINE) -o $@
- else
  $(AAFSDKBINDIR)/MultiGenTest$(EXE) : $(CXXOBJS) $(CXXOBJS2)
! 	$(LD) $(CXXOBJS) $(CXXOBJS2) \
! 	-L$(AAFSDKLIBDIR) -laaflib -laafiid $(PLATFORMLIBS) $(LIBCIO) -o $@
! endif
  
  
! #.PHONY : MultiGenTests
! #MultiGenTests :
! $(CXXOBJS2):
  	@echo "\nBuilding MultiGenTests\n"
  	cd MultiGenTests && $(MAKE)
--- 50,61 ----
  
  .PHONY : all
! all : MultiGenTests $(AAFSDKBINDIR)/MultiGenTest$(EXE)
  
  $(AAFSDKBINDIR)/MultiGenTest$(EXE) : $(CXXOBJS) $(CXXOBJS2)
! 	$(LD) $(CXXOBJS) $(CXXOBJS2) $(LINK_AAF_APP)
  
  
! .PHONY : MultiGenTests
! MultiGenTests :
  	@echo "\nBuilding MultiGenTests\n"
  	cd MultiGenTests && $(MAKE)
***************
*** 91,102 ****
  # MultiGenTest is in good working order.
  TEST_LIB_NAME = libcom-api.so
! ifeq ($(AAFPLATFORM),PPCDarwin)
! TEST_LIB_NAME = libcom-api.dylib
! endif
! ifeq ($(AAFPLATFORM),i386Darwin)
! TEST_LIB_NAME = libcom-api.dylib
! endif
! ifeq ($(AAFPLATFORM),UniversalDarwin)
! TEST_LIB_NAME = libcom-api.dylib
  endif
  
--- 81,86 ----
  # MultiGenTest is in good working order.
  TEST_LIB_NAME = libcom-api.so
! ifneq (,$(findstring Darwin,$(AAFPLATFORM)))
!   TEST_LIB_NAME = libcom-api.dylib
  endif
  
***************
*** 104,109 ****
  check : $(AAFSDKBINDIR)/MultiGenTest$(EXE)
  	rm -f basic.aaf
! 	env LD_LIBRARY_PATH=$(AAFSDKBINDIR):$(LD_LIBRARY_PATH) $(AAFSDKBINDIR)/MultiGenTest$(EXE) -r LoadLib $(TEST_LIB_NAME) -r FileOp write S4KBinary basic.aaf -r AddMasterMobs A B -r FileOp save_and_close -r UnloadLib || exit 1
! 	env LD_LIBRARY_PATH=$(AAFSDKBINDIR):$(LD_LIBRARY_PATH) $(AAFSDKBINDIR)/MultiGenTest$(EXE) -r LoadLib $(TEST_LIB_NAME) -r FileOp read S4KBinary basic.aaf -r FindMasterMobsExclusive A B -r FileOp close -r UnloadLib || exit 1
  
  
--- 88,93 ----
  check : $(AAFSDKBINDIR)/MultiGenTest$(EXE)
  	rm -f basic.aaf
! 	$(APP_RUN_ENV) $(AAFSDKBINDIR)/MultiGenTest$(EXE) -r LoadLib $(TEST_LIB_NAME) -r FileOp write S4KBinary basic.aaf -r AddMasterMobs A B -r FileOp save_and_close -r UnloadLib || exit 1
! 	$(APP_RUN_ENV) $(AAFSDKBINDIR)/MultiGenTest$(EXE) -r LoadLib $(TEST_LIB_NAME) -r FileOp read S4KBinary basic.aaf -r FindMasterMobsExclusive A B -r FileOp close -r UnloadLib || exit 1