summaryrefslogtreecommitdiffstats
path: root/src/ccapi/common
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/ccapi/common
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/ccapi/common')
-rw-r--r--src/ccapi/common/Makefile.in14
-rw-r--r--src/ccapi/common/unix/Makefile.in2
2 files changed, 6 insertions, 10 deletions
diff --git a/src/ccapi/common/Makefile.in b/src/ccapi/common/Makefile.in
index cc5d5c09c..7693485e3 100644
--- a/src/ccapi/common/Makefile.in
+++ b/src/ccapi/common/Makefile.in
@@ -1,5 +1,3 @@
-thisconfigdir=../..
-myfulldir=ccapi/common
mydir=ccapi/common
BUILDTOP=$(REL)..$(S)..
SUBDIRS=unix
@@ -39,29 +37,29 @@ clean-unix:: clean-libobjs
# the Makefile.in file
#
cci_array_internal.so cci_array_internal.po $(OUTPRE)cci_array_internal.$(OBJEXT): \
- $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+ $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \
cci_array_internal.c cci_array_internal.h cci_common.h \
cci_cred_union.h cci_debugging.h cci_identifier.h cci_message.h \
cci_stream.h cci_types.h
cci_cred_union.so cci_cred_union.po $(OUTPRE)cci_cred_union.$(OBJEXT): \
- $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+ $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \
cci_common.h cci_cred_union.c cci_cred_union.h cci_debugging.h \
cci_identifier.h cci_message.h cci_stream.h cci_types.h
cci_debugging.so cci_debugging.po $(OUTPRE)cci_debugging.$(OBJEXT): \
- $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+ $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \
cci_common.h cci_cred_union.h cci_debugging.c cci_debugging.h \
cci_identifier.h cci_message.h cci_os_debugging.h cci_stream.h \
cci_types.h
cci_identifier.so cci_identifier.po $(OUTPRE)cci_identifier.$(OBJEXT): \
- $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+ $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \
cci_common.h cci_cred_union.h cci_debugging.h cci_identifier.c \
cci_identifier.h cci_message.h cci_os_identifier.h \
cci_stream.h cci_types.h
cci_message.so cci_message.po $(OUTPRE)cci_message.$(OBJEXT): \
- $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+ $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \
cci_common.h cci_cred_union.h cci_debugging.h cci_identifier.h \
cci_message.c cci_message.h cci_stream.h cci_types.h
cci_stream.so cci_stream.po $(OUTPRE)cci_stream.$(OBJEXT): \
- $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \
+ $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \
cci_common.h cci_cred_union.h cci_debugging.h cci_identifier.h \
cci_message.h cci_stream.c cci_stream.h cci_types.h
diff --git a/src/ccapi/common/unix/Makefile.in b/src/ccapi/common/unix/Makefile.in
index 1c2acebd8..4b176fc80 100644
--- a/src/ccapi/common/unix/Makefile.in
+++ b/src/ccapi/common/unix/Makefile.in
@@ -1,5 +1,3 @@
-thisconfigdir=../../..
-myfulldir=ccapi/common/unix
mydir=ccapi/common/unix
BUILDTOP=$(REL)..$(S)..$(S)..