pull up r24469, r24530, r24533, r24534, r24535, r24537 from trunk

[krb5.git] / src / lib / gssapi / krb5 / Makefile.in

diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 645b91b11279911cf3c072c25ab57a427b85c8f9..0ff0d39b2c464554492520629b32f8c682897744 100644 (file)
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -1,6 +1,4 @@
-thisconfigdir=../../..
-myfulldir=lib/gssapi/krb5
-mydir=lib/gssapi/krb5
+mydir=lib$(S)gssapi$(S)krb5
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/.. -I../generic -I$(srcdir)/../generic -I../mechglue -I$(srcdir)/../mechglue
 DEFS=-D_GSS_STATIC_LINK=1
@@ -41,7 +39,6 @@ gssapi_err_krb5.c: gssapi_err_krb5.et
 SRCS = \
        $(srcdir)/accept_sec_context.c \
        $(srcdir)/acquire_cred.c \
-       $(srcdir)/add_cred.c \
        $(srcdir)/canon_name.c \
        $(srcdir)/compare_name.c \
        $(srcdir)/context_time.c \
@@ -54,6 +51,7 @@ SRCS = \
        $(srcdir)/export_sec_context.c \
        $(srcdir)/get_tkt_flags.c \
        $(srcdir)/gssapi_krb5.c \
+       $(srcdir)/iakerb.c \
        $(srcdir)/import_name.c \
        $(srcdir)/import_sec_context.c \
        $(srcdir)/indicate_mechs.c \
@@ -69,6 +67,8 @@ SRCS = \
        $(srcdir)/k5unsealiov.c \
        $(srcdir)/krb5_gss_glue.c \
        $(srcdir)/lucid_context.c \
+       $(srcdir)/naming_exts.c \
+       $(srcdir)/prf.c \
        $(srcdir)/process_context_token.c \
        $(srcdir)/rel_cred.c \
        $(srcdir)/rel_oid.c \
@@ -79,6 +79,7 @@ SRCS = \
        $(srcdir)/ser_sctx.c \
        $(srcdir)/set_ccache.c \
        $(srcdir)/sign.c \
+       $(srcdir)/store_cred.c \
        $(srcdir)/unseal.c \
        $(srcdir)/util_cksum.c \
        $(srcdir)/util_crypt.c \
@@ -92,7 +93,6 @@ SRCS = \
 OBJS = \
        $(OUTPRE)accept_sec_context.$(OBJEXT) \
        $(OUTPRE)acquire_cred.$(OBJEXT) \
-       $(OUTPRE)add_cred.$(OBJEXT) \
        $(OUTPRE)canon_name.$(OBJEXT) \
        $(OUTPRE)compare_name.$(OBJEXT) \
        $(OUTPRE)context_time.$(OBJEXT) \
@@ -105,6 +105,7 @@ OBJS = \
        $(OUTPRE)export_sec_context.$(OBJEXT) \
        $(OUTPRE)get_tkt_flags.$(OBJEXT) \
        $(OUTPRE)gssapi_krb5.$(OBJEXT) \
+       $(OUTPRE)iakerb.$(OBJEXT) \
        $(OUTPRE)import_name.$(OBJEXT) \
        $(OUTPRE)import_sec_context.$(OBJEXT) \
        $(OUTPRE)indicate_mechs.$(OBJEXT) \
@@ -120,6 +121,8 @@ OBJS = \
        $(OUTPRE)k5unsealiov.$(OBJEXT) \
        $(OUTPRE)krb5_gss_glue.$(OBJEXT) \
        $(OUTPRE)lucid_context.$(OBJEXT) \
+       $(OUTPRE)naming_exts.$(OBJEXT) \
+       $(OUTPRE)prf.$(OBJEXT) \
        $(OUTPRE)process_context_token.$(OBJEXT) \
        $(OUTPRE)rel_cred.$(OBJEXT) \
        $(OUTPRE)rel_oid.$(OBJEXT) \
@@ -130,6 +133,7 @@ OBJS = \
        $(OUTPRE)ser_sctx.$(OBJEXT) \
        $(OUTPRE)set_ccache.$(OBJEXT) \
        $(OUTPRE)sign.$(OBJEXT) \
+       $(OUTPRE)store_cred.$(OBJEXT) \
        $(OUTPRE)unseal.$(OBJEXT) \
        $(OUTPRE)util_cksum.$(OBJEXT) \
        $(OUTPRE)util_crypt.$(OBJEXT) \
@@ -146,7 +150,6 @@ OBJS = \
 STLIBOBJS = \
        accept_sec_context.o \
        acquire_cred.o \
-       add_cred.o \
        canon_name.o \
        compare_name.o \
        context_time.o \
@@ -159,6 +162,7 @@ STLIBOBJS = \
        export_sec_context.o \
        get_tkt_flags.o \
        gssapi_krb5.o \
+       iakerb.o \
        import_name.o \
        import_sec_context.o \
        indicate_mechs.o \
@@ -174,6 +178,8 @@ STLIBOBJS = \
        k5unsealiov.o \
        krb5_gss_glue.o \
        lucid_context.o \
+       naming_exts.o \
+       prf.o \
        process_context_token.o \
        rel_cred.o \
        rel_oid.o \
@@ -184,6 +190,7 @@ STLIBOBJS = \
        ser_sctx.o \
        set_ccache.o \
        sign.o \
+       store_cred.o \
        unseal.o \
        util_cksum.o \
        util_crypt.o \
@@ -221,14 +228,17 @@ $(GSSAPI_KRB5_HDR): gssapi_krb5.h
 all-unix:: $(SRCS) $(HDRS) $(GSSAPI_KRB5_HDR) includes
 all-unix:: all-libobjs
 
-error_map.h: $(SRCTOP)/util/gen-map.pl $(SRCTOP)/util/ktemplate.pm Makefile
-       $(PERL) -I$(SRCTOP)/util $(SRCTOP)/util/gen-map.pl -oerror_map.new \
+error_map.h: $(top_srcdir)/util/gen-map.pl \
+               $(top_srcdir)/util/ktemplate.pm Makefile
+       $(PERL) -I$(top_srcdir)/util $(top_srcdir)/util/gen-map.pl \
+               -oerror_map.new \
                NAME=gsserrmap \
                KEY=OM_uint32 \
                VALUE="char *" \
                COMPARE=compare_OM_uint32 \
                FREEVALUE=free_string
-       $(MV) error_map.new error_map.h
+       $(RM) $@
+       $(MV) error_map.new $@
 
 clean-unix::
        $(RM) $(BUILDTOP)/include/gssapi/gssapi_krb5.h