From 7cd389e84393ded9100be8c4a82c58892420c696 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 4 Jan 2018 09:31:47 +0100
Subject: bsps/m68k: Install shared <mvme16x_hw.h>

Update #3254.
---
 c/src/lib/libbsp/m68k/Makefile.am           | 2 +-
 c/src/lib/libbsp/m68k/mvme162/Makefile.am   | 2 --
 c/src/lib/libbsp/m68k/mvme162/preinstall.am | 4 ----
 c/src/lib/libbsp/m68k/mvme167/Makefile.am   | 2 --
 c/src/lib/libbsp/m68k/mvme167/preinstall.am | 4 ----
 c/src/lib/libbsp/m68k/preinstall.am         | 9 +++++++++
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/c/src/lib/libbsp/m68k/Makefile.am b/c/src/lib/libbsp/m68k/Makefile.am
index 634f7ff898..e03929f5e7 100644
--- a/c/src/lib/libbsp/m68k/Makefile.am
+++ b/c/src/lib/libbsp/m68k/Makefile.am
@@ -14,7 +14,7 @@ EXTRA_DIST += shared/start.S
 
 EXTRA_DIST += shared/bspspuriousinit.c shared/m68000spurious.c
 
-EXTRA_DIST += shared/mvme/mvme16x_hw.h
+include_HEADERS = shared/mvme/mvme16x_hw.h
 
 EXTRA_DIST += shared/gdbstub/m68k-stub.c shared/gdbstub/gdb_if.h
 
diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
index 096967b0d7..2ea3f528fe 100644
--- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
@@ -18,8 +18,6 @@ noinst_PROGRAMS =
 
 include_HEADERS += include/page_table.h
 
-nodist_include_HEADERS += $(top_srcdir)/../shared/mvme/mvme16x_hw.h
-
 ## Zilog component header files
 include_rtems_zilogdir = $(includedir)/rtems/zilog
 include_rtems_zilog_HEADERS = ../../shared/include/zilog/z8036.h
diff --git a/c/src/lib/libbsp/m68k/mvme162/preinstall.am b/c/src/lib/libbsp/m68k/mvme162/preinstall.am
index ba1cacb215..fe2fdb9359 100644
--- a/c/src/lib/libbsp/m68k/mvme162/preinstall.am
+++ b/c/src/lib/libbsp/m68k/mvme162/preinstall.am
@@ -57,10 +57,6 @@ $(PROJECT_INCLUDE)/page_table.h: include/page_table.h $(PROJECT_INCLUDE)/$(dirst
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/page_table.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/page_table.h
 
-$(PROJECT_INCLUDE)/mvme16x_hw.h: $(top_srcdir)/../shared/mvme/mvme16x_hw.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mvme16x_hw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.h
-
 $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp):
 	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/zilog
 	@: > $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
index dd9c968fb5..a295731802 100644
--- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
@@ -18,8 +18,6 @@ noinst_PROGRAMS =
 
 include_HEADERS += include/page_table.h
 
-nodist_include_HEADERS += $(top_srcdir)/../shared/mvme/mvme16x_hw.h
-
 EXTRA_DIST += ../../m68k/shared/start/start.S
 start.$(OBJEXT): ../../m68k/shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
diff --git a/c/src/lib/libbsp/m68k/mvme167/preinstall.am b/c/src/lib/libbsp/m68k/mvme167/preinstall.am
index a3c7ad0dc8..60f6c0ba9f 100644
--- a/c/src/lib/libbsp/m68k/mvme167/preinstall.am
+++ b/c/src/lib/libbsp/m68k/mvme167/preinstall.am
@@ -57,10 +57,6 @@ $(PROJECT_INCLUDE)/page_table.h: include/page_table.h $(PROJECT_INCLUDE)/$(dirst
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/page_table.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/page_table.h
 
-$(PROJECT_INCLUDE)/mvme16x_hw.h: $(top_srcdir)/../shared/mvme/mvme16x_hw.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mvme16x_hw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.h
-
 $(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
 TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
diff --git a/c/src/lib/libbsp/m68k/preinstall.am b/c/src/lib/libbsp/m68k/preinstall.am
index 97c38e214f..2e2ec9e167 100644
--- a/c/src/lib/libbsp/m68k/preinstall.am
+++ b/c/src/lib/libbsp/m68k/preinstall.am
@@ -18,6 +18,11 @@ $(PROJECT_LIB)/$(dirstamp):
 	@: > $(PROJECT_LIB)/$(dirstamp)
 PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
 
+$(PROJECT_INCLUDE)/$(dirstamp):
+	@$(MKDIR_P) $(PROJECT_INCLUDE)
+	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
+
 $(PROJECT_INCLUDE)/bsp/$(dirstamp):
 	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
 	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
@@ -31,3 +36,7 @@ $(PROJECT_LIB)/linkcmds.base: shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirs
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
 PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
 
+$(PROJECT_INCLUDE)/mvme16x_hw.h: shared/mvme/mvme16x_hw.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mvme16x_hw.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.h
+
-- 
cgit v1.2.3