[Guile-commits] 427/437: Remove some more of the lightning build machinery

[Andy Wingo]

wingo pushed a commit to branch lightning
in repository guile.

commit fddd2069ed66d7c7ba867e874d9dacaf288f0ce6
Author: Andy Wingo <address@hidden>
Date:   Sat Jun 30 12:01:33 2018 +0200

    Remove some more of the lightning build machinery
    
    * libguile/lightning/Makefile.am:
    * libguile/lightning/lib/Makefile.am: Remove.
    * libguile/lightning/lightning.am: Add all the C and H files here.
    * libguile/lightning/configure.ac: Remove AC_OUTPUT clause.
---
 libguile/lightning/Makefile.am     | 19 ---------
 libguile/lightning/configure.ac    |  3 --
 libguile/lightning/lib/Makefile.am | 74 ----------------------------------
 libguile/lightning/lightning.am    | 82 ++++++++++++++++++++++++++++++++------
 4 files changed, 69 insertions(+), 109 deletions(-)

diff --git a/libguile/lightning/Makefile.am b/libguile/lightning/Makefile.am
deleted file mode 100644
index eb44498..0000000
--- a/libguile/lightning/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright 2000, 2001, 2002, 2012-2018 Free Software Foundation, Inc.
-#
-# This file is part of GNU lightning.
-#
-# GNU lightning is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# GNU lightning 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 Lesser General Public
-# License for more details.
-#
-
-SUBDIRS =              \
-       include         \
-       lib
diff --git a/libguile/lightning/configure.ac b/libguile/lightning/configure.ac
index a75d291..7e1afd5 100644
--- a/libguile/lightning/configure.ac
+++ b/libguile/lightning/configure.ac
@@ -274,6 +274,3 @@ fi
 AC_SUBST(cpu)
 
 AC_SUBST([LIGHTNING_CFLAGS])
-
-AC_OUTPUT([Makefile
-          lib/Makefile])
diff --git a/libguile/lightning/lib/Makefile.am 
b/libguile/lightning/lib/Makefile.am
deleted file mode 100644
index c35e014..0000000
--- a/libguile/lightning/lib/Makefile.am
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Copyright 2000, 2001, 2002, 2012-2018 Free Software Foundation, Inc.
-#
-# This file is part of GNU lightning.
-#
-# GNU lightning is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# GNU lightning 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 Lesser General Public
-# License for more details.
-#
-
-AM_CFLAGS = -I$(top_srcdir)/include -D_GNU_SOURCE $(LIGHTNING_CFLAGS)
-liblightning_LTLIBRARIES = liblightning.la
-liblightning_la_LDFLAGS = -version-info 1:0:0
-
-liblightningdir = $(libdir)
-liblightning_la_SOURCES =      \
-       jit_disasm.c            \
-       jit_memory.c            \
-       jit_names.c             \
-       jit_note.c              \
-       jit_print.c             \
-       jit_size.c              \
-       lightning.c
-
-EXTRA_DIST =                   \
-       jit_rewind.c            \
-       jit_aarch64.c           \
-       jit_aarch64-cpu.c       \
-       jit_aarch64-fpu.c       \
-       jit_aarch64-sz.c        \
-       jit_alpha.c             \
-       jit_alpha-cpu.c         \
-       jit_alpha-fpu.c         \
-       jit_alpha-sz.c          \
-       jit_arm.c               \
-       jit_arm-cpu.c           \
-       jit_arm-swf.c           \
-       jit_arm-vfp.c           \
-       jit_arm-sz.c            \
-       jit_hppa.c              \
-       jit_hppa-cpu.c          \
-       jit_hppa-fpu.c          \
-       jit_hppa-sz.c           \
-       jit_ia64.c              \
-       jit_ia64-cpu.c          \
-       jit_ia64-fpu.c          \
-       jit_ia64-sz.c           \
-       jit_mips.c              \
-       jit_mips-cpu.c          \
-       jit_mips-fpu.c          \
-       jit_mips-sz.c           \
-       jit_ppc.c               \
-       jit_ppc-cpu.c           \
-       jit_ppc-fpu.c           \
-       jit_ppc-sz.c            \
-       jit_s390.c              \
-       jit_s390-cpu.c          \
-       jit_s390-fpu.c          \
-       jit_s390-sz.c           \
-       jit_sparc.c             \
-       jit_sparc-cpu.c         \
-       jit_sparc-fpu.c         \
-       jit_sparc-sz.c          \
-       jit_x86.c               \
-       jit_x86-cpu.c           \
-       jit_x86-sse.c           \
-       jit_x86-x87.c           \
-       jit_x86-sz.c
diff --git a/libguile/lightning/lightning.am b/libguile/lightning/lightning.am
index 4e3af16..ada9c5b 100644
--- a/libguile/lightning/lightning.am
+++ b/libguile/lightning/lightning.am
@@ -16,16 +16,72 @@
 
 lightning = $(top_srcdir)/libguile/lightning
 
-EXTRA_DIST = \
-       $(lightning)/include/lightning.h \
-       $(lightning)/include/lightning/jit_private.h a\
-       $(lightning)/include/lightning/jit_arm.h \
-       $(lightning)/include/lightning/jit_mips.h \
-       $(lightning)/include/lightning/jit_ppc.h \
-       $(lightning)/include/lightning/jit_sparc.h \
-       $(lightning)/include/lightning/jit_x86.h \
-       $(lightning)/include/lightning/jit_ia64.h \
-       $(lightning)/include/lightning/jit_hppa.h \
-       $(lightning)/include/lightning/jit_aarch64.h \
-       $(lightning)/include/lightning/jit_s390.h \
-       $(lightning)/include/lightning/jit_alpha.h
+# FIXME: define in C files: -D_GNU_SOURCE
+# FIXME: set LIGHTNING_CFLAGS=-I$(lightning)/include in configure.ac
+
+lightning_c_files =                            \
+       $(lightning)/lib/jit_disasm.c           \
+       $(lightning)/lib/jit_memory.c           \
+       $(lightning)/lib/jit_names.c            \
+       $(lightning)/lib/jit_note.c             \
+       $(lightning)/lib/jit_print.c            \
+       $(lightning)/lib/jit_size.c             \
+       $(lightning)/lib/lightning.c
+
+lightning_extra_files =                                        \
+       $(lightning)/include/lightning.h                \
+       $(lightning)/include/lightning/jit_private.h    \
+       $(lightning)/include/lightning/jit_arm.h        \
+       $(lightning)/include/lightning/jit_mips.h       \
+       $(lightning)/include/lightning/jit_ppc.h        \
+       $(lightning)/include/lightning/jit_sparc.h      \
+       $(lightning)/include/lightning/jit_x86.h        \
+       $(lightning)/include/lightning/jit_ia64.h       \
+       $(lightning)/include/lightning/jit_hppa.h       \
+       $(lightning)/include/lightning/jit_aarch64.h    \
+       $(lightning)/include/lightning/jit_s390.h       \
+       $(lightning)/include/lightning/jit_alpha.h      \
+                                                       \
+       $(lightning)/lib/jit_rewind.c                   \
+       $(lightning)/lib/jit_aarch64.c                  \
+       $(lightning)/lib/jit_aarch64-cpu.c              \
+       $(lightning)/lib/jit_aarch64-fpu.c              \
+       $(lightning)/lib/jit_aarch64-sz.c               \
+       $(lightning)/lib/jit_alpha.c                    \
+       $(lightning)/lib/jit_alpha-cpu.c                \
+       $(lightning)/lib/jit_alpha-fpu.c                \
+       $(lightning)/lib/jit_alpha-sz.c                 \
+       $(lightning)/lib/jit_arm.c                      \
+       $(lightning)/lib/jit_arm-cpu.c                  \
+       $(lightning)/lib/jit_arm-swf.c                  \
+       $(lightning)/lib/jit_arm-vfp.c                  \
+       $(lightning)/lib/jit_arm-sz.c                   \
+       $(lightning)/lib/jit_hppa.c                     \
+       $(lightning)/lib/jit_hppa-cpu.c                 \
+       $(lightning)/lib/jit_hppa-fpu.c                 \
+       $(lightning)/lib/jit_hppa-sz.c                  \
+       $(lightning)/lib/jit_ia64.c                     \
+       $(lightning)/lib/jit_ia64-cpu.c                 \
+       $(lightning)/lib/jit_ia64-fpu.c                 \
+       $(lightning)/lib/jit_ia64-sz.c                  \
+       $(lightning)/lib/jit_mips.c                     \
+       $(lightning)/lib/jit_mips-cpu.c                 \
+       $(lightning)/lib/jit_mips-fpu.c                 \
+       $(lightning)/lib/jit_mips-sz.c                  \
+       $(lightning)/lib/jit_ppc.c                      \
+       $(lightning)/lib/jit_ppc-cpu.c                  \
+       $(lightning)/lib/jit_ppc-fpu.c                  \
+       $(lightning)/lib/jit_ppc-sz.c                   \
+       $(lightning)/lib/jit_s390.c                     \
+       $(lightning)/lib/jit_s390-cpu.c                 \
+       $(lightning)/lib/jit_s390-fpu.c                 \
+       $(lightning)/lib/jit_s390-sz.c                  \
+       $(lightning)/lib/jit_sparc.c                    \
+       $(lightning)/lib/jit_sparc-cpu.c                \
+       $(lightning)/lib/jit_sparc-fpu.c                \
+       $(lightning)/lib/jit_sparc-sz.c                 \
+       $(lightning)/lib/jit_x86.c                      \
+       $(lightning)/lib/jit_x86-cpu.c                  \
+       $(lightning)/lib/jit_x86-sse.c                  \
+       $(lightning)/lib/jit_x86-x87.c                  \
+       $(lightning)/lib/jit_x86-sz.c