Shared library Makefile/configure changes and cleanup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6069 dc483132-0cff-0310-8789-dd5450dbe970

4 files changed, 65 insertions, 47 deletions

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 2c32b96fc..f15bd126f 100644
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Jun 15 18:04:58 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove explicit copying of archive library to library
+		directory.  Add dependency on all-$(WHAT)
+	* configure.in - Create symlink for archive when we build it.
+
 Wed Jun 14 12:37:51 1995  Sam Hartman  <hartmans@tardis.MIT.EDU>
 
 	* configure.in: Check for umask being defined.
diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index bf020847e..1b89c199e 100644
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -4,7 +4,7 @@ LDFLAGS = -g
 LIB_SUBDIRS= $(BUILDTOP)/util/berk_db/hash
 LIBUPDATE=$(BUILDTOP)/util/libupdate
 
-all:: $(OBJS)
+all:: $(OBJS) all-$(WHAT)
 
 
 SRCS= \
@@ -41,9 +41,6 @@ libkdb5.a: $(OBJS) $(BUILDTOP)/util/berk_db/hash/DONE
 		done ; \
 	fi
 	$(RANLIB) $@
-	$(RM) $(TOPLIBD)/libkdb5.a
-	$(CP) libkdb5.a $(BUILDTOP)/lib/libkdb5.a
-	$(RANLIB) $(BUILDTOP)/lib/libkdb5.a
 
 install:: libkdb5.a
 	$(INSTALL_DATA) libkdb5.a $(DESTDIR)$(KRB5_LIBDIR)/libkdb5.a
diff --git a/src/lib/kdb/configure.in b/src/lib/kdb/configure.in
index 1b97e4e15..4272d9a72 100644
--- a/src/lib/kdb/configure.in
+++ b/src/lib/kdb/configure.in
@@ -6,5 +6,7 @@ AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_HAVE_HEADERS(unistd.h)
 AC_CHECK_FUNCS(srand48 srand srandom umask)
+LinkFileDir(../libkdb5.a, libkdb5.a, ./kdb)
 AppendRule([all:: libkdb5.a])
+AppendRule([all-unix:: ../libkdb5.a])
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/kdb/t_kdb.c b/src/lib/kdb/t_kdb.c
index 7807b8aa3..35df1adec 100644
--- a/src/lib/kdb/t_kdb.c
+++ b/src/lib/kdb/t_kdb.c
@@ -237,9 +237,9 @@ gen_principal(kcontext, realm, do_rand, n, princp, namep)
 {
     static char pnamebuf[MAX_PNAME_LEN];
     static char *instnames[] = {
-	"instance1", "xxx2", "whereami3", "ABCDEFG4" };
+	"instance1", "xxx2", "whereami3", "ABCDEFG4", "foofoo5" };
     static char *princnames[] = {
-	"princ1", "user2", "service3", "RANDOM4" };
+	"princ1", "user2", "service3" };
 
     krb5_error_code	kret;
     char		*instname;
@@ -334,7 +334,7 @@ delete_principal(kcontext, principal)
 }
 
 int
-do_testing(db, passes, verbose, timing, rcases, check, save_db)
+do_testing(db, passes, verbose, timing, rcases, check, save_db, dontclean)
     char	*db;
     int		passes;
     int		verbose;
@@ -342,6 +342,7 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db)
     int		rcases;
     int		check;
     int		save_db;
+    int		dontclean;
 {
     krb5_error_code	kret;
     krb5_context	kcontext;
@@ -615,28 +616,30 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db)
 	    }
 	}
 
-	/* Clean up the remaining principals */
-	if (verbose > 1)
-	    fprintf(stdout, "%s: deleting remaining %d principals\n",
-		    programname, nvalid);
-	for (passno=0; passno<nvalid; passno++) {
-	    op = "deleting principal";
-	    if (timing) {
-		swatch_on();
-	    }
-	    if (kret = delete_principal(kcontext,
-					playback_principal(passno))) {
-		linkage = "finally ";
-		oparg = playback_name(passno);
-		goto cya;
-	    }
-	    if (timing) {
-		elapsed = swatch_eltime();
-		accumulated[2].t_time += elapsed;
-		accumulated[2].t_number++;
+	if (!dontclean) {
+	    /* Clean up the remaining principals */
+	    if (verbose > 1)
+		fprintf(stdout, "%s: deleting remaining %d principals\n",
+			programname, nvalid);
+	    for (passno=0; passno<nvalid; passno++) {
+		op = "deleting principal";
+		if (timing) {
+		    swatch_on();
+		}
+		if (kret = delete_principal(kcontext,
+					    playback_principal(passno))) {
+		    linkage = "finally ";
+		    oparg = playback_name(passno);
+		    goto cya;
+		}
+		if (timing) {
+		    elapsed = swatch_eltime();
+		    accumulated[2].t_time += elapsed;
+		    accumulated[2].t_number++;
+		}
+		if (verbose > 4)
+		    fprintf(stderr, "XD(%s)\n", playback_name(passno));
 	    }
-	    if (verbose > 4)
-		fprintf(stderr, "XD(%s)\n", playback_name(passno));
 	}
     cya:
 	if (verbose)
@@ -728,23 +731,27 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db)
 	/*
 	 * Delete principals.
 	 */
-	if (timing) {
-	    swatch_on();
-	}
-	for (passno=passes-1; passno>=0; passno--) {
-	    op = "deleting principal";
-	    if (kret = delete_principal(kcontext,
-					playback_principal(passno)))
-		goto goodbye;
-	    if (verbose > 4)
-		fprintf(stderr, "XD(%s)\n", playback_name(passno));
-	}
-	if (timing) {
-	    elapsed = swatch_eltime();
-	    fprintf(stdout,
-		    "%s: deleted %d principals in %9.4f seconds (%9.4f/delete)\n",
-		    programname, passes, elapsed, elapsed/((float) passes));
+	if (!dontclean) {
+	    if (timing) {
+		swatch_on();
+	    }
+	    for (passno=passes-1; passno>=0; passno--) {
+		op = "deleting principal";
+		if (kret = delete_principal(kcontext,
+					    playback_principal(passno)))
+		    goto goodbye;
+		if (verbose > 4)
+		    fprintf(stderr, "XD(%s)\n", playback_name(passno));
+	    }
+	    if (timing) {
+		elapsed = swatch_eltime();
+		fprintf(stdout,
+			"%s: deleted %d principals in %9.4f seconds (%9.4f/delete)\n",
+			programname, passes, elapsed,
+			elapsed/((float) passes));
+	    }
 	}
+
     }
 
  goodbye:
@@ -789,6 +796,7 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db)
  *		[-v]		- Verbose output.
  *		[-d <dbname>]	- Database name.
  *		[-s]		- Save database even on successful completion.
+ *		[-D]		- Leave database dirty.
  */
 int
 main(argc, argv)
@@ -799,7 +807,7 @@ main(argc, argv)
     extern char	*optarg;
 
     int		do_time, do_random, num_passes, check_cont, verbose, error;
-    int		save_db;
+    int		save_db, dont_clean;
     char	*db_name;
 
     programname = argv[0];
@@ -815,10 +823,11 @@ main(argc, argv)
     verbose = 0;
     db_name = T_KDB_DEF_DB;
     save_db = 0;
+    dont_clean = 0;
     error = 0;
 
     /* Parse argument list */
-    while ((option = getopt(argc, argv, "cd:n:rstv")) != EOF) {
+    while ((option = getopt(argc, argv, "cd:n:rstvD")) != EOF) {
 	switch (option) {
 	case 'c':
 	    check_cont = 1;
@@ -845,6 +854,9 @@ main(argc, argv)
 	case 'v':
 	    verbose++;
 	    break;
+	case 'D':
+	    dont_clean = 1;
+	    break;
 	default:
 	    error++;
 	    break;
@@ -860,6 +872,7 @@ main(argc, argv)
 			   do_time,
 			   do_random,
 			   check_cont,
-			   save_db);
+			   save_db,
+			   dont_clean);
     return(error);
 }