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

diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index cb578f2899f68755fe45e00201449d261dfa4ff0..c0a69b62655854d09a48a530563c4b2b80a31f90 100644 (file)
--- 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 f198840a6c53886f670f7e81352929cabe602b9a..daf317a8da932eed156275c8d25ac56ba5625d7e 100644 (file)
--- 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 80f9be241fb037bcb9c0ed6a80aa2eba13ff1564..db61a8c57d650b2baf56ab70942caa027efe809a 100644 (file)
--- 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 9530e0db48810f8b2c3e2a15c095cc2bf41951e7..dc5c7b9df25d3008a493bd73b446ab16fed6bb16 100644 (file)
--- 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 73c42a00ab289d0c744ee47af507e76f7d1d8d90..fc1d340e427156be5e1b35dfd84ef37181468a65 100644 (file)
--- 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 41d51f7ade10f97986a98776070a94453a7089bd..fc446e3f13ffa7b9883e3a25a640c7acf023490a 100644 (file)
--- 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 6abd7a58856fdaf73e2d7603b9c610f6b7035387..f29f9df851c46402b41a679c793484e8646b7887 100644 (file)
--- 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)