Author: bapt
Date: Mon Nov 24 22:15:30 2014
New Revision: 274990
URL: https://svnweb.freebsd.org/changeset/base/274990
Log:
Convert makefs to LIBADD
Add definition of libnetbsd in src.libnames.mk
Modified:
head/share/mk/src.libnames.mk
head/usr.sbin/makefs/Makefile
Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk Mon Nov 24 22:12:27 2014
(r274989)
+++ head/share/mk/src.libnames.mk Mon Nov 24 22:15:30 2014
(r274990)
@@ -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
Modified: head/usr.sbin/makefs/Makefile
==============================================================================
--- head/usr.sbin/makefs/Makefile Mon Nov 24 22:12:27 2014
(r274989)
+++ head/usr.sbin/makefs/Makefile Mon Nov 24 22:15:30 2014
(r274990)
@@ -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>
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
