Change the way the version strings are handled.

This commit is contained in:
David E. O'Brien 2002-01-27 22:47:22 +00:00
parent 418b22b96f
commit a1a1118a96
7 changed files with 12 additions and 9 deletions

View File

@ -4,10 +4,11 @@
# use the normal "Makefile.inc" mechanism, because we need some of these # use the normal "Makefile.inc" mechanism, because we need some of these
# definitions before the sub-Makefile is processed. # definitions before the sub-Makefile is processed.
VERSION= "2.12.0 pre-release snap 20020127 [FreeBSD]" VERSION= "2.12.0 pre-release snap [FreeBSD] 20020127"
VERSION_DATE= 20020127
TARGET_ARCH?= ${MACHINE_ARCH} TARGET_ARCH?= ${MACHINE_ARCH}
BINUTIL_ARCH= ${TARGET_ARCH} BINUTIL_ARCH= ${TARGET_ARCH}
# RELTOP is the relative path to this point in the source or object # RELTOP is the relative path to this point in the source or object
# tree, from any subdirectory of same. It gets extra "../" prefixes # tree, from any subdirectory of same. It gets extra "../" prefixes

View File

@ -14,7 +14,8 @@ SRCS+= app.c as.c atof-generic.c atof-ieee.c bignum-copy.c \
output-file.c read.c sb.c stabs.c \ output-file.c read.c sb.c stabs.c \
subsegs.c symbols.c write.c depend.c ehopt.c subsegs.c symbols.c write.c depend.c ehopt.c
CFLAGS+= -I${SRCDIR}/gas -I${SRCDIR}/gas/config -I${SRCDIR} -I${.CURDIR}/.. CFLAGS+= -I${SRCDIR}/gas -I${SRCDIR}/gas/config -I${SRCDIR} -I${.CURDIR}/..
CFLAGS+= -DVERSION=\"${VERSION}\" -DBFD_VERSION=\"${VERSION}\" CFLAGS+= -DVERSION=\"${VERSION:C/[ ]?${VERSION_DATE}[ ]?//g}\"
CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
NOSHARED?= yes NOSHARED?= yes
DPADD= ${RELTOP}/libbfd/libbfd.a DPADD= ${RELTOP}/libbfd/libbfd.a
DPADD+= ${RELTOP}/libiberty/libiberty.a DPADD+= ${RELTOP}/libiberty/libiberty.a

View File

@ -19,7 +19,7 @@ elf-hints.h:
.endif .endif
CFLAGS+= -DSCRIPTDIR=\"${DESTDIR}/usr/libdata\" CFLAGS+= -DSCRIPTDIR=\"${DESTDIR}/usr/libdata\"
CFLAGS+= -DVERSION=\"${VERSION}\" -DBFD_VERSION=\"${VERSION}\" CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd
NOSHARED?= yes NOSHARED?= yes
DPADD= ${RELTOP}/libbfd/libbfd.a DPADD= ${RELTOP}/libbfd/libbfd.a

View File

@ -11,7 +11,8 @@ SRCS+= archive.c archures.c bfd.c binary.c cache.c \
section.c srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c \ section.c srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c \
targmatch.h dwarf1.c dwarf2.c config.h targmatch.h dwarf1.c dwarf2.c config.h
CFLAGS+= -I${SRCDIR}/bfd CFLAGS+= -I${SRCDIR}/bfd
CFLAGS+= -DBFD_VERSION=\"${VERSION}\" CFLAGS+= -DBFD_VERSION=\"${VERSION_DATE}\" -DBFD_VERSION_DATE=${VERSION_DATE}
CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
NOPROFILE= true NOPROFILE= true
NOPIC= true NOPIC= true
INTERNALLIB= true INTERNALLIB= true

View File

@ -53,8 +53,8 @@ extern "C" {
#endif #endif
/* #define BFD_VERSION 211930000 */ /* #define BFD_VERSION 211930000 */
#define BFD_VERSION_DATE 20020126 /* #define BFD_VERSION_DATE 20020126 */
#define BFD_VERSION_STRING "2.11.93 20020126" /* #define BFD_VERSION_STRING "2.11.93 20020126" */
/* The word size used by BFD on the host. This may be 64 with a 32 /* The word size used by BFD on the host. This may be 64 with a 32
bit target if the host is 64 bit, or if other 64 bit targets have bit target if the host is 64 bit, or if other 64 bit targets have

View File

@ -9,7 +9,7 @@ SRCS+= arlex.l arparse.y arsup.c bucomm.c debug.c filemode.c \
ieee.c rdcoff.c rddbg.c rename.c stabs.c unwind-ia64.c \ ieee.c rdcoff.c rddbg.c rename.c stabs.c unwind-ia64.c \
wrstabs.c version.c wrstabs.c version.c
CFLAGS+= -DTARGET=\"${TARGET_ARCH}-unknown-freebsd\" CFLAGS+= -DTARGET=\"${TARGET_ARCH}-unknown-freebsd\"
CFLAGS+= -DVERSION=\"${VERSION}\" CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/binutils
CFLAGS+= -I${SRCDIR}/bfd CFLAGS+= -I${SRCDIR}/bfd
NOPROFILE= true NOPROFILE= true

View File

@ -8,7 +8,7 @@ PROG= objdump
SRCS= objdump.c prdbg.c SRCS= objdump.c prdbg.c
CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/binutils
CFLAGS+= -DBFD_VERSION=\"${VERSION}\" CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
DPADD= ${RELTOP}/libbinutils/libbinutils.a DPADD= ${RELTOP}/libbinutils/libbinutils.a
DPADD+= ${RELTOP}/libopcodes/libopcodes.a DPADD+= ${RELTOP}/libopcodes/libopcodes.a
DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libbfd/libbfd.a