summaryrefslogtreecommitdiffstats
path: root/src/lib/krb5/ccache/ccapi
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2009-11-22 18:13:29 +0000
committerGreg Hudson <ghudson@mit.edu>2009-11-22 18:13:29 +0000
commitee7c901f80fc9057ed6bd1f91d04859d764fb046 (patch)
treed4e0e5e1bc234fe674572b799c5750175af5180c /src/lib/krb5/ccache/ccapi
parentd4afef7bcb12da240ea501aa3d274092569b11dc (diff)
downloadkrb5-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/lib/krb5/ccache/ccapi')
-rw-r--r--src/lib/krb5/ccache/ccapi/Makefile.in4
-rw-r--r--src/lib/krb5/ccache/ccapi/deps20
2 files changed, 11 insertions, 13 deletions
diff --git a/src/lib/krb5/ccache/ccapi/Makefile.in b/src/lib/krb5/ccache/ccapi/Makefile.in
index 503a2c6890..135672b0cd 100644
--- a/src/lib/krb5/ccache/ccapi/Makefile.in
+++ b/src/lib/krb5/ccache/ccapi/Makefile.in
@@ -1,12 +1,10 @@
-thisconfigdir=../../../..
-myfulldir=lib/krb5/ccache/ccapi
mydir=lib/krb5/ccache/ccapi
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
LOCALINCLUDES = $(WIN_INCLUDES)
DEFS= -DUSE_CCAPI -DUSE_CCAPI_V3
##DOS##DEFS=
-##DOS##WIN_INCLUDES = -I$(SRCTOP)\windows\lib
+##DOS##WIN_INCLUDES = -I$(top_srcdir)\windows\lib
##DOS##BUILDTOP = ..\..\..\..
##DOS##PREFIXDIR = ccache\file
diff --git a/src/lib/krb5/ccache/ccapi/deps b/src/lib/krb5/ccache/ccapi/deps
index db881ca162..7df6d68520 100644
--- a/src/lib/krb5/ccache/ccapi/deps
+++ b/src/lib/krb5/ccache/ccapi/deps
@@ -3,16 +3,16 @@
#
stdcc.so stdcc.po $(OUTPRE)stdcc.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
- $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
- $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \
- $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \
- $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \
- $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \
- $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \
- $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h stdcc.c stdcc.h stdcc_util.h
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.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/krb5.h $(top_srcdir)/include/krb5/locate_plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.h stdcc.c stdcc.h stdcc_util.h
stdcc_util.so stdcc_util.po $(OUTPRE)stdcc_util.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
- $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
- $(SRCTOP)/include/krb5.h stdcc_util.c stdcc_util.h
+ $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \
+ $(top_srcdir)/include/krb5.h stdcc_util.c stdcc_util.h
winccld.so winccld.po $(OUTPRE)winccld.$(OBJEXT): winccld.c