(file) Return to program.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/program.mak between version 1.29 and 1.32

version 1.29, 2006/01/30 16:16:23 version 1.32, 2006/11/14 21:34:42
Line 37 
Line 37 
 endif endif
  
 include $(ROOT)/mak/common.mak include $(ROOT)/mak/common.mak
   ifdef PEGASUS_EXTRA_PROGRAM_LINK_FLAGS
       EXTRA_LINK_FLAGS += $(PEGASUS_EXTRA_PROGRAM_LINK_FLAGS)
   endif
  
 ifeq ($(OS_TYPE),windows) ifeq ($(OS_TYPE),windows)
 include $(ROOT)/mak/program-windows.mak include $(ROOT)/mak/program-windows.mak
 endif endif
 ifeq ($(OS_TYPE),unix) ifeq ($(OS_TYPE),unix)
 include $(ROOT)/mak/program-unix.mak include $(ROOT)/mak/program-unix.mak
   # GCC supports the -fPIE switch in version 3.4 or later
    ifeq ($(OS),linux)
      ifeq ($(shell expr $(GCC_VERSION) '>=' 3.4), 1)
         FLAGS := $(FLAGS:-fPIC=-fPIE)
      endif
 endif endif
 ifeq ($(OS_TYPE),nsk)  
 include $(ROOT)/mak/program-nsk.mak  
 endif endif
 ifeq ($(OS_TYPE),vms) ifeq ($(OS_TYPE),vms)
  include $(ROOT)/mak/program-vms.mak  include $(ROOT)/mak/program-vms.mak


Legend:
Removed from v.1.29  
changed lines
  Added in v.1.32

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2