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

[krb5.git] / src / kadmin / dbutil / Makefile.in

diff --git a/src/kadmin/dbutil/Makefile.in b/src/kadmin/dbutil/Makefile.in
index f49072bea2741ef72458f745c1f78aaa15a399b7..2c13827e1358151d419ed7e3396fbf1e3bbb806e 100644 (file)
--- a/src/kadmin/dbutil/Makefile.in
+++ b/src/kadmin/dbutil/Makefile.in
@@ -1,18 +1,25 @@
-thisconfigdir=.
-BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) -DKDB4_DISABLE -I. $(LOCALINCLUDE) @KRB4_INCLUDES@ 
-PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
+mydir=kadmin$(S)dbutil
+BUILDTOP=$(REL)..$(S)..
+DEFS=
+LOCALINCLUDES = -I.
+PROG_LIBPATH=-L$(TOPLIBD) $(KRB5_LIBPATH)
 PROG_RPATH=$(KRB5_LIBDIR)
+KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
 
 PROG = kdb5_util
-OBJS   = kdb5_util.o dump.o dumpv4.o loadv4.o \
-       kdb5_create.o kadm5_create.o string_table.o kdb5_stash.o \
-       kdb5_destroy.o ovload.o import_err.o strtok.o
+
+SRCS = kdb5_util.c kdb5_create.c kadm5_create.c kdb5_destroy.c \
+          kdb5_stash.c import_err.c strtok.c dump.c ovload.c kdb5_mkey.c
+
+OBJS = kdb5_util.o kdb5_create.o kadm5_create.o kdb5_destroy.o \
+          kdb5_stash.o import_err.o strtok.o dump.o ovload.o kdb5_mkey.o
+
+GETDATE = ../cli/getdate.o
 
 all:: $(PROG)
 
-$(PROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB4COMPAT_DEPLIBS)
-       $(CC_LINK) -o $(PROG) $(OBJS) $(KADMSRV_LIBS) $(KRB4COMPAT_LIBS)
+$(PROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(GETDATE)
+       $(CC_LINK) -o $(PROG) $(OBJS) $(GETDATE) $(KADMSRV_LIBS) $(KDB_DEP_LIB) $(KRB5_BASE_LIBS)
 
 import_err.c import_err.h: $(srcdir)/import_err.et
 
@@ -24,3 +31,5 @@ install::
 
 clean::
        $(RM) $(PROG) $(OBJS) import_err.c import_err.h
+
+depend:: import_err.h