Change the way the library is built to use the libupdate script

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

diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 5ad72d5312e09194c80bfb3fafef788e5893e555..a08c874f0dee5b6bd163251c9a65cf5a27da838f 100644 (file)
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov  1 14:56:47 1994    (tytso@rsx-11)
+
+       * Makefile.in:
+       * configure.in: Change the way the library is built to use the
+               libupdate script.
+
 Mon Oct  3 21:11:19 1994  Theodore Y. Ts'o  (tytso@dcl)
 
        * Makefile.in: make install obey $(DESTDIR)

diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index 61a88611216bd6be74a7e233adca6e485493247c..56838ac0c5acec08797497adf5b1b7cfbc9c2194 100644 (file)
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -1,27 +1,34 @@
 TST=if test -n "`cat DONE`" ; then
 
-all::
+LIB_SUBDIRS= error_tables asn.1 ccache ccache/stdio ccache/file \
+       keytab keytab/file krb rcache free os posix
+LIBUPDATE= $(BUILDTOP)/util/libupdate
+
+all:: 
+
+libkrb5_ranlib: libkrb5.a
+       $(RANLIB) libkrb5.a
+       touch $@
 
 libkrb5.a: error_tables/DONE asn.1/DONE ccache/DONE ccache/stdio/DONE \
                ccache/file/DONE keytab/DONE keytab/file/DONE krb/DONE \
                rcache/DONE free/DONE os/DONE posix/DONE
-       (cd error_tables; $(TST) $(ARADD) ../$@ `cat DONE` ; fi)
-       (cd asn.1; $(TST) $(ARADD) ../$@ `cat DONE` ; fi)
-       (cd ccache; $(TST) $(ARADD) ../$@ `cat DONE` ; fi)
-       (cd ccache/stdio; $(TST) $(ARADD) ../../$@ `cat DONE` ; fi)
-       (cd ccache/file; $(TST) $(ARADD) ../../$@ `cat DONE` ; fi)
-       (cd keytab; $(TST) $(ARADD) ../$@ `cat DONE` ; fi)
-       (cd keytab/file; $(TST) $(ARADD) ../../$@ `cat DONE` ; fi)
-       (cd krb; $(TST) $(ARADD) ../$@ `cat DONE` ; fi)
-       (cd rcache; $(TST) $(ARADD) ../$@ `cat DONE` ; fi)
-       (cd free; $(TST) $(ARADD) ../$@ `cat DONE` ; fi)
-       (cd os; $(TST) $(ARADD) ../$@ `cat DONE` ; fi)
-       (cd posix; $(TST) $(ARADD) ../$@ `cat DONE` ; fi)
-       $(RANLIB) $@
+       if test -f $@ ; then \
+               for i in $(LIB_SUBDIRS) ; \
+               do \
+                       $(LIBUPDATE) $@ $$i/DONE $$i ; \
+               done \
+       else \
+               for i in $(LIB_SUBDIRS) ; \
+               do \
+                       $(LIBUPDATE) --force $@ $$i/DONE $$i ; \
+               done \
+       fi
+               
 
-install:: libkrb5.a
+install:: libkrb5_ranlib
        $(INSTALL_DATA) libkrb5.a $(DESTDIR)$(KRB5_LIBDIR)/libkrb5.a
        $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libkrb5.a
 
 clean::
-       $(RM) libkrb5.a
+       $(RM) libkrb5.a libkrb5_ranlib

diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in
index 90d1a816715f72a72f166fc1259c015393757301..7306394e4bfa46f12d4e6c2b880652816a2cdf2f 100644 (file)
--- a/src/lib/krb5/configure.in
+++ b/src/lib/krb5/configure.in
@@ -8,7 +8,7 @@ AC_PROG_RANLIB
 AC_PROG_INSTALL
 MAKE_SUBDIRS("making",all)
 MAKE_SUBDIRS("cleaning",clean)
-AppendRule([all:: libkrb5.a])
+AppendRule([all:: libkrb5.a libkrb5_ranlib])
 WITH_CCOPTS
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE