From 3f9b00857d4c35e6541426f7603d40fa3e638025 Mon Sep 17 00:00:00 2001
From: Utz-Uwe Haus <uhaus@cray.com>
Date: Thu, 19 Nov 2020 14:42:56 +0100
Subject: [PATCH] use mamba's own header install targets
---
deps/Makefile.am | 10 ++++++++++
include/Makefile.am | 18 ++----------------
2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/deps/Makefile.am b/deps/Makefile.am
index 137a7d58..2606c2e2 100644
--- a/deps/Makefile.am
+++ b/deps/Makefile.am
@@ -38,6 +38,16 @@ EXTRA_DIST = protobuf protobuf-c mio
# user's system
install installdirs uninstall: SUBDIRS =
+# but use mamba installation to ensure we get all headers
+install-exec-local: all
+install-data-local:
+ make -C mamba/common includedir=${pkgincludedir} install-nobase_includeHEADERS
+ make -C mamba/memory includedir=${pkgincludedir} install-nobase_includeHEADERS
+
+uninstall-local:
+ cd deps/mamba/common && make uninstall-nobase_includeHEADERS
+ cd deps/mamba/memory && make uinstall-nobase_includeHEADERS
+
dist-hook: dist-clean-protobuf dist-clean-protobuf-c dist-clean-mio
dist-clean-protobuf:
diff --git a/include/Makefile.am b/include/Makefile.am
index b327ba4e..dd8e6401 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -50,22 +50,8 @@ coreinclude_HEADERS = \
maestro/env.h \
maestro/logging.h
-# add mamba public headers
-mambaincludedir = $(pkgincludedir)
-mambainclude_HEADERS = \
- $(top_srcdir)/deps/mamba/common/mamba.h \
- $(top_srcdir)/deps/mamba/common/mmb_dimensions.h \
- $(top_srcdir)/deps/mamba/common/mmb_error.h \
- $(top_srcdir)/deps/mamba/common/mmb_index.h \
- $(top_srcdir)/deps/mamba/common/mmb_layout.h \
- $(top_srcdir)/deps/mamba/common/mmb_logging.h \
- $(top_srcdir)/deps/mamba/common/mmb_options.h \
- $(top_srcdir)/deps/mamba/common/mmb_set.h \
- $(top_srcdir)/deps/mamba/common/mmb_tile.h \
- $(top_srcdir)/deps/mamba/common/mmb_tile_iterator.h \
- $(top_srcdir)/deps/mamba/memory/mmb_memory.h \
- $(top_srcdir)/deps/mamba/memory/mmb_memory_options.h
-
+# mamba public headers are installed alongside maestro.h, but by a target in
+# deps/Makefile.am
noinst_HEADERS = \
--
GitLab