pull up r24469, r24530, r24533, r24534, r24535, r24537 from trunk
[krb5.git] / src / lib / gssapi / krb5 / Makefile.in
index 54990db0bd6a2d5c338e7fe70013c3ff56641a3e..0ff0d39b2c464554492520629b32f8c682897744 100644 (file)
@@ -1,16 +1,33 @@
-thisconfigdir=./..
-myfulldir=lib/gssapi/krb5
-mydir=krb5
-BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic
+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
+
+#PROG_LIBPATH=-L$(TOPLIBD)
+#PROG_RPATH=$(KRB5_LIBDIR)
+#MODULE_INSTALL_DIR = $(GSS_MODULE_DIR)
+#LIBBASE=mech_krb5
+#LIBMAJOR=0
+#LIBMINOR=0
+#SO_EXT=.so
+#LIBINITFUNC=gss_krb5int_init
+#LIBFINIFUNC=gss_krb5int_fini
+#STOBJLISTS=../generic/OBJS.ST OBJS.ST
+#SUBDIROBJLISTS=../generic/OBJS.ST
+#SHLIB_EXPDEPS=$(KRB5_DEPLIB) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) $(COM_ERR_DEPLIB)
+#SHLIB_EXPLIBS=-lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) $(DL_LIB) $(LIBS)
+#SHLIB_DIRS=-L$(TOPLIBD)
+#SHLIB_RDIRS=$(KRB5_LIBDIR)
+#RELDIR=gssapi/krb5
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=krb5
 ##DOS##OBJFILE = ..\$(OUTPRE)krb5.lst
-##WIN16##LIBNAME=..\gssapi.lib
 
 ##DOS##DLL_EXP_TYPE=GSS
 
+include_stdint=@include_stdint@
+##DOS##include_stdint=
 ETSRCS= gssapi_err_krb5.c
 ETOBJS= $(OUTPRE)gssapi_err_krb5.$(OBJEXT)
 ETHDRS= gssapi_err_krb5.h
@@ -22,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 \
@@ -35,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 \
@@ -43,34 +60,39 @@ SRCS = \
        $(srcdir)/inq_cred.c \
        $(srcdir)/inq_names.c \
        $(srcdir)/k5seal.c \
+       $(srcdir)/k5sealiov.c \
+       $(srcdir)/k5sealv3.c \
+       $(srcdir)/k5sealv3iov.c \
        $(srcdir)/k5unseal.c \
+       $(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 \
        $(srcdir)/rel_name.c \
+       $(srcdir)/s4u_gss_glue.c \
        $(srcdir)/seal.c \
+       $(srcdir)/set_allowable_enctypes.c \
        $(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 \
-       $(srcdir)/util_ctxsetup.c \
        $(srcdir)/util_seed.c \
        $(srcdir)/util_seqnum.c \
        $(srcdir)/val_cred.c \
        $(srcdir)/verify.c \
-       $(srcdir)/wrap_size_limit.c \
-       gssapi_err_krb5.c
+       $(srcdir)/wrap_size_limit.c 
 
-#      $(srcdir)/pname_to_uid.c \
-#      $(srcdir)/k5mech.c
 
 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) \
@@ -83,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) \
@@ -91,20 +114,29 @@ OBJS = \
        $(OUTPRE)inq_cred.$(OBJEXT) \
        $(OUTPRE)inq_names.$(OBJEXT) \
        $(OUTPRE)k5seal.$(OBJEXT) \
+       $(OUTPRE)k5sealiov.$(OBJEXT) \
+       $(OUTPRE)k5sealv3.$(OBJEXT) \
+       $(OUTPRE)k5sealv3iov.$(OBJEXT) \
        $(OUTPRE)k5unseal.$(OBJEXT) \
+       $(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) \
        $(OUTPRE)rel_name.$(OBJEXT) \
+       $(OUTPRE)s4u_gss_glue.$(OBJEXT) \
        $(OUTPRE)seal.$(OBJEXT) \
+       $(OUTPRE)set_allowable_enctypes.$(OBJEXT) \
        $(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) \
-       $(OUTPRE)util_ctxsetup.$(OBJEXT) \
        $(OUTPRE)util_seed.$(OBJEXT) \
        $(OUTPRE)util_seqnum.$(OBJEXT) \
        $(OUTPRE)val_cred.$(OBJEXT) \
@@ -118,7 +150,6 @@ OBJS = \
 STLIBOBJS = \
        accept_sec_context.o \
        acquire_cred.o \
-       add_cred.o \
        canon_name.o \
        compare_name.o \
        context_time.o \
@@ -131,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 \
@@ -139,20 +171,29 @@ STLIBOBJS = \
        inq_cred.o \
        inq_names.o \
        k5seal.o \
+       k5sealiov.o \
+       k5sealv3.o \
+       k5sealv3iov.o \
        k5unseal.o \
+       k5unsealiov.o \
        krb5_gss_glue.o \
+       lucid_context.o \
+       naming_exts.o \
+       prf.o \
        process_context_token.o \
        rel_cred.o \
        rel_oid.o \
        rel_name.o \
+       s4u_gss_glue.o \
        seal.o \
+       set_allowable_enctypes.o \
        ser_sctx.o \
        set_ccache.o \
        sign.o \
+       store_cred.o \
        unseal.o \
        util_cksum.o \
        util_crypt.o \
-       util_ctxsetup.o \
        util_seed.o \
        util_seqnum.o \
        val_cred.o \
@@ -172,44 +213,74 @@ EXPORTED_HEADERS= gssapi_krb5.h
 
 GSSAPI_KRB5_HDR=$(EHDRDIR)$(S)gssapi_krb5.h
 
-all-windows:: win-include $(GSSAPI_KRB5_HDR) $(SRCS) $(HDRS)
+all-windows:: $(EHDRDIR) $(GSSAPI_KRB5_HDR) $(SRCS) $(HDRS)
+
+##DOS##$(EHDRDIR):
+##DOS##        mkdir $(EHDRDIR)
 
-all-unix:: $(SRCS) $(HDRS) includes
+MK_EHDRDIR=if test -d $(EHDRDIR); then :; else (set -x; mkdir $(EHDRDIR)); fi
+##DOS##MK_EHDRDIR=rem
+
+$(GSSAPI_KRB5_HDR): gssapi_krb5.h
+       @$(MK_EHDRDIR)
+       $(CP) gssapi_krb5.h "$@"
+
+all-unix:: $(SRCS) $(HDRS) $(GSSAPI_KRB5_HDR) includes
 all-unix:: all-libobjs
 
-includes:: gssapi_krb5.h
-       if cmp $(srcdir)/gssapi_krb5.h \
-       $(BUILDTOP)/include/gssapi/gssapi_krb5.h >/dev/null 2>&1; then :; \
-       else \
-               (set -x; $(RM) $(BUILDTOP)/include/gssapi/gssapi_krb5.h; \
-                $(CP) $(srcdir)/gssapi_krb5.h \
-                       $(BUILDTOP)/include/gssapi/gssapi_krb5.h) ; \
-       fi
+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
+       $(RM) $@
+       $(MV) error_map.new $@
 
 clean-unix::
        $(RM) $(BUILDTOP)/include/gssapi/gssapi_krb5.h
-
-win-include::
-       if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR)
-
-$(GSSAPI_KRB5_HDR): gssapi_krb5.h
-       $(CP) gssapi_krb5.h $@
+       -$(RM) gssapi_krb5.h error_map.h
 
 clean-unix:: clean-libobjs
        $(RM) $(ETHDRS) $(ETSRCS)
 
 clean-windows::
        $(RM) $(EHDRDIR)\gssapi_krb5.h
+       $(RM) error_map.h
        -if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
 
-install::
+
+generate-files-mac: gssapi_krb5.h error_map.h
+
+##DOS##!if 0
+gssapi_krb5.h: gssapi_krb5.hin
+       @echo "Creating gssapi.h" ; \
+       h=gss$$$$; $(RM) $$h; \
+       (echo "/* This is the gssapi_krb5.h prologue. */"; \
+       $(include_stdint) ; \
+       echo "/* End of gssapi_krb5.h prologue. */"; \
+       cat $(srcdir)/gssapi_krb5.hin )> $$h && \
+       (set -x; $(MV) $$h $@) ; e=$$?; $(RM) $$h; exit $$e
+##DOS##!endif
+##DOS### No prologue needed for Windows, the support is
+##DOS### in gssapi_krb5.hin already.
+##DOS##gssapi_krb5.h: gssapi_krb5.hin
+##DOS##        $(CP) gssapi_krb5.hin gssapi_krb5.h
+
+install-headers-unix install::
        @set -x; for f in $(EXPORTED_HEADERS) ; \
-       do $(INSTALL_DATA) $(srcdir)/$$f        \
+       do $(INSTALL_DATA) $$f  \
                $(DESTDIR)$(KRB5_INCDIR)/gssapi/$$f ; \
        done
 
-depend:: $(ETSRCS)
+depend:: $(ETSRCS) $(ETHDRS) $(GSSAPI_KRB5_HDR) error_map.h
 
-includes:: 
+includes::  gssapi_krb5.h
 
 install::
+
+@libobj_frag@
+