From b6d9890960471720c6dcbf1a3e85f21fc5dfd9cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Wed, 17 Jan 2007 17:30:31 +0000 Subject: [PATCH] update version number and remove depenency on libvers for libraries git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19974 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/asn1/Makefile.am | 6 ++++-- lib/com_err/Makefile.am | 2 +- lib/des/Makefile.am | 4 ++-- lib/gssapi/Makefile.am | 4 +++- lib/hdb/Makefile.am | 2 +- lib/hx509/Makefile.am | 3 ++- lib/kadm5/Makefile.am | 4 ++-- lib/kafs/Makefile.am | 2 +- lib/kdfs/Makefile.am | 2 +- lib/krb5/Makefile.am | 4 ++-- lib/ntlm/Makefile.am | 4 +++- lib/otp/Makefile.am | 2 +- lib/roken/Makefile.am | 2 +- lib/sl/Makefile.am | 4 ++-- 14 files changed, 26 insertions(+), 19 deletions(-) diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am index 590dd7b76..280ff59a6 100644 --- a/lib/asn1/Makefile.am +++ b/lib/asn1/Makefile.am @@ -5,9 +5,11 @@ include $(top_srcdir)/Makefile.am.common YFLAGS = -d -t lib_LTLIBRARIES = libasn1.la -libasn1_la_LDFLAGS = -version-info 6:1:1 +libasn1_la_LDFLAGS = -version-info 7:0:0 -libasn1_la_LIBADD = @LIB_com_err@ $(LIB_roken) +libasn1_la_LIBADD = \ + @LIB_com_err@ \ + $(top_builddir)/lib/roken/libroken.la BUILT_SOURCES = \ $(gen_files_rfc2459:.x=.c) \ diff --git a/lib/com_err/Makefile.am b/lib/com_err/Makefile.am index 65f3e65f1..7b687c694 100644 --- a/lib/com_err/Makefile.am +++ b/lib/com_err/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS += $(ROKEN_RENAME) YFLAGS = -d lib_LTLIBRARIES = libcom_err.la -libcom_err_la_LDFLAGS = -version-info 2:1:1 +libcom_err_la_LDFLAGS = -version-info 2:2:1 bin_PROGRAMS = compile_et diff --git a/lib/des/Makefile.am b/lib/des/Makefile.am index 4394423b1..283a01c00 100644 --- a/lib/des/Makefile.am +++ b/lib/des/Makefile.am @@ -3,11 +3,11 @@ include $(top_srcdir)/Makefile.am.common lib_LTLIBRARIES = libhcrypto.la -libhcrypto_la_LDFLAGS = -version-info 3:1:0 +libhcrypto_la_LDFLAGS = -version-info 4:0:0 libhcrypto_la_LIBADD = \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_dlopen) \ - $(LIB_roken) + $(top_builddir)/lib/roken/libroken.la hcryptoincludedir = $(includedir)/hcrypto buildhcryptoinclude = $(buildinclude)/hcrypto diff --git a/lib/gssapi/Makefile.am b/lib/gssapi/Makefile.am index 27bb0057a..1f49ee4de 100644 --- a/lib/gssapi/Makefile.am +++ b/lib/gssapi/Makefile.am @@ -187,13 +187,15 @@ nodist_libgssapi_la_SOURCES = \ gkrb5_err.h \ $(BUILT_SOURCES) +libgssapi_la_LDFLAGS = -version-info 1:0:0 + libgssapi_la_LIBADD = \ $(top_builddir)/lib/ntlm/libheimntlm.la \ $(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_com_err) \ $(LIB_des) \ - $(LIB_roken) + $(top_builddir)/lib/roken/libroken.la man_MANS = gssapi.3 gss_acquire_cred.3 diff --git a/lib/hdb/Makefile.am b/lib/hdb/Makefile.am index b1f4877f4..c51e5047a 100644 --- a/lib/hdb/Makefile.am +++ b/lib/hdb/Makefile.am @@ -49,7 +49,7 @@ endif lib_LTLIBRARIES = libhdb.la $(ldap_so) -libhdb_la_LDFLAGS = -version-info 8:0:1 +libhdb_la_LDFLAGS = -version-info 9:0:0 dist_libhdb_la_SOURCES = \ common.c \ diff --git a/lib/hx509/Makefile.am b/lib/hx509/Makefile.am index 833a7ee49..27644f9cf 100644 --- a/lib/hx509/Makefile.am +++ b/lib/hx509/Makefile.am @@ -82,7 +82,8 @@ libhx509_la_LIBADD = \ $(LIB_com_err) \ $(LIB_des) \ $(top_builddir)/lib/asn1/libasn1.la \ - $(LIB_roken) $(LIB_dlopen) + $(top_builddir)/lib/roken/libroken.la + $(LIB_dlopen) libhx509_la_CPPFLAGS = -I$(srcdir)/ref $(INCLUDE_des) nodist_libhx509_la_SOURCES = $(BUILT_SOURCES) diff --git a/lib/kadm5/Makefile.am b/lib/kadm5/Makefile.am index 6096af3e2..8e99c1d0b 100644 --- a/lib/kadm5/Makefile.am +++ b/lib/kadm5/Makefile.am @@ -5,8 +5,8 @@ include $(top_srcdir)/Makefile.am.common SLC = $(top_builddir)/lib/sl/slc lib_LTLIBRARIES = libkadm5srv.la libkadm5clnt.la -libkadm5srv_la_LDFLAGS = -version-info 7:7:0 -libkadm5clnt_la_LDFLAGS = -version-info 6:5:2 +libkadm5srv_la_LDFLAGS = -version-info 8:0:0 +libkadm5clnt_la_LDFLAGS = -version-info 7:0:0 sbin_PROGRAMS = iprop-log check_PROGRAMS = default_keys noinst_PROGRAMS = test_pw_quality diff --git a/lib/kafs/Makefile.am b/lib/kafs/Makefile.am index 8a8141e5f..844179d0a 100644 --- a/lib/kafs/Makefile.am +++ b/lib/kafs/Makefile.am @@ -54,7 +54,7 @@ endif # AIX libkafs_la_LIBADD = $(DEPLIB_krb5) ../roken/libroken.la $(DEPLIB_krb4) lib_LTLIBRARIES = libkafs.la -libkafs_la_LDFLAGS = -version-info 4:1:4 +libkafs_la_LDFLAGS = -version-info 5:0:5 foodir = $(libdir) foo_DATA = $(AFS_EXTRA_LIBS) # EXTRA_DATA = afslib.so diff --git a/lib/kdfs/Makefile.am b/lib/kdfs/Makefile.am index 4e7a9c6d0..6732efc4d 100644 --- a/lib/kdfs/Makefile.am +++ b/lib/kdfs/Makefile.am @@ -7,4 +7,4 @@ lib_LTLIBRARIES = libkdfs.la libkdfs_la_SOURCES = \ k5dfspag.c -libkdfs_la_LDFLAGS = -version-info 0:2:0 +libkdfs_la_LDFLAGS = -version-info 0:3:0 diff --git a/lib/krb5/Makefile.am b/lib/krb5/Makefile.am index 01c1f37a9..1647fdd71 100644 --- a/lib/krb5/Makefile.am +++ b/lib/krb5/Makefile.am @@ -51,7 +51,7 @@ libkrb5_la_LIBADD = \ $(LIB_com_err) \ $(LIB_des) \ $(top_builddir)/lib/asn1/libasn1.la \ - $(LIB_roken) \ + $(top_builddir)/lib/roken/libroken.la \ $(LIB_door_create) \ $(LIB_dlopen) @@ -172,7 +172,7 @@ dist_libkrb5_la_SOURCES = \ nodist_libkrb5_la_SOURCES = \ $(ERR_FILES) -libkrb5_la_LDFLAGS = -version-info 21:0:4 +libkrb5_la_LDFLAGS = -version-info 22:0:0 $(libkrb5_la_OBJECTS): $(srcdir)/krb5-protos.h $(srcdir)/krb5-private.h diff --git a/lib/ntlm/Makefile.am b/lib/ntlm/Makefile.am index 09af0d15f..ae8ad17fd 100644 --- a/lib/ntlm/Makefile.am +++ b/lib/ntlm/Makefile.am @@ -8,9 +8,11 @@ include_HEADERS = heimntlm.h heimntlm-protos.h libheimntlm_la_SOURCES = ntlm.c +libheimntlm_la_LDFLAGS = -version-info 0:0:0 + libheimntlm_la_LIBADD = \ ../krb5/libkrb5.la \ - $(LIB_roken) + $(top_builddir)/lib/roken/libroken.la $(srcdir)/heimntlm-protos.h: cd $(srcdir) && perl ../../cf/make-proto.pl -q -P comment -o heimntlm-protos.h $(libheimntlm_la_SOURCES) || rm -f heimntlm-protos.h diff --git a/lib/otp/Makefile.am b/lib/otp/Makefile.am index 5939ddb1e..881d83280 100644 --- a/lib/otp/Makefile.am +++ b/lib/otp/Makefile.am @@ -13,7 +13,7 @@ otptest_LDADD = libotp.la include_HEADERS = otp.h lib_LTLIBRARIES = libotp.la -libotp_la_LDFLAGS = -version-info 1:3:1 +libotp_la_LDFLAGS = -version-info 1:4:1 libotp_la_LIBADD = $(LIB_des) $(LIB_roken) $(LIB_NDBM) if HAVE_DB3 diff --git a/lib/roken/Makefile.am b/lib/roken/Makefile.am index 083e56f6a..0785ccfce 100644 --- a/lib/roken/Makefile.am +++ b/lib/roken/Makefile.am @@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../cf CLEANFILES = roken.h make-roken.c $(XHEADERS) lib_LTLIBRARIES = libroken.la -libroken_la_LDFLAGS = -version-info 17:0:1 +libroken_la_LDFLAGS = -version-info 18:0:0 libroken_la_CPPFLAGS = -DBUILD_ROKEN_LIB # XXX this is needed for the LIBOBJS objects diff --git a/lib/sl/Makefile.am b/lib/sl/Makefile.am index 155173e69..bbf2ec951 100644 --- a/lib/sl/Makefile.am +++ b/lib/sl/Makefile.am @@ -13,8 +13,8 @@ YFLAGS = -d include_HEADERS = sl.h lib_LTLIBRARIES = libsl.la libss.la -libsl_la_LDFLAGS = -version-info 1:2:1 -libss_la_LDFLAGS = -version-info 1:4:1 +libsl_la_LDFLAGS = -version-info 2:0:2 +libss_la_LDFLAGS = -version-info 1:5:1 libsl_la_LIBADD = @LIB_readline@ libss_la_LIBADD = @LIB_readline@ @LIB_com_err@