From 470f3104e46cff5eb234a42d1b4ccfeba1bfcdb9 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Sun, 2 Mar 2003 21:40:49 +0000 Subject: [PATCH] Use com_err_deplib rather than an explicit path so we do not have our shared libraries depend at a make level on com_err if we use the system com_err library. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15212 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/gssapi/Makefile.in | 2 +- src/lib/kadm5/clnt/Makefile.in | 2 +- src/lib/kadm5/srv/Makefile.in | 2 +- src/lib/krb5/Makefile.in | 2 +- src/lib/rpc/Makefile.in | 2 +- src/util/profile/Makefile.in | 2 +- src/util/pty/Makefile.in | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in index cb578f289..c0a69b626 100644 --- a/src/lib/gssapi/Makefile.in +++ b/src/lib/gssapi/Makefile.in @@ -30,7 +30,7 @@ SUBDIROBJLISTS=generic/OBJS.ST krb5/OBJS.ST SHLIB_EXPDEPS=\ $(TOPLIBD)/libkrb5$(SHLIBEXT) \ $(TOPLIBD)/libk5crypto$(SHLIBEXT) \ - $(TOPLIBD)/libcom_err$(SHLIBEXT) + $(COM_ERR_DEPLIB) SHLIB_EXPLIBS=-lkrb5 -lk5crypto -lcom_err SHLIB_DIRS=-L$(TOPLIBD) SHLIB_RDIRS=$(KRB5_LIBDIR) diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in index f198840a6..daf317a8d 100644 --- a/src/lib/kadm5/clnt/Makefile.in +++ b/src/lib/kadm5/clnt/Makefile.in @@ -13,7 +13,7 @@ SHLIB_EXPDEPS=\ $(TOPLIBD)/libgssapi_krb5$(SHLIBEXT) \ $(TOPLIBD)/libkrb5$(SHLIBEXT) \ $(TOPLIBD)/libk5crypto$(SHLIBEXT) \ - $(TOPLIBD)/libcom_err$(SHLIBEXT) + $(COM_ERR_DEPLIB) SHLIB_EXPLIBS=-lgssrpc -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err SHLIB_DIRS=-L$(TOPLIBD) SHLIB_RDIRS=$(KRB5_LIBDIR) diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in index 80f9be241..db61a8c57 100644 --- a/src/lib/kadm5/srv/Makefile.in +++ b/src/lib/kadm5/srv/Makefile.in @@ -23,7 +23,7 @@ SHLIB_EXPDEPS=\ $(TOPLIBD)/libkdb5$(SHLIBEXT) $(SHLIB_DBLIB_DEPS) \ $(TOPLIBD)/libkrb5$(SHLIBEXT) \ $(TOPLIBD)/libk5crypto$(SHLIBEXT) \ - $(TOPLIBD)/libcom_err$(SHLIBEXT) + $(COM_ERR_DEPLIB) SHLIB_EXPLIBS = -lgssrpc -lgssapi_krb5 -lkdb5 $(DB_LIB) \ -lkrb5 -lk5crypto -lcom_err @GEN_LIB@ SHLIB_DIRS=-L$(TOPLIBD) diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in index 9530e0db4..dc5c7b9df 100644 --- a/src/lib/krb5/Makefile.in +++ b/src/lib/krb5/Makefile.in @@ -51,7 +51,7 @@ SRCS=\ RELDIR=krb5 SHLIB_EXPDEPS = \ $(TOPLIBD)/libk5crypto$(SHLIBEXT) \ - $(TOPLIBD)/libcom_err$(SHLIBEXT) + $(COM_ERR_DEPLIB) SHLIB_EXPLIBS=-lk5crypto -lcom_err @GEN_LIB@ $(LIBS) SHLIB_DIRS=-L$(TOPLIBD) SHLIB_RDIRS=$(KRB5_LIBDIR) diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in index 73c42a00a..fc1d340e4 100644 --- a/src/lib/rpc/Makefile.in +++ b/src/lib/rpc/Makefile.in @@ -15,7 +15,7 @@ SHLIB_EXPDEPS= \ $(TOPLIBD)/libgssapi_krb5$(SHLIBEXT) \ $(TOPLIBD)/libkrb5$(SHLIBEXT) \ $(TOPLIBD)/libk5crypto$(SHLIBEXT) \ - $(TOPLIBD)/libcom_err$(SHLIBEXT) + $(COM_ERR_DEPLIB) SHLIB_EXPLIBS=-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err SHLIB_DIRS=-L$(TOPLIBD) SHLIB_RDIRS=$(KRB5_LIBDIR) diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in index 41d51f7ad..fc446e3f1 100644 --- a/src/util/profile/Makefile.in +++ b/src/util/profile/Makefile.in @@ -43,7 +43,7 @@ MLIBS = -lcom_err LIB=profile LIBMAJOR=1 LIBMINOR=1 -SHLIB_EXPDEPS = $(TOPLIBD)/libcom_err$(SHLIBEXT) +SHLIB_EXPDEPS = $(COM_ERR_DEPLIB) SHLIB_EXPLIBS = -lcom_err SHLIB_DIRS = -L$(TOPLIBD) SHLIB_RDIRS=$(KRB5_LIBDIR) diff --git a/src/util/pty/Makefile.in b/src/util/pty/Makefile.in index 6abd7a588..f29f9df85 100644 --- a/src/util/pty/Makefile.in +++ b/src/util/pty/Makefile.in @@ -37,7 +37,7 @@ CFILES=$(srcdir)/cleanup.c $(srcdir)/getpty.c $(srcdir)/init_slave.c \ SRCS=pty_err.c $(CFILES) SHLIB_EXPDEPS = \ - $(TOPLIBD)/libcom_err$(SHLIBEXT) + $(COM_ERR_DEPLIB) SHLIB_EXPLIBS= -lcom_err SHLIB_DIRS=-L$(TOPLIBD) SHLIB_RDIRS=$(KRB5_LIBDIR) -- 2.26.2