diff options
| author | brooks <brooks@FreeBSD.org> | 2013-05-09 14:43:36 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2013-05-09 14:43:36 +0000 |
| commit | ac45fc3bdc389726828ab92a3ded300ebffb64fe (patch) | |
| tree | b57529f4ceb891cf87f6f7ec20027be77d0158cc /usr.sbin/makefs/Makefile | |
| parent | a222062d021f2ab91e8ea63fa5f619a8eb0f92c7 (diff) | |
| download | FreeBSD-src-ac45fc3bdc389726828ab92a3ded300ebffb64fe.zip FreeBSD-src-ac45fc3bdc389726828ab92a3ded300ebffb64fe.tar.gz | |
Remove duplicated copies of various NetBSD compatibility shims used by
makefs and use libnetbsd, contrib/mtree, and contrib/mknod instead.
Sponsored by: DARPA, AFRLo
MFC after: 1 month
Diffstat (limited to 'usr.sbin/makefs/Makefile')
| -rw-r--r-- | usr.sbin/makefs/Makefile | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/usr.sbin/makefs/Makefile b/usr.sbin/makefs/Makefile index 6fa0679..6253148 100644 --- a/usr.sbin/makefs/Makefile +++ b/usr.sbin/makefs/Makefile @@ -5,7 +5,6 @@ PROG= makefs CFLAGS+=-I${.CURDIR} SRCS= cd9660.c ffs.c \ - getid.c \ makefs.c \ mtree.c \ walk.c @@ -15,19 +14,28 @@ WARNS?= 2 .include "${.CURDIR}/cd9660/Makefile.inc" .include "${.CURDIR}/ffs/Makefile.inc" -.include "${.CURDIR}/compat/Makefile.inc" CFLAGS+=-DHAVE_STRUCT_STAT_ST_FLAGS=1 CFLAGS+=-DHAVE_STRUCT_STAT_ST_GEN=1 -.PATH: ${.CURDIR}/../mtree -CFLAGS+=-I${.CURDIR}/../mtree -SRCS+= misc.c spec.c +.PATH: ${.CURDIR}/../../contrib/mtree +CFLAGS+=-I${.CURDIR}/../../contrib/mtree +SRCS+= getid.c misc.c spec.c + +.PATH: ${.CURDIR}/../../contrib/mknod +CFLAGS+=-I${.CURDIR}/../../contrib/mknod +SRCS+= pack_dev.c .PATH: ${.CURDIR}/../../sys/ufs/ffs SRCS+= ffs_tables.c -DPADD= ${LIBSBUF} -LDADD= -lsbuf +CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd +LIBNETBSDDIR= ${.OBJDIR}/../../lib/libnetbsd +LIBNETBSD= ${LIBNETBSDDIR}/libnetbsd.a +DPADD+= ${LIBNETBSD} +LDADD+= ${LIBNETBSD} + +DPADD+= ${LIBSBUF} ${LIBUTIL} +LDADD+= -lsbuf -lutil .include <bsd.prog.mk> |
