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/ccapi | |
parent | d4afef7bcb12da240ea501aa3d274092569b11dc (diff) | |
download | krb5-ee7c901f80fc9057ed6bd1f91d04859d764fb046.zip krb5-ee7c901f80fc9057ed6bd1f91d04859d764fb046.tar.gz krb5-ee7c901f80fc9057ed6bd1f91d04859d764fb046.tar.bz2 |
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')
-rw-r--r-- | src/ccapi/Makefile.in | 2 | ||||
-rw-r--r-- | src/ccapi/common/Makefile.in | 14 | ||||
-rw-r--r-- | src/ccapi/common/unix/Makefile.in | 2 | ||||
-rw-r--r-- | src/ccapi/lib/Makefile.in | 2 | ||||
-rw-r--r-- | src/ccapi/lib/deps | 54 | ||||
-rw-r--r-- | src/ccapi/lib/unix/Makefile.in | 2 | ||||
-rw-r--r-- | src/ccapi/server/Makefile.in | 2 | ||||
-rw-r--r-- | src/ccapi/server/deps | 84 | ||||
-rw-r--r-- | src/ccapi/server/unix/Makefile.in | 2 | ||||
-rw-r--r-- | src/ccapi/test/Makefile.in | 2 |
10 files changed, 75 insertions, 91 deletions
diff --git a/src/ccapi/Makefile.in b/src/ccapi/Makefile.in index 85e81f6..43d5fc0 100644 --- a/src/ccapi/Makefile.in +++ b/src/ccapi/Makefile.in @@ -1,5 +1,3 @@ -thisconfigdir=.. -myfulldir=ccapi mydir=ccapi BUILDTOP=$(REL).. diff --git a/src/ccapi/common/Makefile.in b/src/ccapi/common/Makefile.in index cc5d5c0..7693485 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 1c2aceb..4b176fc 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).. diff --git a/src/ccapi/lib/Makefile.in b/src/ccapi/lib/Makefile.in index 89cec5b..1e2e13d 100644 --- a/src/ccapi/lib/Makefile.in +++ b/src/ccapi/lib/Makefile.in @@ -1,5 +1,3 @@ -thisconfigdir=../.. -myfulldir=ccapi/lib mydir=ccapi/lib BUILDTOP=$(REL)..$(S).. SUBDIRS=unix diff --git a/src/ccapi/lib/deps b/src/ccapi/lib/deps index 70c5269..ad996d9 100644 --- a/src/ccapi/lib/deps +++ b/src/ccapi/lib/deps @@ -2,27 +2,27 @@ # Generated makefile dependencies follow. # ccapi_ccache.so ccapi_ccache.po $(OUTPRE)ccapi_ccache.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ ccapi_ccache.c ccapi_ccache.h ccapi_credentials.h ccapi_credentials_iterator.h \ ccapi_ipc.h ccapi_string.h ccapi_ccache_iterator.so ccapi_ccache_iterator.po $(OUTPRE)ccapi_ccache_iterator.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ ccapi_ccache.h ccapi_ccache_iterator.c ccapi_ccache_iterator.h \ ccapi_ipc.h ccapi_context.so ccapi_context.po $(OUTPRE)ccapi_context.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ @@ -31,26 +31,26 @@ ccapi_context.so ccapi_context.po $(OUTPRE)ccapi_context.$(OBJEXT): \ ccapi_ipc.h ccapi_string.h ccapi_context_change_time.so ccapi_context_change_time.po \ $(OUTPRE)ccapi_context_change_time.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ ccapi_context_change_time.c ccapi_context_change_time.h ccapi_credentials.so ccapi_credentials.po $(OUTPRE)ccapi_credentials.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ ccapi_credentials.c ccapi_credentials.h ccapi_string.h ccapi_credentials_iterator.so ccapi_credentials_iterator.po \ $(OUTPRE)ccapi_credentials_iterator.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ @@ -59,25 +59,25 @@ ccapi_credentials_iterator.so ccapi_credentials_iterator.po \ ccapi_err.so ccapi_err.po $(OUTPRE)ccapi_err.$(OBJEXT): \ $(COM_ERR_DEPS) ccapi_err.c ccapi_ipc.so ccapi_ipc.po $(OUTPRE)ccapi_ipc.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ ccapi_ipc.c ccapi_ipc.h ccapi_os_ipc.h ccapi_string.so ccapi_string.po $(OUTPRE)ccapi_string.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ ccapi_string.c ccapi_string.h ccapi_v2.so ccapi_v2.po $(OUTPRE)ccapi_v2.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ diff --git a/src/ccapi/lib/unix/Makefile.in b/src/ccapi/lib/unix/Makefile.in index 383159f..8a043c9 100644 --- a/src/ccapi/lib/unix/Makefile.in +++ b/src/ccapi/lib/unix/Makefile.in @@ -1,5 +1,3 @@ -thisconfigdir=../../.. -myfulldir=ccapi/lib/unix mydir=ccapi/lib/unix BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES= -I$(srcdir)/.. -I$(srcdir)/../../common diff --git a/src/ccapi/server/Makefile.in b/src/ccapi/server/Makefile.in index 17c7959..0ca140b 100644 --- a/src/ccapi/server/Makefile.in +++ b/src/ccapi/server/Makefile.in @@ -1,5 +1,3 @@ -thisconfigdir=../.. -myfulldir=ccapi/server mydir=ccapi/server BUILDTOP=$(REL)..$(S).. SUBDIRS=unix diff --git a/src/ccapi/server/deps b/src/ccapi/server/deps index 29d4244..31582f5 100644 --- a/src/ccapi/server/deps +++ b/src/ccapi/server/deps @@ -2,9 +2,9 @@ # Generated makefile dependencies follow. # ccs_array.so ccs_array.po $(OUTPRE)ccs_array.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_array_internal.h $(srcdir)/../common/cci_common.h \ $(srcdir)/../common/cci_cred_union.h $(srcdir)/../common/cci_debugging.h \ $(srcdir)/../common/cci_identifier.h $(srcdir)/../common/cci_message.h \ @@ -14,9 +14,9 @@ ccs_array.so ccs_array.po $(OUTPRE)ccs_array.$(OBJEXT): \ ccs_credentials_iterator.h ccs_list.h ccs_lock.h ccs_lock_state.h \ ccs_pipe.h ccs_server.h ccs_types.h ccs_cache_collection.so ccs_cache_collection.po $(OUTPRE)ccs_cache_collection.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ @@ -26,9 +26,9 @@ ccs_cache_collection.so ccs_cache_collection.po $(OUTPRE)ccs_cache_collection.$( ccs_list.h ccs_lock.h ccs_lock_state.h ccs_os_notify.h \ ccs_pipe.h ccs_server.h ccs_types.h ccs_callback.so ccs_callback.po $(OUTPRE)ccs_callback.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ @@ -38,9 +38,9 @@ ccs_callback.so ccs_callback.po $(OUTPRE)ccs_callback.$(OBJEXT): \ ccs_lock.h ccs_lock_state.h ccs_pipe.h ccs_server.h \ ccs_types.h ccs_ccache.so ccs_ccache.po $(OUTPRE)ccs_ccache.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ @@ -50,9 +50,9 @@ ccs_ccache.so ccs_ccache.po $(OUTPRE)ccs_ccache.$(OBJEXT): \ ccs_lock.h ccs_lock_state.h ccs_os_notify.h ccs_pipe.h \ ccs_server.h ccs_types.h ccs_ccache_iterator.so ccs_ccache_iterator.po $(OUTPRE)ccs_ccache_iterator.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ @@ -62,9 +62,9 @@ ccs_ccache_iterator.so ccs_ccache_iterator.po $(OUTPRE)ccs_ccache_iterator.$(OBJ ccs_list.h ccs_lock.h ccs_lock_state.h ccs_pipe.h ccs_server.h \ ccs_types.h ccs_client.so ccs_client.po $(OUTPRE)ccs_client.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ @@ -74,9 +74,9 @@ ccs_client.so ccs_client.po $(OUTPRE)ccs_client.$(OBJEXT): \ ccs_lock.h ccs_lock_state.h ccs_pipe.h ccs_server.h \ ccs_types.h ccs_credentials.so ccs_credentials.po $(OUTPRE)ccs_credentials.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ @@ -87,9 +87,9 @@ ccs_credentials.so ccs_credentials.po $(OUTPRE)ccs_credentials.$(OBJEXT): \ ccs_types.h ccs_credentials_iterator.so ccs_credentials_iterator.po \ $(OUTPRE)ccs_credentials_iterator.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ @@ -99,9 +99,9 @@ ccs_credentials_iterator.so ccs_credentials_iterator.po \ ccs_list.h ccs_lock.h ccs_lock_state.h ccs_pipe.h ccs_server.h \ ccs_types.h ccs_list.so ccs_list.po $(OUTPRE)ccs_list.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_array_internal.h $(srcdir)/../common/cci_common.h \ $(srcdir)/../common/cci_cred_union.h $(srcdir)/../common/cci_debugging.h \ $(srcdir)/../common/cci_identifier.h $(srcdir)/../common/cci_message.h \ @@ -111,9 +111,9 @@ ccs_list.so ccs_list.po $(OUTPRE)ccs_list.$(OBJEXT): \ ccs_list.c ccs_list.h ccs_list_internal.h ccs_lock.h \ ccs_lock_state.h ccs_pipe.h ccs_server.h ccs_types.h ccs_list_internal.so ccs_list_internal.po $(OUTPRE)ccs_list_internal.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_array_internal.h $(srcdir)/../common/cci_common.h \ $(srcdir)/../common/cci_cred_union.h $(srcdir)/../common/cci_debugging.h \ $(srcdir)/../common/cci_identifier.h $(srcdir)/../common/cci_message.h \ @@ -124,9 +124,9 @@ ccs_list_internal.so ccs_list_internal.po $(OUTPRE)ccs_list_internal.$(OBJEXT): ccs_lock.h ccs_lock_state.h ccs_pipe.h ccs_server.h \ ccs_types.h ccs_lock.so ccs_lock.po $(OUTPRE)ccs_lock.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ @@ -135,9 +135,9 @@ ccs_lock.so ccs_lock.po $(OUTPRE)ccs_lock.$(OBJEXT): \ ccs_credentials_iterator.h ccs_list.h ccs_lock.c ccs_lock.h \ ccs_lock_state.h ccs_pipe.h ccs_server.h ccs_types.h ccs_lock_state.so ccs_lock_state.po $(OUTPRE)ccs_lock_state.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ @@ -146,9 +146,9 @@ ccs_lock_state.so ccs_lock_state.po $(OUTPRE)ccs_lock_state.$(OBJEXT): \ ccs_credentials_iterator.h ccs_list.h ccs_lock.h ccs_lock_state.c \ ccs_lock_state.h ccs_pipe.h ccs_server.h ccs_types.h ccs_pipe.so ccs_pipe.po $(OUTPRE)ccs_pipe.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ @@ -157,9 +157,9 @@ ccs_pipe.so ccs_pipe.po $(OUTPRE)ccs_pipe.$(OBJEXT): \ ccs_credentials_iterator.h ccs_list.h ccs_lock.h ccs_lock_state.h \ ccs_os_pipe.h ccs_pipe.c ccs_pipe.h ccs_server.h ccs_types.h ccs_server.so ccs_server.po $(OUTPRE)ccs_server.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(SRCTOP)/include/CredentialsCache.h \ - $(SRCTOP)/include/CredentialsCache2.h $(SRCTOP)/include/k5-ipc_stream.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) $(top_srcdir)/include/CredentialsCache.h \ + $(top_srcdir)/include/CredentialsCache2.h $(top_srcdir)/include/k5-ipc_stream.h \ + $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \ $(srcdir)/../common/cci_common.h $(srcdir)/../common/cci_cred_union.h \ $(srcdir)/../common/cci_debugging.h $(srcdir)/../common/cci_identifier.h \ $(srcdir)/../common/cci_message.h $(srcdir)/../common/cci_types.h \ diff --git a/src/ccapi/server/unix/Makefile.in b/src/ccapi/server/unix/Makefile.in index 9f0ae74..5268260 100644 --- a/src/ccapi/server/unix/Makefile.in +++ b/src/ccapi/server/unix/Makefile.in @@ -1,5 +1,3 @@ -thisconfigdir=../../.. -myfulldir=ccapi/server/unix mydir=ccapi/server/unix BUILDTOP=$(REL)..$(S)..$(S).. diff --git a/src/ccapi/test/Makefile.in b/src/ccapi/test/Makefile.in index 9edab53..175e06b 100644 --- a/src/ccapi/test/Makefile.in +++ b/src/ccapi/test/Makefile.in @@ -1,5 +1,3 @@ -thisconfigdir=..$(S).. -myfulldir=ccapi$(S)test mydir=ccapi$(S)test BUILDTOP=..$(S).. CCAPI=$(BUILDTOP)$(S)CCAPI |