From f24bb3a4b3fc3c4f87a2378a1285af0e81fb93de Mon Sep 17 00:00:00 2001 From: Boris Popov Date: Thu, 14 Oct 1999 06:40:46 +0000 Subject: [PATCH] Make libncp actually compiled. Reviewed by: mdodd --- Makefile.inc1 | 1 + etc/mtree/BSD.include.dist | 4 ++++ include/Makefile | 4 ++-- lib/Makefile | 5 +++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index d50de4d43fe..06c561d57a1 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -587,6 +587,7 @@ includes: cd ${.CURDIR}/lib/libcalendar; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libcam; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libdisk; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/libncp; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libncurses; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libedit; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libftpio; ${MAKE} beforeinstall diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 6ecdae40c03..ac286a0ad38 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -35,10 +35,14 @@ .. netkey .. + netncp + .. netns .. nfs .. + nwfs + .. objc .. pccard diff --git a/include/Makefile b/include/Makefile index 5eacd067e72..79f319d84c4 100644 --- a/include/Makefile +++ b/include/Makefile @@ -41,8 +41,8 @@ SFILES= soundcard.h LFILES= aio.h errno.h fcntl.h inttypes.h linker_set.h poll.h syslog.h \ termios.h ucontext.h -LDIRS= cam msdosfs net netatalk netatm netinet netipx netkey netns nfs \ - pccard posix4 sys vm +LDIRS= cam msdosfs net netatalk netatm netinet netipx netkey netncp netns \ + nfs nwfs pccard posix4 sys vm LNOHEADERDIRS= isofs ufs LSUBDIRS= isofs/cd9660 ufs/ffs ufs/mfs ufs/ufs cam/scsi diff --git a/lib/Makefile b/lib/Makefile index 692d431c0c1..abc7e30df6e 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -21,8 +21,8 @@ SUBDIR= ${_csu} libcom_err ${_libm} libmd ${_libcrypt} \ libncurses libradius libskey libtacplus \ ${_compat} libalias libatm libbind libc ${_libc_r} libcalendar libcam \ libcompat libdevstat libdisk libedit libfetch libform \ - libftpio libgnumalloc ${_libio} libipx libkvm libmenu libopie libpam \ - libpanel libpcap libresolv librpcsvc libss libstand \ + libftpio libgnumalloc ${_libio} libipx libkvm libmenu ${_libncp} \ + libopie libpam libpanel libpcap libresolv librpcsvc libss libstand \ ${_libtelnet} libutil ${_libvgl} libwrap libxpg4 liby libz .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${OBJFORMAT}) @@ -44,6 +44,7 @@ _libcrypt+= ../secure/lib/libcrypt .if ${MACHINE_ARCH} == "i386" _compat= compat +_libncp= libncp _libvgl= libvgl .endif