[Panorama-CVS] panorama Makefile-executable.inc,1.1.2.1,1.1.2.2

[Kevin H. <kph...@us...>]

Update of /cvsroot/panorama/panorama
In directory vz-cvs-3.sog:/tmp/cvs-serv1503

Modified Files:
      Tag: panorama_0_19
	Makefile-executable.inc 
Log Message:
Updating from blocxx.

Index: Makefile-executable.inc
===================================================================
RCS file: /cvsroot/panorama/panorama/Attic/Makefile-executable.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Makefile-executable.inc	22 Feb 2009 10:09:56 -0000	1.1.2.1
--- Makefile-executable.inc	6 Nov 2011 03:43:33 -0000	1.1.2.2
***************
*** 25,43 ****
  define EXECUTABLE_FLAG_TEMPLATE
  
! # Define <foo>_LDFLAGS in terms of the predefined values and any PROJECT_LIBS
! # requested.
  define $(1)_LDFLAGS
! -o $(1)$$(EXEEXT)  $$(CXXBINLINKFLAGS_START)  $$($(1)_PROJECT_LIBS)  $$(COMMON_LDFLAGS)
  endef
  
! # Define <foo>_LDADD in terms of any EXTERNAL_LIBS and any systemwide
! # predefined append flags
  define $(1)_LDADD
! $$($(1)_EXTERNAL_LIBS) $$(BINLINKAPPENDFLAGS)
  endef
  
! # Define <foo>_DEPENCIES to be *.a files listed in _EXTERNAL_LIBS
  define $(1)_DEPENDENCIES
! $$(filter %.a,$$($(1)_EXTERNAL_LIBS))
  endef
  
--- 25,45 ----
  define EXECUTABLE_FLAG_TEMPLATE
  
! # Define <foo>_LDFLAGS in terms of the predefined values requested.  The
! # resulting LDFLAGS are applied *before* any object files listed on a link line
! # and so should not contain any library references.
  define $(1)_LDFLAGS
! -o $(1)$$(EXEEXT) $$(CXXBINLINKFLAGS_START) $$(COMMON_LDFLAGS)
  endef
  
! # Define <foo>_LDADD in terms of any PROJECT_LIBS, EXTERNAL_LIBS and any
! # systemwide predefined append flags
  define $(1)_LDADD
! $$($(1)_PROJECT_LIBS) $$($(1)_EXTERNAL_LIBS) $$(BINLINKAPPENDFLAGS)
  endef
  
! # Define <foo>_DEPENCIES to be *.a files listed in _EXTERNAL_LIBS and the
! # objects generated for the target.
  define $(1)_DEPENDENCIES
! $$(filter %.a,$$($(1)_EXTERNAL_LIBS)) $$($(1)_OBJECTS)
  endef
  
***************
*** 51,54 ****
--- 53,59 ----
  	@echo '$(1)_PROJECT_LIBS=$$($(1)_PROJECT_LIBS:@=$(1))'
  	@echo '$(1)_SOURCES=$$($(1)_SOURCES:@=$(1))'
+ 	@echo '$(1)_LINK=$$($(1)_LINK:@=$(1))'
+ 	@echo '$(1)_OBJECTS=$$($(1)_OBJECTS:@=$(1))'
+ 	@echo 'LIBS=$(LIBS)'
  
  endef # end of EXECUTABLE_FLAG_TEMPLATE