diff options
| author | Greg Hudson <ghudson@mit.edu> | 2011-09-14 15:22:11 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2011-09-14 15:22:11 +0000 |
| commit | 1ccb4677821c46c4fac6554ccef2cb3ca481f492 (patch) | |
| tree | 5c2a206e640bc38ebde4e376b6f675f300e3e1dd | |
| parent | b41978c1b227dab6337cdaa34002e51d1b708d5a (diff) | |
| download | krb5-1ccb4677821c46c4fac6554ccef2cb3ca481f492.tar.gz krb5-1ccb4677821c46c4fac6554ccef2cb3ca481f492.tar.xz krb5-1ccb4677821c46c4fac6554ccef2cb3ca481f492.zip | |
Fix verto-k5ev.h dependencies for system libverto
When we build with the internal verto, we include verto-k5ev.h in
order to create loops. When we build with the system verto, we don't
include that header file. Add depfix logic and pre.in variables to
avoid depending on verto-k5ev.h for a system verto build.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25173 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/config/pre.in | 3 | ||||
| -rw-r--r-- | src/lib/apputils/deps | 32 | ||||
| -rw-r--r-- | src/util/depfix.pl | 1 |
3 files changed, 20 insertions, 16 deletions
diff --git a/src/config/pre.in b/src/config/pre.in index 51a7fbab76..e009deaf07 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -367,6 +367,9 @@ VERTO_VERSION = @VERTO_VERSION@ VERTO_DEPS = $(VERTO_DEPS-@VERTO_VERSION@) VERTO_DEPS-sys = VERTO_DEPS-k5 = $(BUILDTOP)/include/verto.h +VERTO_K5EV_DEPS = $(VERTO_K5EV_DEPS-@VERTO_VERSION@) +VERTO_K5EV_DEPS-sys = +VERTO_K5EV_DEPS-k5 = $(BUILDTOP)/include/verto-k5ev.h # LIBS gets substituted in... e.g. -lnsl -lsocket diff --git a/src/lib/apputils/deps b/src/lib/apputils/deps index 99c84e9f4c..586e1ef767 100644 --- a/src/lib/apputils/deps +++ b/src/lib/apputils/deps @@ -16,19 +16,19 @@ net-server.so net-server.po $(OUTPRE)net-server.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(BUILDTOP)/include/verto-k5ev.h $(COM_ERR_DEPS) $(VERTO_DEPS) \ - $(top_srcdir)/include/adm_proto.h $(top_srcdir)/include/fake-addrinfo.h \ - $(top_srcdir)/include/foreachaddr.h $(top_srcdir)/include/gssrpc/auth.h \ - $(top_srcdir)/include/gssrpc/auth_gss.h $(top_srcdir)/include/gssrpc/auth_unix.h \ - $(top_srcdir)/include/gssrpc/clnt.h $(top_srcdir)/include/gssrpc/rename.h \ - $(top_srcdir)/include/gssrpc/rpc.h $(top_srcdir)/include/gssrpc/rpc_msg.h \ - $(top_srcdir)/include/gssrpc/svc.h $(top_srcdir)/include/gssrpc/svc_auth.h \ - $(top_srcdir)/include/gssrpc/xdr.h $(top_srcdir)/include/k5-buf.h \ - $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \ - $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \ - $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \ - $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \ - $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \ - $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \ - $(top_srcdir)/include/net-server.h $(top_srcdir)/include/port-sockets.h \ - $(top_srcdir)/include/socket-utils.h net-server.c + $(COM_ERR_DEPS) $(VERTO_DEPS) $(VERTO_K5EV_DEPS) $(top_srcdir)/include/adm_proto.h \ + $(top_srcdir)/include/fake-addrinfo.h $(top_srcdir)/include/foreachaddr.h \ + $(top_srcdir)/include/gssrpc/auth.h $(top_srcdir)/include/gssrpc/auth_gss.h \ + $(top_srcdir)/include/gssrpc/auth_unix.h $(top_srcdir)/include/gssrpc/clnt.h \ + $(top_srcdir)/include/gssrpc/rename.h $(top_srcdir)/include/gssrpc/rpc.h \ + $(top_srcdir)/include/gssrpc/rpc_msg.h $(top_srcdir)/include/gssrpc/svc.h \ + $(top_srcdir)/include/gssrpc/svc_auth.h $(top_srcdir)/include/gssrpc/xdr.h \ + $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \ + $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \ + $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \ + $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \ + $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \ + $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \ + $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/net-server.h \ + $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \ + net-server.c diff --git a/src/util/depfix.pl b/src/util/depfix.pl index b3f24b41f4..dd4989abdc 100644 --- a/src/util/depfix.pl +++ b/src/util/depfix.pl @@ -141,6 +141,7 @@ sub do_subs_2 { s;\$\(BUILDTOP\)/include/com_err.h ;\$(COM_ERR_DEPS) ;g; s;\$\(BUILDTOP\)/include/ss/ss.h \$\(BUILDTOP\)/include/ss/ss_err.h ;\$(SS_DEPS) ;g; s;\$\(BUILDTOP\)/include/db-config.h \$\(BUILDTOP\)/include/db.h ;\$(DB_DEPS) ;g; + s;\$\(BUILDTOP\)/include/verto-k5ev.h ;\$(VERTO_K5EV_DEPS) ;g; s;\$\(BUILDTOP\)/include/verto.h ;\$(VERTO_DEPS) ;g; $_ = &uniquify($_); |