From c03aede6beac046b6fe02f7be3cce365d7cbdf34 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Fri, 9 Sep 2011 21:02:55 +0000 Subject: Fix verto.h dependencies for system libverto When we have conditionally built bundled source, we need logic in depfix.pl and variables in pre.in to avoid depending on the bundled verto.h in generated dependencies. Add that logic for verto. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25170 dc483132-0cff-0310-8789-dd5450dbe970 --- src/util/depfix.pl | 1 + src/util/k5ev/deps | 6 +++--- src/util/verto/deps | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/util') diff --git a/src/util/depfix.pl b/src/util/depfix.pl index 4dec8879a..b3f24b41f 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.h ;\$(VERTO_DEPS) ;g; $_ = &uniquify($_); diff --git a/src/util/k5ev/deps b/src/util/k5ev/deps index 2921c31e2..5fd855249 100644 --- a/src/util/k5ev/deps +++ b/src/util/k5ev/deps @@ -2,6 +2,6 @@ # Generated makefile dependencies follow. # verto-k5ev.so verto-k5ev.po $(OUTPRE)verto-k5ev.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/verto.h \ - $(srcdir)/../verto/verto-module.h ev.c ev.h ev_poll.c \ - ev_vars.h ev_wrap.h rename.h verto-k5ev.c + $(BUILDTOP)/include/autoconf.h $(VERTO_DEPS) $(srcdir)/../verto/verto-module.h \ + ev.c ev.h ev_poll.c ev_select.c ev_vars.h ev_wrap.h \ + rename.h verto-k5ev.c verto-k5ev.h diff --git a/src/util/verto/deps b/src/util/verto/deps index b64cc8235..eb523aa4a 100644 --- a/src/util/verto/deps +++ b/src/util/verto/deps @@ -1,5 +1,5 @@ # # Generated makefile dependencies follow. # -verto.so verto.po $(OUTPRE)verto.$(OBJEXT): $(BUILDTOP)/include/verto.h \ +verto.so verto.po $(OUTPRE)verto.$(OBJEXT): $(VERTO_DEPS) \ verto-module.h verto.c -- cgit