diff options
| author | dd <dd@FreeBSD.org> | 2001-07-29 08:58:22 +0000 |
|---|---|---|
| committer | dd <dd@FreeBSD.org> | 2001-07-29 08:58:22 +0000 |
| commit | a12e9377b2092a09630cc31908b4fedb790238a2 (patch) | |
| tree | b4c753f36a759398ec323557f995117019efca84 | |
| parent | 2aadb933013c79e6433612e84aeae7f3138631d1 (diff) | |
| download | FreeBSD-src-a12e9377b2092a09630cc31908b4fedb790238a2.zip FreeBSD-src-a12e9377b2092a09630cc31908b4fedb790238a2.tar.gz | |
Enable the new libmp in the build, and disable libgmp and its
henchmen.
| -rw-r--r-- | Makefile.inc1 | 3 | ||||
| -rw-r--r-- | gnu/lib/Makefile | 2 | ||||
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/chkey/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/newkey/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/keyserv/Makefile | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 06aefc0..240f774 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -652,13 +652,11 @@ hierarchy: includes: cd ${.CURDIR}/include; ${MAKE} -B all install cd ${.CURDIR}/gnu/include; ${MAKE} install - cd ${.CURDIR}/gnu/lib/libmp; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libobjc; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libreadline/readline; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libregex; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libstdc++; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libdialog; ${MAKE} beforeinstall - cd ${.CURDIR}/gnu/lib/libgmp; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/usr.bin/cc/cc1plus; ${MAKE} beforeinstall .if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) .if exists(${.CURDIR}/secure/lib/libcrypto) @@ -705,6 +703,7 @@ includes: cd ${.CURDIR}/lib/libftpio; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libkvm; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libmd; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/libmp; ${MAKE} beforeinstall .if !defined(WANT_CSRG_LIBM) cd ${.CURDIR}/lib/msun; ${MAKE} beforeinstall .endif diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 41f3236..cfd5060 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SUBDIR= csu libdialog libgcc libgmp libmp libregex libreadline +SUBDIR= csu libdialog libgcc libregex libreadline .if ${OBJFORMAT} == aout .if !defined(NOLIBC_R) diff --git a/lib/Makefile b/lib/Makefile index 09b4378..79882ed 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -23,7 +23,7 @@ SUBDIR= ${_csu} libcom_err libcrypt msun libmd \ ${_compat} libalias libatm ${_libbind} libbz2 libc ${_libc_r} \ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libedit libfetch libform libftpio libgnumalloc ${_libio} libipsec \ - libipx libisc libkvm libmenu ${_libncp} \ + libipx libisc libkvm libmenu libmp ${_libncp} \ libnetgraph libopie libpam libpanel libpcap \ libresolv librpcsvc libsmdb libsmutil libss \ libstand ${_libtelnet} libusb ${_libvgl} libwrap libxpg4 liby libz diff --git a/usr.bin/chkey/Makefile b/usr.bin/chkey/Makefile index c0bbd6a..69c07f0 100644 --- a/usr.bin/chkey/Makefile +++ b/usr.bin/chkey/Makefile @@ -8,6 +8,6 @@ SRCS= chkey.c update.c generic.c CFLAGS+=-DYP DPADD= ${LIBRPCSVC} ${LIBMP} ${LIBGMP} -LDADD= -lrpcsvc -lmp -lgmp +LDADD= -lrpcsvc -lmp -lcrypto .include <bsd.prog.mk> diff --git a/usr.bin/newkey/Makefile b/usr.bin/newkey/Makefile index 560c020..2ea0091 100644 --- a/usr.bin/newkey/Makefile +++ b/usr.bin/newkey/Makefile @@ -8,6 +8,6 @@ MAN= newkey.8 #CFLAGS+= -DYP DPADD= ${LIBRPCSVC} ${LIBMP} ${LIBGMP} -LDADD= -lrpcsvc -lmp -lgmp +LDADD= -lrpcsvc -lmp -lcrypto .include <bsd.prog.mk> diff --git a/usr.sbin/keyserv/Makefile b/usr.sbin/keyserv/Makefile index 09007e9..60a0a6d 100644 --- a/usr.sbin/keyserv/Makefile +++ b/usr.sbin/keyserv/Makefile @@ -10,7 +10,7 @@ CFLAGS+= -DOBJFORMAT_ELF .endif DPADD= ${LIBMP} ${LIBRPCSVC} -LDADD= -lmp -lrpcsvc +LDADD= -lmp -lcrypto -lrpcsvc RPCDIR= ${DESTDIR}/usr/include/rpcsvc |
