summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1994-11-01 19:57:42 +0000
committerTheodore Tso <tytso@mit.edu>1994-11-01 19:57:42 +0000
commit0100404c668f02124ae994f84f193baace2dbea9 (patch)
tree366a718f0fb5d11019817cc4dbb5910795aade90
parentfcece105ab3038cae188bc3d91656c46ae98db93 (diff)
downloadkrb5-0100404c668f02124ae994f84f193baace2dbea9.tar.gz
krb5-0100404c668f02124ae994f84f193baace2dbea9.tar.xz
krb5-0100404c668f02124ae994f84f193baace2dbea9.zip
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
-rw-r--r--src/lib/krb5/ChangeLog6
-rw-r--r--src/lib/krb5/Makefile.in39
-rw-r--r--src/lib/krb5/configure.in2
3 files changed, 30 insertions, 17 deletions
diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 5ad72d531..a08c874f0 100644
--- 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 61a886112..56838ac0c 100644
--- 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 90d1a8167..7306394e4 100644
--- 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