merge configure makefile snippets

5 files changed, 40 insertions, 183 deletions

diff --git a/autoconf.mk.in b/autoconf.mk.in
deleted file mode 100644
index 031dab17d9..0000000000
--- a/autoconf.mk.in
+++ /dev/null
@@ -1,41 +0,0 @@
-top_builddir = $(topoutdir)
-top_srcdir = $(topsrcdir)
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_URL = @PACKAGE_URL@
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-FGREP = @FGREP@# Requires AC_PROG_FGREP
-GPERF = @GPERF@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LIBTOOL = @LIBTOOL@
-M4 = @M4@
-M4_DEFINES = @M4_DEFINES@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@# Requires AC_PROG_MKDIR_P
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJCOPY = @OBJCOPY@
-OBJDUMP = @OBJDUMP@
-STRINGS = @STRINGS@
-STRIP = @STRIP@
-XGETTEXT = @XGETTEXT@
-
-INSTALL_SCRIPT = @INSTALL_SCRIPT@# Requires AC_PROG_INSTALL
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/automake.mk.am b/automake.mk.am
index e69de29bb2..5522cfa384 100644
--- a/automake.mk.am
+++ b/automake.mk.am
@@ -0,0 +1,3 @@
+# This file doesn't actually get used, it just needs to exist to keep Automake
+# happy.  We don't use Autmake for any Makefile stuff, but we do use auxiliary
+# build scripts provided by Automake.
diff --git a/config.mk.in b/config.mk.in
index 27a6104ea9..b90f676de0 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -27,8 +27,6 @@ topsrcdir := $(topoutdir)/@top_srcdir@
 
 .LIBPATTERNS = lib%.so lib%.a
 
-include $(topoutdir)/autoconf.mk
-
 CCLD = $(CC)
 
 OUR_CPPFLAGS = @OUR_CPPFLAGS@
@@ -375,6 +373,41 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 
+top_builddir = $(topoutdir)
+top_srcdir = $(topsrcdir)
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_URL = @PACKAGE_URL@
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+CPP = @CPP@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+FGREP = @FGREP@# Requires AC_PROG_FGREP
+GPERF = @GPERF@
+LIBTOOL = @LIBTOOL@
+M4 = @M4@
+M4_DEFINES = @M4_DEFINES@
+MKDIR_P = @MKDIR_P@# Requires AC_PROG_MKDIR_P
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+OBJCOPY = @OBJCOPY@
+OBJDUMP = @OBJDUMP@
+STRINGS = @STRINGS@
+STRIP = @STRIP@
+XGETTEXT = @XGETTEXT@
+
 # This is based on §7.2 "Makefile Conventions" of the July 25, 2016
 # release of the GNU Coding Standards.
 #
@@ -496,6 +529,8 @@ MKNODFLAGS =
 # ----------------------------------------
 
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
+#INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
 
 # 7.2.5: Variables for Installation Directories
diff --git a/configure.ac b/configure.ac
index 0d51b8363b..83441e6459 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1596,8 +1596,6 @@ AC_SUBST([rootlibdir], [$with_rootlibdir])
 AC_CONFIG_FILES([
         config.mk
         automake.mk
-        autoconf.mk
-        gnustandards.mk
         po/Makefile.in
 ])
 
diff --git a/gnustandards.mk.in b/gnustandards.mk.in
deleted file mode 100644
index 9c0dced485..0000000000
--- a/gnustandards.mk.in
+++ /dev/null
@@ -1,138 +0,0 @@
-# 7.2.2: Utilities in Makefiles
-# -----------------------------
-
-# It's ok to hard-code these commands in rules, but who wants to
-# memorize the list of what's ok?
-AWK = @AWK@# Requires AC_PROG_AWK
-CAT = cat
-CMP = cmp
-CP = cp
-DIFF = diff
-ECHO = echo
-EGREP = @EGREP@# Requires AC_PROG_EGREP
-EXPR = expr
-FALSE = false
-GREP = @GREP@# Requires AC_PROG_GREP
-INSTALL_INFO = install-info
-LN = ln
-LS = ls
-MKDIR = mkdir
-MV = mv
-PRINTF = printf
-PWD = pwd
-RM = rm -f
-RMDIR = rmdir
-SED = sed
-SLEEP = sleep
-SORT = sort
-TAR = tar
-TEST = test
-TOUCH = touch
-TR = tr
-TRUE = true
-
-# These must be user-configurable
-AR = @AR@
-ARFLAGS =
-BISON = bison
-BISONFLAGS =
-CC = @CC@
-CCFLAGS = $(CFLAGS)
-FLEX = flex
-FLEXFLAGS =
-INSTALL = @INSTALL@# Requires AC_PROG_INSTALL
-#INSTALLFLAGS =
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LDCONFIG = ldconfig
-LDCONFIGFLAGS =
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEXFLAGS = $(LFLAGS)
-#MAKE
-MAKEINFO = @MAKEINFO@
-MAKEINFOFLAGS =
-RANLIB = @RANLIB@
-RANLIBFLAGS =
-TEXI2DVI = texi2dvi
-TEXI2DVIFLAGS =
-YACC = @YACC@
-YACCFLAGS = $(YFLAGS)
-
-CFLAGS = @CFLAGS@
-LFLAGS =
-YFLAGS = @YFLAGS@
-
-LN_S = @LN_S@
-
-CHGRP = chgrp
-CHMOD = chmod
-CHOWN = chown
-MKNOD = mknod
-
-# 7.2.3 Variables for Specifying Commands
-# ---------------------------------------
-
-INSTALL_PROGRAM = @INSTALL_PROGRAM@# Requires AC_PROG_INSTALL
-INSTALL_DATA = @INSTALL_DATA@# Requires AC_PROG_INSTALL
-
-# 7.2.5 Variables for Installation Directories
-# --------------------------------------------
-
-# Root for the installation
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-# Executable programs
-bindir     = @bindir@
-sbindir    = @sbindir@
-libexecdir = @libexecdir@
-# Data files
-datarootdir    = @datarootdir@
-datadir        = @datadir@
-sysconfdir     = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir  = @localstatedir@
-runstatedir    = $(localstatedir)/run# Requires Autoconf 2.70+
-# Specific types of files
-includedir = @includedir@
-oldincludedir = @oldincludedir@
-docdir = @docdir@
-infodir = @infodir@
-htmldir = @htmldir@
-dvidir  = @dvidir@
-pdfdir  = @pdfdir@
-psdir   = @psdir@
-libdir  = @libdir@
-lispdir = $(datarootdir)/emacs/site-lisp# Requires manual configure.ac support
-localedir = @localedir@
-
-mandir = @mandir@
-man1dir = $(mandir)/man1
-man2dir = $(mandir)/man2
-man3dir = $(mandir)/man3
-man4dir = $(mandir)/man4
-man5dir = $(mandir)/man5
-man6dir = $(mandir)/man6
-man7dir = $(mandir)/man7
-man8dir = $(mandir)/man8
-
-manext = .1
-man1ext = .1
-man2ext = .2
-man3ext = .3
-man4ext = .4
-man5ext = .5
-man6ext = .6
-man7ext = .7
-man8ext = .8
-
-# 7.2.7: Install Command Categories
-# ---------------------------------
-
-PRE_INSTALL =
-POST_INSTALL =
-NORMAL_INSTALL =
-
-PRE_UNINSTALL =
-POST_UNINSTALL =
-NORMAL_UNINSTALL =