fix broken checkin

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5652 ec53bebd-3082-4978-b11e-865c3cabbd6b
1999-03-20 13:58:20 +00:00
parent 8beecd24cc
commit 0f23e17f6f
42 changed files with 45 additions and 42 deletions
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 SUBDIRS	= include lib kuser kdc admin kadmin kpasswd appl doc

--- a/admin/Makefile.am
+++ b/admin/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += $(INCLUDE_readline)

--- a/appl/Makefile.am
+++ b/appl/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 SUBDIRS = afsutil ftp login @OTP_dir@ popper push rsh telnet test
 DIST_SUBDIRS = afsutil ftp login otp popper push rsh telnet test
--- a/appl/afsutil/Makefile.am
+++ b/appl/afsutil/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 if KRB4
 AFSPROGS = afslog
--- a/appl/ftp/Makefile.am
+++ b/appl/ftp/Makefile.am
@@ -1,5 +1,5 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 SUBDIRS = common ftp ftpd
--- a/appl/ftp/common/Makefile.am
+++ b/appl/ftp/common/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += $(INCLUDE_krb4) 

--- a/appl/ftp/ftp/Makefile.am
+++ b/appl/ftp/ftp/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += -I$(srcdir)/../common $(INCLUDE_readline) $(INCLUDE_krb4)

--- a/appl/ftp/ftpd/Makefile.am
+++ b/appl/ftp/ftpd/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += -I$(srcdir)/../common $(INCLUDE_krb4) -DFTP_SERVER

--- a/appl/kx/Makefile.am
+++ b/appl/kx/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += $(INCLUDE_krb4) $(X_CFLAGS)

--- a/appl/login/Makefile.am
+++ b/appl/login/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += $(INCLUDE_krb4)

--- a/appl/otp/Makefile.am
+++ b/appl/otp/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 bin_PROGRAMS = otp otpprint
 bin_SUIDS = otp
--- a/appl/popper/Makefile.am
+++ b/appl/popper/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += $(INCLUDE_krb4)

--- a/appl/push/Makefile.am
+++ b/appl/push/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += $(INCLUDE_krb4) $(HESIODINCLUDE)

--- a/appl/rsh/Makefile.am
+++ b/appl/rsh/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += $(INCLUDE_krb4) -DBINDIR=\"$(bindir)\"

--- a/appl/telnet/Makefile.am
+++ b/appl/telnet/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 SUBDIRS = libtelnet telnet telnetd

--- a/appl/telnet/libtelnet/Makefile.am
+++ b/appl/telnet/libtelnet/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += -I$(srcdir)/.. $(INCLUDE_krb4)

--- a/appl/telnet/telnet/Makefile.am
+++ b/appl/telnet/telnet/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += -I$(srcdir)/..

--- a/appl/telnet/telnetd/Makefile.am
+++ b/appl/telnet/telnetd/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += -I$(srcdir)/.. $(INCLUDE_krb4)

--- a/appl/test/Makefile.am
+++ b/appl/test/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 noinst_PROGRAMS = tcp_client tcp_server gssapi_server gssapi_client \
 	uu_server uu_client
--- a/appl/xnlock/Makefile.am
+++ b/appl/xnlock/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += $(INCLUDE_krb4) $(X_CFLAGS) -DBINDIR=\"$(bindir)\"

--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 AUTOMAKE_OPTIONS += no-texinfo.tex

--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 SUBDIRS = kadm5

--- a/include/kadm5/Makefile.am
+++ b/include/kadm5/Makefile.am
@@ -1,5 +1,5 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 CLEANFILES = admin.h kadm5_err.h private.h
--- a/kadmin/Makefile.am
+++ b/kadmin/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += $(INCLUDE_readline)

--- a/kdc/Makefile.am
+++ b/kdc/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += $(INCLUDE_krb4)

--- a/kpasswd/Makefile.am
+++ b/kpasswd/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 man_MANS = kpasswd.1 kpasswdd.8

--- a/kuser/Makefile.am
+++ b/kuser/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += $(INCLUDE_krb4)

--- a/lib/45/Makefile.am
+++ b/lib/45/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += $(INCLUDE_krb4)

--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 if KRB4
 dir_45 = 45
--- a/lib/asn1/Makefile.am
+++ b/lib/asn1/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 SUFFIXES = .x .et .h

--- a/lib/com_err/Makefile.am
+++ b/lib/com_err/Makefile.am
@@ -1,10 +1,11 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 YFLAGS = -d

 lib_LTLIBRARIES = libcom_err.la
+libcom_err_la_LDFLAGS = -version-info 1:0:0

 bin_PROGRAMS = compile_et

--- a/lib/des/Makefile.am
+++ b/lib/des/Makefile.am
@@ -1,8 +1,10 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 lib_LTLIBRARIES = libdes.la
+libdes_la_LDFLAGS = -version-info 0:0:0
+
 include_HEADERS = des.h md4.h md5.h sha.h

 build_HEADERZ = $(include_HEADERS)
--- a/lib/editline/Makefile.am
+++ b/lib/editline/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 man_MANS = editline.3

--- a/lib/gssapi/Makefile.am
+++ b/lib/gssapi/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += -I$(srcdir)/../krb5

--- a/lib/gssapi/krb5/Makefile.am
+++ b/lib/gssapi/krb5/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += -I$(srcdir)/../krb5

--- a/lib/hdb/Makefile.am
+++ b/lib/hdb/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 SUFFIXES = .x .et .h

--- a/lib/kadm5/Makefile.am
+++ b/lib/kadm5/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 lib_LTLIBRARIES = libkadm5srv.la libkadm5clnt.la
 libkadm5srv_la_LDFLAGS = -version-info 1:0:0
--- a/lib/kafs/Makefile.am
+++ b/lib/kafs/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += $(INCLUDE_krb4) -DLIBDIR=\"$(libdir)\" $(AFS_EXTRA_DEFS)

--- a/lib/krb5/Makefile.am
+++ b/lib/krb5/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += $(INCLUDE_krb4)

--- a/lib/otp/Makefile.am
+++ b/lib/otp/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 noinst_PROGRAMS = otptest

--- a/lib/roken/Makefile.am
+++ b/lib/roken/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 CLEANFILES = roken.h make-roken.c print_version.h

--- a/lib/sl/Makefile.am
+++ b/lib/sl/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$

-include $(top_srcdir)/cf/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

 INCLUDES += -DROKEN_RENAME