d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use SRCTOP/OBJTOP and simplify output using :H instead of "../" for directory

Browse Source 
entries

This simplifies pathing in make/displayed output

MFC after:	1 week
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Enji Cooper 2017-02-11 20:12:54 +00:00
parent ae9dddfc09
commit a2cddb3b25
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/usr.bin/gdb/Makefile.inc
View File

@ -5,19 +5,17 @@ VENDOR= marcel
PACKAGE= gdb PACKAGE= gdb
BMAKE_GDB= ${.CURDIR}/.. BMAKE_GDB= ${.CURDIR:H}
BMAKE_ROOT= ${BMAKE_GDB}/.. BMAKE_ROOT= ${BMAKE_GDB:H}
BMAKE_BU= ${BMAKE_ROOT}/binutils BMAKE_BU= ${BMAKE_ROOT}/binutils
CNTRB_ROOT= ${BMAKE_ROOT}/../../contrib CNTRB_BU= ${SRCTOP}/contrib/binutils
CNTRB_BU= ${CNTRB_ROOT}/binutils CNTRB_GDB= ${SRCTOP}/contrib/gdb
CNTRB_GDB= ${CNTRB_ROOT}/gdb CNTRB_RL= ${SRCTOP}/contrib/libreadline
CNTRB_RL= ${CNTRB_ROOT}/libreadline
OBJ_ROOT= ${.OBJDIR}/../.. OBJ_BU= ${OBJTOP}/gnu/usr.bin/binutils
OBJ_BU= ${OBJ_ROOT}/binutils OBJ_GDB= ${OBJTOP}/gnu/usr.bin/gdb
OBJ_GDB= ${OBJ_ROOT}/gdb OBJ_RL= ${OBJTOP}/gnu/lib/libreadline/readline
OBJ_RL= ${OBJ_ROOT}/../lib/libreadline/readline
# These assignments duplicate much of the functionality of # These assignments duplicate much of the functionality of
# MACHINE_CPUARCH, but there's no easy way to export make functions... # MACHINE_CPUARCH, but there's no easy way to export make functions...
@ -47,12 +45,12 @@ CFLAGS+= -I${CNTRB_GDB}/gdb/config
CFLAGS+= -I${CNTRB_BU}/include CFLAGS+= -I${CNTRB_BU}/include
CFLAGS+= -I${CNTRB_GDB}/include CFLAGS+= -I${CNTRB_GDB}/include
CFLAGS+= -I${CNTRB_BU}/bfd CFLAGS+= -I${CNTRB_BU}/bfd
CFLAGS+= -I${OBJ_RL}/.. CFLAGS+= -I${OBJ_RL:H}
GENSRCS+= nm.h tm.h GENSRCS+= nm.h tm.h
.if defined(GDB_CROSS_DEBUGGER) .if defined(GDB_CROSS_DEBUGGER)
CFLAGS+= -DCROSS_DEBUGGER -I${BMAKE_ROOT}/../.. CFLAGS+= -DCROSS_DEBUGGER -I${BMAKE_ROOT:H:H}
GDB_SUFFIX= -${TARGET_ARCH} GDB_SUFFIX= -${TARGET_ARCH}
MAN= MAN=
.endif .endif