From 08b95ae46c249ee9652c8645ac1701165fea28de Mon Sep 17 00:00:00 2001
Message-Id: <08b95ae46c249ee9652c8645ac1701165fea28de.1714722000.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Fri, 10 Mar 2006 00:02:13 +0000
Subject: [PATCH] infra: Clean up project setup
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

---
 .links       |  5 ----
 acconfig.h   | 66 ----------------------------------------------------
 configure.in |  9 +++----
 setup        | 10 --------
 4 files changed, 5 insertions(+), 85 deletions(-)
 delete mode 100644 acconfig.h
 delete mode 100755 setup

diff --git a/.links b/.links
index de18ecc..5ecd9c6 100644
--- a/.links
+++ b/.links
@@ -1,6 +1 @@
 COPYING
-install-sh
-mkinstalldirs
-missing
-config.guess
-config.sub
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index 4d8a1cc..0000000
--- a/acconfig.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*-c-*-
- *
- * $Id: acconfig.h,v 1.2 2002/02/02 19:16:13 mdw Exp $
- *
- * Configuration header
- *
- * (c) 2001 Mark Wooding
- */
-
-/*----- Licensing notice --------------------------------------------------* 
- *
- * This file is part of Jog: Programming for a jogging machine.
- *
- * Jog is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * Jog is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with Jog; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ACCONFIG_H
-#define ACCONFIG_H
-
-#ifdef __cplusplus
-  extern "C" {
-#endif
-
-/*----- Configuration macros ----------------------------------------------*/
-@TOP@
-
-/* Package name.  */
-#define PACKAGE "jog"
-
-/* Package version number.  */
-#define VERSION "1.0.0"
-
-/* If it's not provided already, define to be a signed integer type capable
- * of representing any object size.  (If in doubt, make it an `int'.)  */
-#undef ssize_t
-
-/* Pathname to default socket for socket transport.  */
-#define JOGSOCKET "/var/local/lib/jog/socket"
-
-/* Pathname to audio data.  */
-#define AUDIODIR "/usr/local/share/jog/audio"
-
-/* Define to turn off tracing.  */
-#undef NTRACE
-
-@BOTTOM@
-
-/*----- That's all, folks -------------------------------------------------*/
-
-#ifdef __cplusplus
-  }
-#endif
-
-#endif
diff --git a/configure.in b/configure.in
index d70c88e..3f4f816 100644
--- a/configure.in
+++ b/configure.in
@@ -26,9 +26,9 @@ dnl along with Jog; if not, write to the Free Software Foundation,
 dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 AC_INIT(rxglue.c)
+AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(jog, 1.0.0)
 AM_CONFIG_HEADER(config.h)
-AC_CANONICAL_HOST
 
 AC_PROG_CC
 AC_PROG_CPP
@@ -85,9 +85,10 @@ case $AUSYS in
 esac
 
 mdw_DEFINE_PATHS([
-mdw_DEFINE_PATH([JOGSOCKET], [$localstatedir/$PACKAGE/socket])
-audiodir='${datadir}/${PACKAGE}/audio' AC_SUBST(audiodir)
-mdw_DEFINE_PATH([AUDIODIR], [$audiodir])
+  mdw_DEFINE_PATH([JOGSOCKET], [$localstatedir/$PACKAGE/socket],
+                  [Pathname to default socket for socket transport.])
+  audiodir='${datadir}/${PACKAGE}/audio' AC_SUBST(audiodir)
+  mdw_DEFINE_PATH([AUDIODIR], [$audiodir], [Pathname to audio data.])
 ])
 
 mdw_CHECK_MANYLIBS(crypt, crypt)
diff --git a/setup b/setup
deleted file mode 100755
index a9b95b6..0000000
--- a/setup
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-set -e
-mklinks
-mkaclocal
-(cd sounds && m4 Makefile.m4 >Makefile.am)
-autoheader
-autoconf
-automake
-mkdir build
-- 
[mdw]