diff options
author | Andy Wingo <wingo@pobox.com> | 2018-06-30 11:41:15 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2018-06-30 12:03:12 +0200 |
commit | f0891bed0bb9df7b9f7ddbfc63ad3cb16f125a1f (patch) | |
tree | e91ab10fddbdece24625a68a713500e8f7320201 | |
parent | 88101636278f8ff5067658debb9f77833b8e9d80 (diff) | |
download | guile-f0891bed0bb9df7b9f7ddbfc63ad3cb16f125a1f.tar.gz |
Beginnings of build integration of lightning and guile
* libguile/lightning/lightning.am: New file. libguile will include
this. Contents initially from include/Makefile.am and
include/lightning/Makefile.am.
* libguile/lightning/include/Makefile.am:
* libguile/lightning/include/lightning/Makefile.am: Remove.
* libguile/lightning/configure.ac: Remove output of include Makefiles.
-rw-r--r-- | libguile/lightning/configure.ac | 2 | ||||
-rw-r--r-- | libguile/lightning/include/Makefile.am | 19 | ||||
-rw-r--r-- | libguile/lightning/include/lightning/Makefile.am | 61 | ||||
-rw-r--r-- | libguile/lightning/lightning.am | 31 |
4 files changed, 31 insertions, 82 deletions
diff --git a/libguile/lightning/configure.ac b/libguile/lightning/configure.ac index e27e244cc..dc3752278 100644 --- a/libguile/lightning/configure.ac +++ b/libguile/lightning/configure.ac @@ -278,6 +278,4 @@ AC_SUBST([LIGHTNING_CFLAGS]) AC_OUTPUT([Makefile lightning.pc - include/Makefile - include/lightning/Makefile lib/Makefile]) diff --git a/libguile/lightning/include/Makefile.am b/libguile/lightning/include/Makefile.am deleted file mode 100644 index 601ae7a7c..000000000 --- a/libguile/lightning/include/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright 2000, 2001, 2002, 2012-2017 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. -# - -include_HEADERS = lightning.h -SUBDIRS = \ - lightning diff --git a/libguile/lightning/include/lightning/Makefile.am b/libguile/lightning/include/lightning/Makefile.am deleted file mode 100644 index 885a0d5b4..000000000 --- a/libguile/lightning/include/lightning/Makefile.am +++ /dev/null @@ -1,61 +0,0 @@ -# -# Copyright 2000, 2001, 2002, 2012-2017 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. -# - -lightning_includedir = $(includedir)/lightning - -EXTRA_DIST = \ - jit_private.h - -if cpu_arm -lightning_include_HEADERS = \ - jit_arm.h -endif -if cpu_mips -lightning_include_HEADERS = \ - jit_mips.h -endif -if cpu_ppc -lightning_include_HEADERS = \ - jit_ppc.h -endif -if cpu_sparc -lightning_include_HEADERS = \ - jit_sparc.h -endif -if cpu_x86 -lightning_include_HEADERS = \ - jit_x86.h -endif -if cpu_ia64 -lightning_include_HEADERS = \ - jit_ia64.h -endif -if cpu_hppa -lightning_include_HEADERS = \ - jit_hppa.h -endif -if cpu_aarch64 -lightning_include_HEADERS = \ - jit_aarch64.h -endif -if cpu_s390 -lightning_include_HEADERS = \ - jit_s390.h -endif -if cpu_alpha -lightning_include_HEADERS = \ - jit_alpha.h -endif diff --git a/libguile/lightning/lightning.am b/libguile/lightning/lightning.am new file mode 100644 index 000000000..4e3af1643 --- /dev/null +++ b/libguile/lightning/lightning.am @@ -0,0 +1,31 @@ +# +# 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. +# + +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 |