diff options
| author | bapt <bapt@FreeBSD.org> | 2014-11-24 22:15:30 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-11-24 22:15:30 +0000 |
| commit | 622c9ffcdd9adcda2ad1b5fb1b9d930cdea2f6bc (patch) | |
| tree | d595de71788ef7ccf6c75c15aa53fb00f6bb2a84 | |
| parent | b6c4c21b205641ead0989c66979a0ac5a1adeae8 (diff) | |
| download | FreeBSD-src-622c9ffcdd9adcda2ad1b5fb1b9d930cdea2f6bc.zip FreeBSD-src-622c9ffcdd9adcda2ad1b5fb1b9d930cdea2f6bc.tar.gz | |
Convert makefs to LIBADD
Add definition of libnetbsd in src.libnames.mk
| -rw-r--r-- | share/mk/src.libnames.mk | 5 | ||||
| -rw-r--r-- | usr.sbin/makefs/Makefile | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 5faa8db..d69eb9b 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -22,6 +22,7 @@ _PRIVATELIBS= \ unbound _INTERNALIBS= \ mandoc \ + netbsd \ ohash \ readline \ sm @@ -68,6 +69,7 @@ _LIBRARIES= \ mp \ nandfs \ ncursesw \ + netbsd \ nv \ opie \ pam \ @@ -242,3 +244,6 @@ LIBMANDOC?= ${LIBMANDOCDIR}/libmandoc.a LIBSMDIR= ${ROOTOBJDIR}/lib/libsm LDSM?= ${LIBSMDIR}/libsm.a LIBSM?= ${LIBSMDIR}/libsm.a + +LIBNETBSDDIR= ${ROOTOBJDIR}/lib/libnetbsd +LIBNETBSD= ${ROOTOBJDIR}/libnetbsd.a diff --git a/usr.sbin/makefs/Makefile b/usr.sbin/makefs/Makefile index 6253148..882fe45 100644 --- a/usr.sbin/makefs/Makefile +++ b/usr.sbin/makefs/Makefile @@ -30,12 +30,6 @@ SRCS+= pack_dev.c SRCS+= ffs_tables.c CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd -LIBNETBSDDIR= ${.OBJDIR}/../../lib/libnetbsd -LIBNETBSD= ${LIBNETBSDDIR}/libnetbsd.a -DPADD+= ${LIBNETBSD} -LDADD+= ${LIBNETBSD} - -DPADD+= ${LIBSBUF} ${LIBUTIL} -LDADD+= -lsbuf -lutil +LIBADD= netbsd util sbuf .include <bsd.prog.mk> |
