diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2016-08-29 22:47:53 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2016-08-29 22:47:53 +0000 |
| commit | a3d5eb2481e8d136300b107d93c282e63bf36969 (patch) | |
| tree | 30876f6503c9c80710c413e1113849993e9495c3 | |
| parent | bc32f05443db36ef071214bab172c71303beeda4 (diff) | |
| download | src-a3d5eb2481e8d136300b107d93c282e63bf36969.tar.gz src-a3d5eb2481e8d136300b107d93c282e63bf36969.zip | |
Minor Makefile simplifications for lib/atf/...
- Replace uses of `${.CURDIR:H:H:H}` with ${SRCTOP}
- Use built-in :H operator instead of ".." when enumerating paths.
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=305033
| -rw-r--r-- | lib/atf/libatf-c++/Makefile | 6 | ||||
| -rw-r--r-- | lib/atf/libatf-c/Makefile | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile index 13f3fe441ffd..7325e324a945 100644 --- a/lib/atf/libatf-c++/Makefile +++ b/lib/atf/libatf-c++/Makefile @@ -35,15 +35,15 @@ SHLIB_MAJOR= 2 # libatf-c++ depends on the C version of the ATF library to build. LIBADD+= atf_c -LDFLAGS+= -L${.OBJDIR}/../libatf-c +LDFLAGS+= -L${.OBJDIR:H}/libatf-c -ATF= ${.CURDIR:H:H:H}/contrib/atf +ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF} .PATH: ${ATF}/atf-c++ .PATH: ${ATF}/atf-c++/detail CFLAGS+= -I${ATF} -CFLAGS+= -I${.CURDIR}/../libatf-c +CFLAGS+= -I${.CURDIR:H}/libatf-c CFLAGS+= -I. CFLAGS+= -DHAVE_CONFIG_H diff --git a/lib/atf/libatf-c/Makefile b/lib/atf/libatf-c/Makefile index 0fbb4cad23b3..2476453749ec 100644 --- a/lib/atf/libatf-c/Makefile +++ b/lib/atf/libatf-c/Makefile @@ -36,7 +36,7 @@ LIB= atf-c PRIVATELIB= true SHLIB_MAJOR= 1 -ATF= ${.CURDIR:H:H:H}/contrib/atf +ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF} .PATH: ${ATF}/atf-c .PATH: ${ATF}/atf-c/detail |