diff options
| author | Greg Hudson <ghudson@mit.edu> | 2009-11-22 18:13:29 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2009-11-22 18:13:29 +0000 |
| commit | ee7c901f80fc9057ed6bd1f91d04859d764fb046 (patch) | |
| tree | d4e0e5e1bc234fe674572b799c5750175af5180c /src/kadmin/testing | |
| parent | d4afef7bcb12da240ea501aa3d274092569b11dc (diff) | |
| download | krb5-ee7c901f80fc9057ed6bd1f91d04859d764fb046.tar.gz krb5-ee7c901f80fc9057ed6bd1f91d04859d764fb046.tar.xz krb5-ee7c901f80fc9057ed6bd1f91d04859d764fb046.zip | |
Consolidate Makefile variables now that we have only a single global
configure script:
$(SRCTOP) --> $(top_srcdir)
$(srcdir)/$(thisconfigdir) --> $(top_srcdir)
$(thisconfigdir) --> $(BUILDTOP)
$(myfulldir) --> $(mydir)
ticket: 6583
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23308 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/testing')
| -rw-r--r-- | src/kadmin/testing/Makefile.in | 2 | ||||
| -rw-r--r-- | src/kadmin/testing/scripts/Makefile.in | 6 | ||||
| -rw-r--r-- | src/kadmin/testing/util/Makefile.in | 2 | ||||
| -rw-r--r-- | src/kadmin/testing/util/deps | 14 |
4 files changed, 9 insertions, 15 deletions
diff --git a/src/kadmin/testing/Makefile.in b/src/kadmin/testing/Makefile.in index 5b459950c..1f154ec55 100644 --- a/src/kadmin/testing/Makefile.in +++ b/src/kadmin/testing/Makefile.in @@ -1,5 +1,3 @@ -thisconfigdir=../.. -myfulldir=kadmin/testing mydir=kadmin/testing BUILDTOP=$(REL)..$(S).. SUBDIRS = scripts util diff --git a/src/kadmin/testing/scripts/Makefile.in b/src/kadmin/testing/scripts/Makefile.in index 5622fc571..36ae3b490 100644 --- a/src/kadmin/testing/scripts/Makefile.in +++ b/src/kadmin/testing/scripts/Makefile.in @@ -1,5 +1,3 @@ -thisconfigdir=../../.. -myfulldir=kadmin/testing/scripts mydir=kadmin/testing/scripts BUILDTOP=$(REL)..$(S)..$(S).. PERL_PATH=@PERL_PATH@ @@ -14,9 +12,9 @@ all:: env-setup.sh $(GEN_SCRIPTS) # Should only rebuild env_setup.sh here (use CONFIG_FILES=), but the weird krb5 # makefile post-processing is unconditional and would trash the makefile. env-setup.sh: env-setup.stamp -env-setup.stamp: $(srcdir)/env-setup.shin $(thisconfigdir)/config.status \ +env-setup.stamp: $(srcdir)/env-setup.shin $(BUILDTOP)/config.status \ Makefile - cd $(thisconfigdir) && \ + cd $(BUILDTOP) && \ CONFIG_FILES=$(mydir)/env-setup.sh:$(mydir)/env-setup.shin $(SHELL) \ config.status chmod +x env-setup.sh diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in index b1b61d998..3993c90a0 100644 --- a/src/kadmin/testing/util/Makefile.in +++ b/src/kadmin/testing/util/Makefile.in @@ -1,5 +1,3 @@ -thisconfigdir=../../.. -myfulldir=kadmin/testing/util mydir=kadmin/testing/util BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = $(TCL_INCLUDES) -I$(BUILDTOP)/lib/kdb/ diff --git a/src/kadmin/testing/util/deps b/src/kadmin/testing/util/deps index d4491623d..9b6830104 100644 --- a/src/kadmin/testing/util/deps +++ b/src/kadmin/testing/util/deps @@ -5,12 +5,12 @@ $(OUTPRE)tcl_kadm5.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/types.h \ $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/lib/kdb/adb_err.h $(COM_ERR_DEPS) $(SRCTOP)/include/gssrpc/auth.h \ - $(SRCTOP)/include/gssrpc/auth_gss.h $(SRCTOP)/include/gssrpc/auth_unix.h \ - $(SRCTOP)/include/gssrpc/clnt.h $(SRCTOP)/include/gssrpc/rename.h \ - $(SRCTOP)/include/gssrpc/rpc.h $(SRCTOP)/include/gssrpc/rpc_msg.h \ - $(SRCTOP)/include/gssrpc/svc.h $(SRCTOP)/include/gssrpc/svc_auth.h \ - $(SRCTOP)/include/gssrpc/xdr.h $(SRCTOP)/include/kdb.h \ - $(SRCTOP)/include/krb5.h tcl_kadm5.c tcl_kadm5.h + $(BUILDTOP)/lib/kdb/adb_err.h $(COM_ERR_DEPS) $(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/kdb.h \ + $(top_srcdir)/include/krb5.h tcl_kadm5.c tcl_kadm5.h $(OUTPRE)test.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ tcl_kadm5.h test.c |