diff options
| author | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 65145fa4c81da358fcbc3b650156dab705dfa34e (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /lib/librt | |
| parent | 60ff4eb0dff94a04d75d0d52a3957aaaf5f8c693 (diff) | |
| parent | e6b664c390af88d4a87208bc042ce503da664c3b (diff) | |
| download | FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.zip FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.tar.gz | |
Merge sync of head
Diffstat (limited to 'lib/librt')
| -rw-r--r-- | lib/librt/Makefile | 7 | ||||
| -rw-r--r-- | lib/librt/Makefile.amd64 | 6 | ||||
| -rw-r--r-- | lib/librt/Makefile.i386 | 6 | ||||
| -rw-r--r-- | lib/librt/tests/Makefile | 3 |
4 files changed, 5 insertions, 17 deletions
diff --git a/lib/librt/Makefile b/lib/librt/Makefile index bd6ec07..5696610 100644 --- a/lib/librt/Makefile +++ b/lib/librt/Makefile @@ -9,8 +9,7 @@ CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR} CFLAGS+=-fexceptions .endif CFLAGS+=-Winline -Wall -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread WARNS?= 2 @@ -20,6 +19,8 @@ PRECIOUSLIB= VERSION_MAP= ${.CURDIR}/Version.map -.include <bsd.arch.inc.mk> +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif .include <bsd.lib.mk> diff --git a/lib/librt/Makefile.amd64 b/lib/librt/Makefile.amd64 deleted file mode 100644 index dd0f5b0..0000000 --- a/lib/librt/Makefile.amd64 +++ /dev/null @@ -1,6 +0,0 @@ -# $FreeBSD$ - -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif - diff --git a/lib/librt/Makefile.i386 b/lib/librt/Makefile.i386 deleted file mode 100644 index dd0f5b0..0000000 --- a/lib/librt/Makefile.i386 +++ /dev/null @@ -1,6 +0,0 @@ -# $FreeBSD$ - -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif - diff --git a/lib/librt/tests/Makefile b/lib/librt/tests/Makefile index 224f52e..95c5259 100644 --- a/lib/librt/tests/Makefile +++ b/lib/librt/tests/Makefile @@ -6,8 +6,7 @@ TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/librt TESTSDIR= ${TESTSBASE}/lib/librt -DPADD+= ${LIBRT} -LDADD+= -lrt +LIBADD= rt NETBSD_ATF_TESTS_C= sched_test NETBSD_ATF_TESTS_C+= sem_test |
