[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 424/437: Beginnings of build integration of lightning an
From: |
Andy Wingo |
Subject: |
[Guile-commits] 424/437: Beginnings of build integration of lightning and guile |
Date: |
Mon, 2 Jul 2018 05:15:10 -0400 (EDT) |
wingo pushed a commit to branch lightning
in repository guile.
commit f0891bed0bb9df7b9f7ddbfc63ad3cb16f125a1f
Author: Andy Wingo <address@hidden>
Date: Sat Jun 30 11:41:15 2018 +0200
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.
---
libguile/lightning/configure.ac | 2 -
libguile/lightning/include/Makefile.am | 19 --------
libguile/lightning/include/lightning/Makefile.am | 61 ------------------------
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 e27e244..dc37522 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 601ae7a..0000000
--- 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 885a0d5..0000000
--- 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 0000000..4e3af16
--- /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
- [Guile-commits] 290/437: Do not pass null for free, memcpy and memmove, (continued)
- [Guile-commits] 290/437: Do not pass null for free, memcpy and memmove, Andy Wingo, 2018/07/02
- [Guile-commits] 249/437: Make jit_get_note a public interface., Andy Wingo, 2018/07/02
- [Guile-commits] 299/437: ALPHA: Correct class of argument float registers, Andy Wingo, 2018/07/02
- [Guile-commits] 426/437: Remove empty lightning m4 directory, Andy Wingo, 2018/07/02
- [Guile-commits] 379/437: s390: Add initial jit_va_ calls to s390, Andy Wingo, 2018/07/02
- [Guile-commits] 431/437: Always enable assertions in embedded lightning, Andy Wingo, 2018/07/02
- [Guile-commits] 365/437: X86: Correct load and store in the x32 abi, Andy Wingo, 2018/07/02
- [Guile-commits] 190/437: Finish sparc port., Andy Wingo, 2018/07/02
- [Guile-commits] 436/437: Wire JIT availability check into Guile configure, Andy Wingo, 2018/07/02
- [Guile-commits] 350/437: Correct typo., Andy Wingo, 2018/07/02
- [Guile-commits] 424/437: Beginnings of build integration of lightning and guile,
Andy Wingo <=
- [Guile-commits] 204/437: Add basic Itanium port infrastructure., Andy Wingo, 2018/07/02
- [Guile-commits] 425/437: Remove lightning pkg-config file., Andy Wingo, 2018/07/02
- [Guile-commits] 411/437: Correct issues with 32 bit big endian mips abis, Andy Wingo, 2018/07/02
- [Guile-commits] 233/437: Correct license to properly advertise LGPLv3 and not GPLv3., Andy Wingo, 2018/07/02
- [Guile-commits] 343/437: Implement new, typed, jit_htonr* interfaces, Andy Wingo, 2018/07/02
- [Guile-commits] 423/437: Finish removing get-jit-size, Andy Wingo, 2018/07/02
- [Guile-commits] 320/437: Do not fail gratuitously in jit_init_debug, Andy Wingo, 2018/07/02
- [Guile-commits] 288/437: Add note about jit_set_memory_functions call., Andy Wingo, 2018/07/02
- [Guile-commits] 419/437: Merge GNU lightning to libguile/lightning, Andy Wingo, 2018/07/02
- [Guile-commits] 194/437: Rework to better describe what is used only during jit generation., Andy Wingo, 2018/07/02