[aaf-commits] AAF/Utilities/aafviewer/src/aafmeta2dot GNUmakefile, 1.4, 1.5

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

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

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/Utilities/aafviewer/src/aafmeta2dot/GNUmakefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GNUmakefile	7 Mar 2005 16:55:59 -0000	1.4
--- GNUmakefile	15 May 2007 17:47:17 -0000	1.5
***************
*** 54,68 ****
  BINTARGET = $(AAFSDKBINDIR)/$(PROGNAME)$(EXE)
  
  .PHONY : all
  all : $(OBJDIR) $(BINTARGET)
  
- ifeq ($(AAFTARGET),Debug-static)
- $(BINTARGET) : $(CXXOBJS)
- 	$(LD) $(CXXOBJS) -L$(AXLIBDIR) -laxLib $(STATIC_LINK_LINE) -o $@
- else
  $(BINTARGET) : $(CXXOBJS)
! 	$(LD) $(CXXOBJS) $(RPATH_OPT) \
! 	-L$(AAFSDKLIBDIR) -L$(OBJDIR) -L$(AXLIBDIR) -laxLib -laaflib -laafiid $(LIBCIO) -o $@
! endif
  
  .PHONY : clean
--- 54,67 ----
  BINTARGET = $(AAFSDKBINDIR)/$(PROGNAME)$(EXE)
  
+ LINK_AXLIB_APP = -L$(AXLIBDIR) -laxLib
+ ifeq ($(COMPILER),cl)
+   LINK_AXLIB_APP = $(AXLIBDIR)/libaxLib$(LIBEXT)
+ endif
+ 
  .PHONY : all
  all : $(OBJDIR) $(BINTARGET)
  
  $(BINTARGET) : $(CXXOBJS)
! 	$(LD) $(CXXOBJS) $(LINK_AXLIB_APP) $(LINK_AAF_APP)
  
  .PHONY : clean
***************
*** 79,81 ****
  
  include $(AAFBASE)/build/rules.mk
- 
--- 78,79 ----