Move config header templates to buildaux rather than src

diff --git a/buildaux/Makefile.am b/buildaux/Makefile.am
index 3077d27a8149c817dd35f0158d35c65b71536bff..4fbc041ea933e3a82f028be3f221e984285bb31c 100644 (file)
--- a/buildaux/Makefile.am
+++ b/buildaux/Makefile.am
@@ -133,7 +133,7 @@ EXTRA_DIST = pit etc BUGS src/abcess.h src/feh.h src/fiddle.h src/ick_ec.h \
              lexer.c doc/ick.txi doc/ick.txt doc/chipspec.txt NEWS README \
              buildaux/buildconfig buildaux/buildconfig.ac \
              buildaux/depcomp buildaux/hostmak.in buildaux/install-sh \
-             buildaux/missing buildaux/ylwrap src/bconfigh.in
+             buildaux/missing buildaux/ylwrap buildaux/bconfigh.in
 
 # It's ugly to distribute the prebuilt files in the root of the
 # distribution.  configure will move these files back again into the
@@ -150,13 +150,13 @@ dist-hook:
        touch $(distdir)/MANIFEST
        (cd $(distdir); find . | sort > MANIFEST)
 
-# N.B. the parser.y, lexer.l, syslib, headers and skeletons are the
+# N.B. the parser.y, lexer.l, libraries, headers and skeletons are the
 # links made to simplify the build, not the originals
 CLEANFILES = oilout*.c parser.y lexer.l ick-wrap.c pickwrap.c \
              atari.c baudot.c ebcdic.c latin1.c ick.dvi \
              syslib.i syslib3.3i syslib4.4i syslib5.5i \
              syslib6.6i syslib7.7i ick_ec.h fiddle.h abcess.h \
-             ick_lose.h yuk.h
+             ick_lose.h yuk.h floatlib.i ick_bool.h
 # Distclean deletes the Makefile and thus requires reconfiguring,
 # and therefore this is a safe moment to delete the build tree
 # versions of the prebuilt files. (The source tree versions will
@@ -173,10 +173,10 @@ veryclean: distclean
        rm -f $(top_srcdir)/buildaux/missing
        rm -f $(top_srcdir)/buildaux/ylwrap 
        rm -f $(top_srcdir)/buildaux/Makefile.in
+       rm -f $(top_srcdir)/buildaux/bconfigh.in
+       rm -f $(top_srcdir)/buildaux/configh.in
        rm -f $(top_srcdir)/aclocal.m4
        rm -f $(top_srcdir)/configure
-       rm -f $(top_srcdir)/src/bconfigh.in
-       rm -f $(top_srcdir)/src/configh.in
        rm -rf $(top_srcdir)/autom4te.cache
        rm -rf $(top_srcdir)/buildaux/autom4te.cache
 
@@ -206,11 +206,11 @@ doc/ick.txt: doc/ick.txi
 
 # The build system itself is included in the makefile; tell Automake
 # about my tweaking.
-$(top_srcdir)/buildaux/buildconfig: $(top_srcdir)/buildaux/buildconfig.ac $(top_srcdir)/src/bconfigh.in
+$(top_srcdir)/buildaux/buildconfig: $(top_srcdir)/buildaux/buildconfig.ac $(top_srcdir)/buildaux/bconfigh.in
        cd $(top_srcdir) && $(AUTOCONF) buildaux/buildconfig.ac > buildaux/buildconfig
        chmod a+x $(top_srcdir)/buildaux/buildconfig
-$(top_srcdir)/src/bconfigh.in: $(top_srcdir)/buildaux/buildconfig.ac
+$(top_srcdir)/buildaux/bconfigh.in: $(top_srcdir)/buildaux/buildconfig.ac
        cd $(top_srcdir)/buildaux && $(AUTOHEADER) buildconfig.ac
        rm -f stamp-h1
        touch $@
-CONFIG_STATUS_DEPENDENCIES=$(top_srcdir)/buildaux/buildconfig $(top_srcdir)/src/bconfigh.in
+CONFIG_STATUS_DEPENDENCIES=$(top_srcdir)/buildaux/buildconfig $(top_srcdir)/buildaux/bconfigh.in

diff --git a/buildaux/buildconfig.ac b/buildaux/buildconfig.ac
index 54bcfbe1402b006a838f71c021429fb6cf287ca1..1bcd25f93e1e23dac4a3b9b41bb5da4bc19bf3c5 100644 (file)
--- a/buildaux/buildconfig.ac
+++ b/buildaux/buildconfig.ac
@@ -5,7 +5,7 @@ dnl Yes, that is a valid email address. If your mailer doesn't support nested
 dnl comments, then get a better mailer.
 AC_INIT([C-INTERCAL],[0.29],[[ais523(524\)x\((525)y)@bham.ac.uk]],[ick])
 AC_CONFIG_SRCDIR([../src/oil.h])
-AC_CONFIG_HEADER([bconfig.h:../src/bconfigh.in])
+AC_CONFIG_HEADER([bconfig.h:../buildaux/bconfigh.in])
 AC_CONFIG_AUX_DIR([.])
 
 dnl Checks for programs.

diff --git a/configure.ac b/configure.ac
index 543c12ebdb4669540005138e6de727c4b4eb47dd..f122d80d65b3cfe9c4373224b37a1e63e4067d3b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl Yes, that is a valid email address. If your mailer doesn't support nested
 dnl comments, then get a better mailer.
 AC_INIT([C-INTERCAL],[0.29],[[ais523(524\)x\((525)y)@bham.ac.uk]],[ick])
 AC_CONFIG_SRCDIR([src/abcess.h])
-AC_CONFIG_HEADER([config.h:src/configh.in])
+AC_CONFIG_HEADER([config.h:buildaux/configh.in])
 AC_CONFIG_AUX_DIR([buildaux])
 AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-lzma tar-pax check-news
                  no-texinfo.tex -Wall -Wno-override])