[Amtueal-devel] [PATCH] get make distcheck working

[Steve G. <sg...@re...>]

By making a contribution to the amtueal project, I certify that: 
The contribution was created in whole or in part by me and I have the right to 
submit it under the open source license indicated in the file.

Signed-off-by: Steve Grubb <sg...@re...>


diff -ur amtu-1.0.7.orig/configure.in amtu-1.0.7/configure.in
--- amtu-1.0.7.orig/configure.in	2009-07-01 10:29:09.000000000 -0400
+++ amtu-1.0.7/configure.in	2009-07-01 11:05:07.000000000 -0400
@@ -1,19 +1,14 @@
-AC_REVISION($Revision: 1.2 $)dnl
-# AC_CANONICAL_SYSTEM is deprecated in the latest version of AUTOMAKE.
-# We aren't using the latest version so we'll keep using it
-#AC_CANONICAL_TARGET
-AC_INIT(src/amtu.c)
+AC_REVISION($Revision: 1.3 $)dnl
+AC_INIT(amtu,1.0.7)
 AC_PREREQ(2.12)dnl
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_SRCDIR(src/amtu.c)
 AM_CONFIG_HEADER(config.h)
 
-VERSION=1.0.6
-echo Configuring amtu $VERSION
-
-AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(amtu, $VERSION)
+AC_CANONICAL_TARGET
+AM_INIT_AUTOMAKE
 AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_AWK
+
 case "$target" in
 i386-* | i486-* | i586-* | i686-*) AC_DEFINE(HAVE_I86,1,NULL);;
 powerpc-*) AC_DEFINE(HAVE_PPC,1,NULL);;
@@ -25,3 +20,15 @@
 AC_CHECK_LIB(laus, laus_open)
 AC_CHECK_LIB(audit, audit_open)
 AC_OUTPUT(Makefile src/Makefile doc/Makefile)
+
+echo .
+echo "
+
+  amtu:                   $VERSION
+  Target:                 $target
+  Installation prefix:    $prefix
+  Compiler:               $CC
+  Compiler flags:
+`echo $CFLAGS | fmt -w 50 | sed 's,^,                          ,'`
+"
+
diff -ur amtu-1.0.7.orig/doc/Makefile.am amtu-1.0.7/doc/Makefile.am
--- amtu-1.0.7.orig/doc/Makefile.am	2009-07-01 10:29:09.000000000 -0400
+++ amtu-1.0.7/doc/Makefile.am	2009-07-01 10:56:52.000000000 -0400
@@ -1 +1,3 @@
+CONFIG_CLEAN_FILES = *.rej *.orig
+EXTRA_DIST = $(man_MANS)
 man_MANS = amtu.8
diff -ur amtu-1.0.7.orig/Makefile.am amtu-1.0.7/Makefile.am
--- amtu-1.0.7.orig/Makefile.am	2009-07-01 10:29:09.000000000 -0400
+++ amtu-1.0.7/Makefile.am	2009-07-01 10:36:48.000000000 -0400
@@ -1 +1,8 @@
 SUBDIRS = src doc
+EXTRA_DIST = bootstrap LICENSE CPLv1.0.htm README
+CONFIG_CLEAN_FILES = debug*.list config/*
+
+clean-generic:
+	rm -rf autom4te*.cache 
+	rm -f *.rej *.orig
+
diff -ur amtu-1.0.7.orig/src/Makefile.am amtu-1.0.7/src/Makefile.am
--- amtu-1.0.7.orig/src/Makefile.am	2009-07-01 10:29:09.000000000 -0400
+++ amtu-1.0.7/src/Makefile.am	2009-07-01 10:55:44.000000000 -0400
@@ -1,3 +1,8 @@
-AM_CPPFLAGS  = -Wall -W -Wfloat-equal -Wundef
+CLEANFILES = $(BUILT_SOURCES)
+CONFIG_CLEAN_FILES = *.loT *.rej *.orig
+AM_CFLAGS  = -Wall -W -Wfloat-equal -Wundef
+INCLUDES = -I. -I${top_srcdir}
+noinst_HEADERS = amtu.h
 bin_PROGRAMS = amtu
 amtu_SOURCES = amtu-i86.c amtu-ppc.c amtu-s390.c amtu-ia64.c amtu.c memory.c 
memsep.c iodisktest.c networkio.c
+amtu_DEPENDENCIES = $(amtu_SOURCES) ${top_srcdir}/config.h