From 80bfea9891d6276b4e087eaeb4e32ef99e4ce0cf Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Thu, 18 Mar 1999 11:10:02 +0000
Subject: [PATCH] include Makefile.am.common

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5588 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/ftp/Makefile.am      |  3 ++-
 appl/ftp/ftpd/Makefile.am |  6 ++----
 appl/otp/Makefile.am      | 10 ++-------
 doc/Makefile.am           |  4 +++-
 lib/krb5/Makefile.am      | 43 +++++----------------------------------
 5 files changed, 14 insertions(+), 52 deletions(-)

diff --git a/appl/ftp/Makefile.am b/appl/ftp/Makefile.am
index e999cae33..07f260bfb 100644
--- a/appl/ftp/Makefile.am
+++ b/appl/ftp/Makefile.am
@@ -1,4 +1,5 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = foreign no-dependencies
+include $(top_srcdir)/Makefile.am.common
+
 SUBDIRS = common ftp ftpd
diff --git a/appl/ftp/ftpd/Makefile.am b/appl/ftp/ftpd/Makefile.am
index 4b651076f..63857ca14 100644
--- a/appl/ftp/ftpd/Makefile.am
+++ b/appl/ftp/ftpd/Makefile.am
@@ -1,10 +1,8 @@
 # $Id$
 
-CFLAGS = @CFLAGS@ $(WFLAGS)
+include $(top_srcdir)/Makefile.am.common
 
-AUTOMAKE_OPTIONS = foreign no-dependencies
-
-INCLUDES = -I$(srcdir)/../common $(INCLUDE_krb4) -DFTP_SERVER
+INCLUDES += -I$(srcdir)/../common $(INCLUDE_krb4) -DFTP_SERVER
 
 libexec_PROGRAMS = ftpd
 
diff --git a/appl/otp/Makefile.am b/appl/otp/Makefile.am
index 84a48f35d..47346c02c 100644
--- a/appl/otp/Makefile.am
+++ b/appl/otp/Makefile.am
@@ -1,10 +1,9 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = foreign no-dependencies 
-
-CFLAGS = @CFLAGS@ $(WFLAGS)
+include $(top_srcdir)/Makefile.am.common
 
 bin_PROGRAMS = otp otpprint
+bin_SUIDS = otp
 otp_SOURCES = otp.c otp_locl.h
 otpprint_SOURCES = otpprint.c otp_locl.h
 
@@ -13,8 +12,3 @@ LDADD = \
 	$(top_builddir)/lib/des/libdes.la \
 	$(top_builddir)/lib/roken/libroken.la \
 	$(DBLIB)
-
-## XXX how should this be done?
-install-exec-hook:
-	@if chown 0:0 $(DESTDIR)$(bindir)/otp && chmod u+s $(DESTDIR)$(bindir)/otp; then :;else \
-	chmod 0 $(DESTDIR)$(bindir)/otp; fi
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5103275c3..4ba0e2b7e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,8 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = foreign no-dependencies no-texinfo.tex
+include $(top_srcdir)/Makefile.am.common
+
+AUTOMAKE_OPTIONS += no-texinfo.tex
 
 info_TEXINFOS = heimdal.texi
 heimdal_TEXINFOS = intro.texi install.texi setup.texi kerberos4.texi
diff --git a/lib/krb5/Makefile.am b/lib/krb5/Makefile.am
index 9dfd743a0..95c228a1b 100644
--- a/lib/krb5/Makefile.am
+++ b/lib/krb5/Makefile.am
@@ -1,17 +1,11 @@
 # $Id$
 
-AUTOMAKE_OPTIONS = no-dependencies foreign
+include $(top_srcdir)/Makefile.am.common
 
-INCLUDES = -I$(top_builddir)/include
-
-CFLAGS=$(WFLAGS) @CFLAGS@
-
-COMPILE_ET = ../com_err/compile_et
+INCLUDES += $(INCLUDE_krb4)
 
 lib_LTLIBRARIES = libkrb5.la
 
-SUFFIXES = .et .h
-
 ERR_FILES = krb5_err.c heim_err.c
 
 libkrb5_la_SOURCES = \
@@ -96,50 +90,23 @@ libkrb5_la_SOURCES = \
 	warn.c \
 	write_message.c \
 	$(ERR_FILES)
-libkrb5_la_LDFLAGS = -version-info 1:0:0
 
+libkrb5_la_LDFLAGS = -version-info 1:0:0
 
 $(libkrb5_la_OBJECTS): $(srcdir)/krb5-protos.h
 
 $(srcdir)/krb5-protos.h:
 	cd $(srcdir); perl ../../cf/make-proto.pl $(libkrb5_la_SOURCES) > krb5-protos.h || rm -f krb5-protos.h
 
-INCLUDES = $(INCLUDE_krb4)
-
 libkrb5_la_LIBADD = ../com_err/error.lo ../com_err/com_err.lo
 
 man_MANS = krb5.conf.5 krb5_warn.3 krb5_openlog.3 \
 	krb5_425_conv_principal.3 krb5_build_principal.3 krb5_free_principal.3 \
 	krb5_parse_name.3 krb5_sname_to_principal.3 krb5_unparse_name.3
 
-
-
-incdir = $(includedir)
-inc_DATA = krb5_err.h heim_err.h
-idir = $(top_builddir)/include
+include_HEADERS = krb5.h krb5-protos.h
+include__DATA = krb5_err.h heim_err.h
 
 CLEANFILES = krb5_err.c krb5_err.h heim_err.c heim_err.h
 
-all-local: $(inc_DATA)
-	@for i in $(inc_DATA); do \
-		if cmp -s  $$i $(idir)/$$i 2> /dev/null ; then :; else\
-			echo " $(INSTALL_DATA) $$i $(idir)/$$i"; \
-			$(INSTALL_DATA) $$i $(idir)/$$i; \
-		fi ; \
-	done
-
-.et.c:
-	$(COMPILE_ET) $<
-
-.et.h:
-	$(COMPILE_ET) $<
-
-krb5_err.h: krb5_err.et
-
-krb5_err.c: krb5_err.et
-
-heim_err.h: heim_err.et
-
-heim_err.c: heim_err.et
-
 $(libkrb5_la_OBJECTS): krb5_err.h heim_err.h