[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/4] 021-04-03 Marc Nieper-Wißkirchen <address@hidden>
|
From: |
Marc Nieper-Wißkirchen |
|
Subject: |
[PATCH 3/4] 021-04-03 Marc Nieper-Wißkirchen <address@hidden> |
|
Date: |
Sat, 3 Apr 2021 18:36:25 +0200 |
From: Marc Nieper-Wißkirchen <marc@nieper-wisskirchen.de>
Include build directory include paths for autoconf-generated header files.
* Makefile.am, check/Makefile.am, doc/Makefile.am,
lib/Makefile.am: Include $(top_builddir)/include in include paths
for the autoconf-generated header file lightning.h.
---
ChangeLog | 5 +++++
Makefile.am | 3 ++-
check/Makefile.am | 3 +--
doc/Makefile.am | 2 +-
lib/Makefile.am | 3 ++-
5 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 648921d..20bfcfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+021-04-03 Marc Nieper-Wißkirchen <marc@nieper-wisskirchen.de>
+
+ * Makefile.am, check/Makefile.am, doc/Makefile.am, lib/Makefile.am:
Include $(top_builddir)/include in include paths
+ for the autoconf-generated header file lightning.h.
+
2021-04-03 Marc Nieper-Wißkirchen <marc@nieper-wisskirchen.de>
* doc/.gitignore: Add version.texi to list of ignored files.
diff --git a/Makefile.am b/Makefile.am
index c921901..67d3564 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,8 @@ pkgconfiglib_DATA = lightning.pc
if get_jit_size
JIT_SIZE_PATH = "$(top_builddir)/jit_$(cpu)-sz.c"
AM_CPPFLAGS=-DGET_JIT_SIZE=1 -DJIT_SIZE_PATH='$(JIT_SIZE_PATH)'
-AM_CFLAGS = -I$(top_srcdir)/include -D_GNU_SOURCE $(LIGHTNING_CFLAGS)
+AM_CFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
+ -D_GNU_SOURCE $(LIGHTNING_CFLAGS)
noinst_PROGRAMS = size
size_LDADD = $(top_builddir)/lib/liblightning.la -lm $(SHLIB)
diff --git a/check/Makefile.am b/check/Makefile.am
index e04f7ac..80b6f9d 100644
--- a/check/Makefile.am
+++ b/check/Makefile.am
@@ -14,7 +14,7 @@
# License for more details.
#
-AM_CFLAGS = -I$(top_srcdir)/include -D_GNU_SOURCE
+AM_CFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -D_GNU_SOURCE
check_PROGRAMS = lightning ccall self setcode nodata ctramp carg cva_list
@@ -315,4 +315,3 @@ CLEANFILES = $(TESTS)
debug: lightning
$(LIBTOOL) --mode=execute gdb lightning
-
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 20d4456..c46e0ab 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -14,7 +14,7 @@
# License for more details.
#
-AM_CFLAGS = -I$(top_srcdir)/include -D_GNU_SOURCE
+AM_CFLAGS = -I $(top_builddir)/include -I$(top_srcdir)/include -D_GNU_SOURCE
info_TEXINFOS = lightning.texi
MOSTLYCLEANFILES = lightning.tmp
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f2ac2ba..7e9bd89 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -14,7 +14,8 @@
# License for more details.
#
-AM_CFLAGS = -I$(top_srcdir)/include -D_GNU_SOURCE $(LIGHTNING_CFLAGS)
+AM_CFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
+ -D_GNU_SOURCE $(LIGHTNING_CFLAGS)
liblightning_LTLIBRARIES = liblightning.la
liblightning_la_LDFLAGS = -version-info 1:0:0
--
2.25.1