From e4a93f1ef876f7a0e59c722f9ac1fbbf77a66227 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Thu, 10 Nov 2005 18:07:07 +0000 Subject: [PATCH] Add missing shared library interdependencies. --- Makefile.inc1 | 7 +++---- lib/libarchive/Makefile | 2 ++ lib/libform/Makefile | 3 +++ lib/libmagic/Makefile | 2 ++ lib/libmemstat/Makefile | 2 ++ lib/libmenu/Makefile | 2 ++ lib/libmp/Makefile | 2 ++ lib/libncp/Makefile | 3 +++ lib/libpanel/Makefile | 2 ++ lib/libradius/Makefile | 4 ++-- lib/libsmb/Makefile | 2 ++ lib/ncurses/form/Makefile | 3 +++ lib/ncurses/menu/Makefile | 2 ++ lib/ncurses/panel/Makefile | 2 ++ 14 files changed, 32 insertions(+), 6 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index c1d494f1eff2..3ebeadd9becb 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -977,8 +977,8 @@ _prebuild_libs+= kerberos5/lib/libroken _generic_libs+= kerberos5/lib .endif -_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \ - lib/libkvm lib/libmd \ +_prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ + lib/libipx lib/libkiconv lib/libkvm lib/libmd \ lib/libncurses lib/libnetgraph lib/libopie lib/libpam \ lib/libradius \ lib/libsbuf lib/libtacplus lib/libutil \ @@ -991,8 +991,7 @@ _generic_libs+= lib .if !defined(NO_CRYPT) .if !defined(NO_OPENSSL) _prebuild_libs+= secure/lib/libcrypto secure/lib/libssl -lib/libradius__L: secure/lib/libssl__L -secure/lib/libssl__L: secure/lib/libcrypto__L +lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L .if !defined(NO_OPENSSH) _prebuild_libs+= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index 447028c162c8..41a1ee743e60 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -6,6 +6,8 @@ # autoconf/automake-generated build system--on the other system. LIB= archive +DPADD= ${LIBBZ2} ${LIBZ} +LDADD= -lbz2 -lz # Versioning . There are three distinct sets of version # numbers: diff --git a/lib/libform/Makefile b/lib/libform/Makefile index 6e69075ba698..027be497af88 100644 --- a/lib/libform/Makefile +++ b/lib/libform/Makefile @@ -8,6 +8,9 @@ NCURSES=${.CURDIR}/../../contrib/ncurses .PATH: ${NCURSES}/man LIB= form +DPADD= ${LIBNCURSES} +LDADD= -lncurses + AWK?= awk SRCS= ncurses_def.h \ diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile index 59f96344ba34..c04c811ff9c5 100644 --- a/lib/libmagic/Makefile +++ b/lib/libmagic/Makefile @@ -6,6 +6,8 @@ CONTRDIR= ${.CURDIR}/../../contrib/file LIB= magic SHLIB_MAJOR= 2 +DPADD= ${LIBZ} +LDADD= -lz MAN= libmagic.3 magic.5 SRCS= apprentice.c apptype.c ascmagic.c compress.c fsmagic.c funcs.c \ diff --git a/lib/libmemstat/Makefile b/lib/libmemstat/Makefile index 1d3c43d28731..d0576d919eb8 100644 --- a/lib/libmemstat/Makefile +++ b/lib/libmemstat/Makefile @@ -3,6 +3,8 @@ WARNS?= 3 LIB= memstat SHLIB_MAJOR= 1 +DPADD= ${LIBKVM} +LDADD= -lkvm SRCS+= memstat.c SRCS+= memstat_all.c SRCS+= memstat_malloc.c diff --git a/lib/libmenu/Makefile b/lib/libmenu/Makefile index fd3ddfe71158..6e057393d561 100644 --- a/lib/libmenu/Makefile +++ b/lib/libmenu/Makefile @@ -7,6 +7,8 @@ NCURSES=${.CURDIR}/../../contrib/ncurses .PATH: ${NCURSES}/man LIB= menu +DPADD= ${LIBNCURSES} +LDADD= -lncurses AWK?= awk SRCS= ncurses_def.h \ diff --git a/lib/libmp/Makefile b/lib/libmp/Makefile index 51d395fb362b..e4454cf6b4d0 100644 --- a/lib/libmp/Makefile +++ b/lib/libmp/Makefile @@ -2,6 +2,8 @@ LIB= mp SHLIB_MAJOR= 5 +DPADD= ${LIBCRYPTO} +LDADD= -lcrypto MAN= libmp.3 INCS= mp.h SRCS= mpasbn.c diff --git a/lib/libncp/Makefile b/lib/libncp/Makefile index ab1689c0e3c9..dfacced55598 100644 --- a/lib/libncp/Makefile +++ b/lib/libncp/Makefile @@ -6,6 +6,9 @@ LIB= ncp SHLIB_MAJOR= 2 +DPADD= ${LIBIPX} +LDADD= -lipx + NO_MAN= SRCS= ncpl_subr.c ncpl_bind.c ncpl_queue.c ncpl_file.c ncpl_misc.c \ diff --git a/lib/libpanel/Makefile b/lib/libpanel/Makefile index e715921652ac..6d828b20c833 100644 --- a/lib/libpanel/Makefile +++ b/lib/libpanel/Makefile @@ -7,6 +7,8 @@ NCURSES=${.CURDIR}/../../contrib/ncurses .PATH: ${NCURSES}/man LIB= panel +DPADD= ${LIBNCURSES} +LDADD= -lncurses AWK?= awk SRCS= ncurses_def.h \ diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile index 98d7b345bf34..2c89597bc0c3 100644 --- a/lib/libradius/Makefile +++ b/lib/libradius/Makefile @@ -35,8 +35,8 @@ MAN= libradius.3 radius.conf.5 DPADD= ${LIBMD} LDADD= -lmd .else -DPADD= ${LIBSSL} -LDADD= -lssl +DPADD= ${LIBCRYPTO} +LDADD= -lcrypto CFLAGS+= -DWITH_SSL .endif diff --git a/lib/libsmb/Makefile b/lib/libsmb/Makefile index 371b0454973f..8d411404b335 100644 --- a/lib/libsmb/Makefile +++ b/lib/libsmb/Makefile @@ -5,6 +5,8 @@ CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs LIB= smb SHLIB_MAJOR= 2 +DPADD= ${LIBKICONV} +LDADD= -lkiconv NO_MAN= SRCS= rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \ diff --git a/lib/ncurses/form/Makefile b/lib/ncurses/form/Makefile index 6e69075ba698..027be497af88 100644 --- a/lib/ncurses/form/Makefile +++ b/lib/ncurses/form/Makefile @@ -8,6 +8,9 @@ NCURSES=${.CURDIR}/../../contrib/ncurses .PATH: ${NCURSES}/man LIB= form +DPADD= ${LIBNCURSES} +LDADD= -lncurses + AWK?= awk SRCS= ncurses_def.h \ diff --git a/lib/ncurses/menu/Makefile b/lib/ncurses/menu/Makefile index fd3ddfe71158..6e057393d561 100644 --- a/lib/ncurses/menu/Makefile +++ b/lib/ncurses/menu/Makefile @@ -7,6 +7,8 @@ NCURSES=${.CURDIR}/../../contrib/ncurses .PATH: ${NCURSES}/man LIB= menu +DPADD= ${LIBNCURSES} +LDADD= -lncurses AWK?= awk SRCS= ncurses_def.h \ diff --git a/lib/ncurses/panel/Makefile b/lib/ncurses/panel/Makefile index e715921652ac..6d828b20c833 100644 --- a/lib/ncurses/panel/Makefile +++ b/lib/ncurses/panel/Makefile @@ -7,6 +7,8 @@ NCURSES=${.CURDIR}/../../contrib/ncurses .PATH: ${NCURSES}/man LIB= panel +DPADD= ${LIBNCURSES} +LDADD= -lncurses AWK?= awk SRCS= ncurses_def.h \