Changeset 14393 for release/1.6


Ignore:
Timestamp:
Nov 1, 2010, 6:57:33 PM (9 years ago)
Author:
rme
Message:

Merge makefile changes involving SVN_REVISION from trunk.

Location:
release/1.6/source
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • release/1.6/source

  • release/1.6/source/lisp-kernel/darwinppc/Makefile

    r14197 r14393  
    1414#   http://opensource.franz.com/preamble.html
    1515
     16SVN_REVISION=$(shell svnversion || echo "unknown")
     17
    1618MDYNAMIC_NO_PIC = $(shell ($(CC) --help -v 2>&1 | grep -q -e "-mdynamic-no-pic") && /bin/echo "-mdynamic-no-pic")
    1719
     
    2426M4FLAGS = -DDARWIN -DPPC
    2527ASFLAGS = -arch ppc -force_cpusubtype_ALL
    26 CDEFINES = -DDARWIN -DPPC #-DDEBUG -DGC_INTEGRITY_CHECKING
     28CDEFINES = -DDARWIN -DPPC -DSVN_REVISION=$(SVN_REVISION) #-DDEBUG -DGC_INTEGRITY_CHECKING
    2729CDEBUG = -g
    2830COPT = -O2
  • release/1.6/source/lisp-kernel/darwinppc64/Makefile

    r14197 r14393  
    1414#   http://opensource.franz.com/preamble.html
    1515
     16SVN_REVISION=$(shell svnversion || echo "unknown")
    1617
    1718MDYNAMIC_NO_PIC = $(shell ($(CC) --help -v 2>&1 | grep -q -e "-mdynamic-no-pic") && /bin/echo "-mdynamic-no-pic")
     
    3132M4FLAGS = -DDARWIN -DPPC -DPPC64
    3233ASFLAGS = -arch ppc64
    33 CDEFINES = -DDARWIN -DPPC -DPPC64
     34CDEFINES = -DDARWIN -DPPC -DPPC64 -DSVN_REVISION=$(SVN_REVISION)
    3435CDEBUG = -g
    3536COPT = -O2
  • release/1.6/source/lisp-kernel/freebsdx8632/Makefile

    r14197 r14393  
    1414#   http://opensource.franz.com/preamble.html
    1515
     16SVN_REVISION=$(shell svnversion || echo "unknown")
    1617
    1718VPATH = ..
     
    2122ASFLAGS = --32
    2223M4FLAGS = -DFREEBSD -DX86 -DX8632 -DHAVE_TLS
    23 CDEFINES = -DFREEBSD -D_REENTRANT -DX86 -DX8632 -D_GNU_SOURCE -DHAVE_TLS
     24CDEFINES = -DFREEBSD -D_REENTRANT -DX86 -DX8632 -D_GNU_SOURCE -DHAVE_TLS -DSVN_REVISION=$(SVN_REVISION)
    2425CDEBUG = -g
    2526COPT = -O2
  • release/1.6/source/lisp-kernel/freebsdx8664/Makefile

    r14197 r14393  
    1414#   http://opensource.franz.com/preamble.html
    1515
     16SVN_REVISION=$(shell svnversion || echo "unknown")
    1617
    1718VPATH = ..
     
    2122ASFLAGS = --64
    2223M4FLAGS = -DFREEBSD -DX86 -DX8664 -DHAVE_TLS
    23 CDEFINES = -DFREEBSD -D_REENTRANT -DX86 -DX8664 -D_GNU_SOURCE -DHAVE_TLS
     24CDEFINES = -DFREEBSD -D_REENTRANT -DX86 -DX8664 -D_GNU_SOURCE -DHAVE_TLS -DSVN_REVISION=$(SVN_REVISION)
    2425CDEBUG = -g
    2526COPT = #-O2
  • release/1.6/source/lisp-kernel/linuxarm/Makefile

    r14201 r14393  
    1414#   http://opensource.franz.com/preamble.html
    1515
     16SVN_REVISION=$(shell svnversion || echo "unknown")
    1617
    1718VPATH = ../
     
    2324ASFLAGS = -mfpu=vfpv2
    2425M4FLAGS = -DLINUX -DARM
    25 CDEFINES = -DLINUX -DARM -D_REENTRANT -D_GNU_SOURCE -DUSE_FUTEX
     26CDEFINES = -DLINUX -DARM -D_REENTRANT -D_GNU_SOURCE -DUSE_FUTEX -DSVN_REVISION=$(SVN_REVISION)
    2627CDEBUG = -g
    2728COPT = -O2
  • release/1.6/source/lisp-kernel/linuxppc/Makefile

    r14197 r14393  
    1414#   http://opensource.franz.com/preamble.html
    1515
     16SVN_REVISION=$(shell svnversion || echo "unknown")
    1617
    1718VPATH = ../
     
    2324ASFLAGS = -mregnames -mppc32 -maltivec
    2425M4FLAGS = -DLINUX -DPPC
    25 CDEFINES = -DLINUX -DPPC -D_REENTRANT -D_GNU_SOURCE
     26CDEFINES = -DLINUX -DPPC -D_REENTRANT -D_GNU_SOURCE -DSVN_REVISION=$(SVN_REVISION)
    2627CDEBUG = -g
    2728COPT = -O2
  • release/1.6/source/lisp-kernel/linuxppc64/Makefile

    r14197 r14393  
    1414#   http://opensource.franz.com/preamble.html
    1515
     16SVN_REVISION=$(shell svnversion || echo "unknown")
    1617
    1718VPATH = ../
     
    2324ASFLAGS = -mregnames -mppc64 -a64 -maltivec
    2425M4FLAGS = -DLINUX -DPPC -DPPC64
    25 CDEFINES = -DLINUX -D_REENTRANT -DPPC -DPPC64 -D_GNU_SOURCE
     26CDEFINES = -DLINUX -D_REENTRANT -DPPC -DPPC64 -D_GNU_SOURCE -DSVN_REVISION=$(SVN_REVISION)
    2627CDEBUG = -g
    2728COPT = -O2
  • release/1.6/source/lisp-kernel/solarisx64/Makefile

    r14197 r14393  
    1414#   http://opensource.franz.com/preamble.html
    1515
     16SVN_REVISION=$(shell svnversion || echo "unknown")
    1617
    1718VPATH = ..
     
    2627ASFLAGS = --64 --divide
    2728M4FLAGS = -DSOLARIS -DX86 -DX8664
    28 CDEFINES = -DSOLARIS -D_REENTRANT -DX86 -DX8664 -D__EXTENSIONS__ -DHAVE_TLS #-DDISABLE_EGC
     29CDEFINES = -DSOLARIS -D_REENTRANT -DX86 -DX8664 -D__EXTENSIONS__ -DHAVE_TLS -DSVN_REVISION=$(SVN_REVISION) #-DDISABLE_EGC
    2930CDEBUG = -g
    3031COPT = #-O2
  • release/1.6/source/lisp-kernel/solarisx86/Makefile

    r14197 r14393  
    1414#   http://opensource.franz.com/preamble.html
    1515
     16SVN_REVISION=$(shell svnversion || echo "unknown")
    1617
    1718VPATH = ..
     
    2627ASFLAGS = --32 --divide
    2728M4FLAGS = -DSOLARIS -DX86 -DX8632
    28 CDEFINES = -DSOLARIS -D_REENTRANT -DX86 -DX8632 -D__EXTENSIONS__ -DHAVE_TLS #-DDISABLE_EGC
     29CDEFINES = -DSOLARIS -D_REENTRANT -DX86 -DX8632 -D__EXTENSIONS__ -DHAVE_TLS -DSVN_REVISION=$(SVN_REVISION) #-DDISABLE_EGC
    2930CDEBUG = -g
    3031COPT = -O2
  • release/1.6/source/lisp-kernel/win32/Makefile

    r14197 r14393  
    1414#   http://opensource.franz.com/preamble.html
    1515
     16SVN_REVISION=$(shell svnversion || echo "unknown")
    1617
    1718VPATH = ../
     
    2324ASFLAGS = -g --32
    2425M4FLAGS = -DWIN_32 -DWINDOWS -DX86 -DX8632 -DWIN32_ES_HACK
    25 CDEFINES = -DWIN_32 -DWINDOWS -D_REENTRANT -DX86 -DX8632 -D_GNU_SOURCE  -D__MSVCRT__ -D__MSVCRT_VERSION__=0x700 -D_WIN32_WINNT=0x0502 -DWIN32_ES_HACK
     26CDEFINES = -DWIN_32 -DWINDOWS -D_REENTRANT -DX86 -DX8632 -D_GNU_SOURCE  -D__MSVCRT__ -D__MSVCRT_VERSION__=0x700 -D_WIN32_WINNT=0x0502 -DWIN32_ES_HACK -DSVN_REVISION=$(SVN_REVISION)
    2627CDEBUG = -g
    2728COPT = -O2
  • release/1.6/source/lisp-kernel/win64/Makefile

    r14197 r14393  
    1414#   http://opensource.franz.com/preamble.html
    1515
     16SVN_REVISION=$(shell svnversion || echo "unknown")
    1617
    1718VPATH = ../
     
    2526ASFLAGS = -g --64
    2627M4FLAGS = -DWIN_64 -DWINDOWS -DX86 -DX8664 -DHAVE_TLS -DEMUTLS -DTCR_IN_GPR
    27 CDEFINES = -DWIN_64 -DWINDOWS -D_REENTRANT -DX86 -DX8664 -D_GNU_SOURCE -DHAVE_TLS -DEMUTLS -DTCR_IN_GPR
     28CDEFINES = -DWIN_64 -DWINDOWS -D_REENTRANT -DX86 -DX8664 -D_GNU_SOURCE -DHAVE_TLS -DEMUTLS -DTCR_IN_GPR -DSVN_REVISION=$(SVN_REVISION)
    2829CDEBUG = -g
    2930COPT = -O2
Note: See TracChangeset for help on using the changeset viewer.