From: Stuart C. <stu...@us...> - 2007-05-15 17:47:21
|
Update of /cvsroot/aaf/AAF/test/com/MetaModelVerification In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv20530/test/com/MetaModelVerification 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/MetaModelVerification/GNUmakefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GNUmakefile 12 Apr 2006 15:14:56 -0000 1.1 --- GNUmakefile 15 May 2007 17:47:20 -0000 1.2 *************** *** 39,55 **** all : $(OBJDIR) $(AAFSDKBINDIR)/MetaModelVerification$(EXE) - - ifeq ($(AAFTARGET),Debug-static) - $(AAFSDKBINDIR)/MetaModelVerification$(EXE) : $(CXXOBJS) - $(LD) $(CXXOBJS) $(STATIC_LINK_LINE) -o $@ - else $(AAFSDKBINDIR)/MetaModelVerification$(EXE) : $(CXXOBJS) ! $(LD) $(CXXOBJS) -L$(AAFSDKLIBDIR) -laaflib -laafiid $(PLATFORMLIBS) $(LIBCIO) -o $@ ! endif .PHONY : check check : $(AAFSDKBINDIR)/MetaModelVerification$(EXE) ! env LD_LIBRARY_PATH=$(AAFSDKBINDIR):$(LD_LIBRARY_PATH) $(AAFSDKBINDIR)/MetaModelVerification$(EXE) --- 39,49 ---- all : $(OBJDIR) $(AAFSDKBINDIR)/MetaModelVerification$(EXE) $(AAFSDKBINDIR)/MetaModelVerification$(EXE) : $(CXXOBJS) ! $(LD) $(CXXOBJS) $(LINK_AAF_APP) .PHONY : check check : $(AAFSDKBINDIR)/MetaModelVerification$(EXE) ! $(APP_RUN_ENV) $(AAFSDKBINDIR)/MetaModelVerification$(EXE) |