From 102fd7c9538a1d2fd75fb84b5a21b14a91d532c7 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 7 Dec 2017 09:19:16 +0100 Subject: bsps: Do not install This is a cache manager implementation header file. Update #3254. --- c/src/lib/libcpu/bfin/Makefile.am | 2 -- c/src/lib/libcpu/bfin/cache/cache_.h | 2 +- c/src/lib/libcpu/bfin/preinstall.am | 4 ---- c/src/lib/libcpu/i386/Makefile.am | 1 - c/src/lib/libcpu/i386/cache_.h | 2 +- c/src/lib/libcpu/i386/preinstall.am | 4 ---- c/src/lib/libcpu/lm32/Makefile.am | 3 --- c/src/lib/libcpu/lm32/preinstall.am | 18 ------------------ c/src/lib/libcpu/lm32/shared/cache/cache_.h | 2 +- c/src/lib/libcpu/m68k/Makefile.am | 4 ---- c/src/lib/libcpu/m68k/preinstall.am | 9 --------- c/src/lib/libcpu/m68k/shared/cache/cache_.h | 2 +- c/src/lib/libcpu/mips/Makefile.am | 2 +- c/src/lib/libcpu/mips/preinstall.am | 4 ---- c/src/lib/libcpu/mips/shared/cache/cache_.h | 2 +- c/src/lib/libcpu/nios2/Makefile.am | 2 -- c/src/lib/libcpu/nios2/preinstall.am | 18 ------------------ c/src/lib/libcpu/nios2/shared/cache/cache_.h | 2 +- c/src/lib/libcpu/or1k/Makefile.am | 4 ---- c/src/lib/libcpu/or1k/preinstall.am | 21 --------------------- c/src/lib/libcpu/or1k/shared/cache/cache_.h | 2 +- c/src/lib/libcpu/powerpc/Makefile.am | 2 -- c/src/lib/libcpu/powerpc/preinstall.am | 4 ---- c/src/lib/libcpu/sh/Makefile.am | 3 --- c/src/lib/libcpu/sh/preinstall.am | 9 --------- c/src/lib/libcpu/sparc/Makefile.am | 2 +- c/src/lib/libcpu/sparc/preinstall.am | 4 ---- c/src/lib/libcpu/sparc64/Makefile.am | 3 --- c/src/lib/libcpu/sparc64/preinstall.am | 18 ------------------ c/src/lib/libcpu/sparc64/shared/cache/cache_.h | 2 +- 30 files changed, 10 insertions(+), 147 deletions(-) diff --git a/c/src/lib/libcpu/bfin/Makefile.am b/c/src/lib/libcpu/bfin/Makefile.am index cc0b70bfbe..1dc90d481b 100644 --- a/c/src/lib/libcpu/bfin/Makefile.am +++ b/c/src/lib/libcpu/bfin/Makefile.am @@ -51,8 +51,6 @@ include_libcpu_HEADERS += include/spiRegs.h include_libcpu_HEADERS += include/rtcRegs.h include_libcpu_HEADERS += include/gpioRegs.h - -include_libcpu_HEADERS += ../shared/include/cache.h noinst_PROGRAMS += cache.rel cache_rel_SOURCES = cache/cache.c \ ../shared/src/cache_manager.c cache/cache_.h diff --git a/c/src/lib/libcpu/bfin/cache/cache_.h b/c/src/lib/libcpu/bfin/cache/cache_.h index dc5183744f..f739976b51 100644 --- a/c/src/lib/libcpu/bfin/cache/cache_.h +++ b/c/src/lib/libcpu/bfin/cache/cache_.h @@ -5,7 +5,7 @@ #ifndef _cache__h_ #define _cache__h_ -#include +#include "../../shared/include/cache.h" #define CPU_DATA_CACHE_ALIGNMENT 32 #define CPU_INSTRUCTION_CACHE_ALIGNMENT 32 diff --git a/c/src/lib/libcpu/bfin/preinstall.am b/c/src/lib/libcpu/bfin/preinstall.am index a8b2fa979b..c7298742e3 100644 --- a/c/src/lib/libcpu/bfin/preinstall.am +++ b/c/src/lib/libcpu/bfin/preinstall.am @@ -113,10 +113,6 @@ $(PROJECT_INCLUDE)/libcpu/gpioRegs.h: include/gpioRegs.h $(PROJECT_INCLUDE)/libc $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/gpioRegs.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/gpioRegs.h -$(PROJECT_INCLUDE)/libcpu/cache.h: ../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h - $(PROJECT_INCLUDE)/libcpu/mmu.h: mmu/mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mmu.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mmu.h diff --git a/c/src/lib/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am index 79797b5a6b..c47b9dfc39 100644 --- a/c/src/lib/libcpu/i386/Makefile.am +++ b/c/src/lib/libcpu/i386/Makefile.am @@ -7,7 +7,6 @@ include $(top_srcdir)/../../../automake/compile.am include_libcpudir = $(includedir)/libcpu include_libcpu_HEADERS = page.h cpuModel.h -include_libcpu_HEADERS += ../shared/include/cache.h include_libcpu_HEADERS += byteorder.h noinst_PROGRAMS += cache.rel diff --git a/c/src/lib/libcpu/i386/cache_.h b/c/src/lib/libcpu/i386/cache_.h index 4b48b4c63d..cefd39f3ad 100644 --- a/c/src/lib/libcpu/i386/cache_.h +++ b/c/src/lib/libcpu/i386/cache_.h @@ -9,7 +9,7 @@ #define CPU_DATA_CACHE_ALIGNMENT I386_CACHE_ALIGNMENT #define CPU_INSTRUCTION_CACHE_ALIGNEMNT I386_CACHE_ALIGNMENT -#include +#include "../shared/include/cache.h" #endif /* end of include file */ diff --git a/c/src/lib/libcpu/i386/preinstall.am b/c/src/lib/libcpu/i386/preinstall.am index dab386265b..1e6c1dfdba 100644 --- a/c/src/lib/libcpu/i386/preinstall.am +++ b/c/src/lib/libcpu/i386/preinstall.am @@ -26,10 +26,6 @@ $(PROJECT_INCLUDE)/libcpu/cpuModel.h: cpuModel.h $(PROJECT_INCLUDE)/libcpu/$(dir $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cpuModel.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cpuModel.h -$(PROJECT_INCLUDE)/libcpu/cache.h: ../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h - $(PROJECT_INCLUDE)/libcpu/byteorder.h: byteorder.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/byteorder.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/byteorder.h diff --git a/c/src/lib/libcpu/lm32/Makefile.am b/c/src/lib/libcpu/lm32/Makefile.am index e571885e1b..5de23de6cb 100644 --- a/c/src/lib/libcpu/lm32/Makefile.am +++ b/c/src/lib/libcpu/lm32/Makefile.am @@ -7,10 +7,7 @@ DISTCLEANFILES = noinst_PROGRAMS = if shared -include_libcpudir = $(includedir)/libcpu -## shared/cache -include_libcpu_HEADERS = ../shared/include/cache.h noinst_PROGRAMS += shared/cache.rel shared_cache_rel_SOURCES = ../shared/src/no_cache.c shared/cache/cache_.h \ ../shared/src/cache_manager.c diff --git a/c/src/lib/libcpu/lm32/preinstall.am b/c/src/lib/libcpu/lm32/preinstall.am index 0516c2c5bc..dba6cc4d81 100644 --- a/c/src/lib/libcpu/lm32/preinstall.am +++ b/c/src/lib/libcpu/lm32/preinstall.am @@ -5,21 +5,3 @@ $(srcdir)/preinstall.am: Makefile.am $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am endif -PREINSTALL_DIRS = -DISTCLEANFILES += $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES += $(PREINSTALL_FILES) - -if shared -$(PROJECT_INCLUDE)/libcpu/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu - @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - -$(PROJECT_INCLUDE)/libcpu/cache.h: ../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h -endif diff --git a/c/src/lib/libcpu/lm32/shared/cache/cache_.h b/c/src/lib/libcpu/lm32/shared/cache/cache_.h index 7309825870..2a303b7db7 100644 --- a/c/src/lib/libcpu/lm32/shared/cache/cache_.h +++ b/c/src/lib/libcpu/lm32/shared/cache/cache_.h @@ -5,7 +5,7 @@ #ifndef __LM32_CACHE_h #define __LM32_CACHE_h -#include +#include "../../../shared/include/cache.h" #endif /* end of include file */ diff --git a/c/src/lib/libcpu/m68k/Makefile.am b/c/src/lib/libcpu/m68k/Makefile.am index 45d7634b0f..18724352d6 100644 --- a/c/src/lib/libcpu/m68k/Makefile.am +++ b/c/src/lib/libcpu/m68k/Makefile.am @@ -5,10 +5,6 @@ include $(top_srcdir)/../../../automake/compile.am noinst_PROGRAMS = if shared -include_libcpudir = $(includedir)/libcpu - -## shared/cache -include_libcpu_HEADERS = ../shared/include/cache.h noinst_PROGRAMS += shared/cache.rel shared_cache_rel_SOURCES = shared/cache/cache.c diff --git a/c/src/lib/libcpu/m68k/preinstall.am b/c/src/lib/libcpu/m68k/preinstall.am index fb4c4aa003..258f0cb6ca 100644 --- a/c/src/lib/libcpu/m68k/preinstall.am +++ b/c/src/lib/libcpu/m68k/preinstall.am @@ -14,15 +14,6 @@ PREINSTALL_FILES = CLEANFILES = $(PREINSTALL_FILES) if shared -$(PROJECT_INCLUDE)/libcpu/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu - @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - -$(PROJECT_INCLUDE)/libcpu/cache.h: ../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h - endif if mcf5206 $(PROJECT_INCLUDE)/mcf5206/$(dirstamp): diff --git a/c/src/lib/libcpu/m68k/shared/cache/cache_.h b/c/src/lib/libcpu/m68k/shared/cache/cache_.h index 0361c912eb..af4bef638a 100644 --- a/c/src/lib/libcpu/m68k/shared/cache/cache_.h +++ b/c/src/lib/libcpu/m68k/shared/cache/cache_.h @@ -34,7 +34,7 @@ #define CPU_INSTRUCTION_CACHE_ALIGNMENT M68K_INSTRUCTION_CACHE_ALIGNMENT #endif -#include +#include "../../../shared/include/cache.h" #endif /* end of include file */ diff --git a/c/src/lib/libcpu/mips/Makefile.am b/c/src/lib/libcpu/mips/Makefile.am index b261afe92f..2630fc29d7 100644 --- a/c/src/lib/libcpu/mips/Makefile.am +++ b/c/src/lib/libcpu/mips/Makefile.am @@ -9,7 +9,7 @@ noinst_PROGRAMS = ## cache include_libcpudir = $(includedir)/libcpu -include_libcpu_HEADERS = ../shared/include/cache.h +include_libcpu_HEADERS = noinst_PROGRAMS += shared/cache.rel shared_cache_rel_SOURCES = shared/cache/cache.c \ diff --git a/c/src/lib/libcpu/mips/preinstall.am b/c/src/lib/libcpu/mips/preinstall.am index 85aec82749..6d302e501b 100644 --- a/c/src/lib/libcpu/mips/preinstall.am +++ b/c/src/lib/libcpu/mips/preinstall.am @@ -18,10 +18,6 @@ $(PROJECT_INCLUDE)/libcpu/$(dirstamp): @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -$(PROJECT_INCLUDE)/libcpu/cache.h: ../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h - $(PROJECT_INCLUDE)/libcpu/isr_entries.h: shared/interrupts/isr_entries.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/isr_entries.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/isr_entries.h diff --git a/c/src/lib/libcpu/mips/shared/cache/cache_.h b/c/src/lib/libcpu/mips/shared/cache/cache_.h index d51c4ee075..a81c5a098a 100644 --- a/c/src/lib/libcpu/mips/shared/cache/cache_.h +++ b/c/src/lib/libcpu/mips/shared/cache/cache_.h @@ -5,7 +5,7 @@ #ifndef __MIPS_CACHE_h #define __MIPS_CACHE_h -#include +#include "../../../shared/include/cache.h" /* TBD */ diff --git a/c/src/lib/libcpu/nios2/Makefile.am b/c/src/lib/libcpu/nios2/Makefile.am index e249998acf..fee88258c7 100644 --- a/c/src/lib/libcpu/nios2/Makefile.am +++ b/c/src/lib/libcpu/nios2/Makefile.am @@ -7,10 +7,8 @@ DISTCLEANFILES = noinst_PROGRAMS = if shared -include_libcpudir = $(includedir)/libcpu ## shared/cache -include_libcpu_HEADERS = ../shared/include/cache.h noinst_PROGRAMS += shared/cache.rel shared_cache_rel_SOURCES = ../shared/src/no_cache.c shared/cache/cache_.h \ ../shared/src/cache_manager.c diff --git a/c/src/lib/libcpu/nios2/preinstall.am b/c/src/lib/libcpu/nios2/preinstall.am index 0516c2c5bc..dba6cc4d81 100644 --- a/c/src/lib/libcpu/nios2/preinstall.am +++ b/c/src/lib/libcpu/nios2/preinstall.am @@ -5,21 +5,3 @@ $(srcdir)/preinstall.am: Makefile.am $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am endif -PREINSTALL_DIRS = -DISTCLEANFILES += $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES += $(PREINSTALL_FILES) - -if shared -$(PROJECT_INCLUDE)/libcpu/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu - @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - -$(PROJECT_INCLUDE)/libcpu/cache.h: ../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h -endif diff --git a/c/src/lib/libcpu/nios2/shared/cache/cache_.h b/c/src/lib/libcpu/nios2/shared/cache/cache_.h index 62a9fd8541..1a83b8eb23 100644 --- a/c/src/lib/libcpu/nios2/shared/cache/cache_.h +++ b/c/src/lib/libcpu/nios2/shared/cache/cache_.h @@ -28,7 +28,7 @@ #define CPU_INSTRUCTION_CACHE_ALIGNMENT M68K_INSTRUCTION_CACHE_ALIGNMENT #endif -#include +#include "../../../shared/include/cache.h" #endif /* end of include file */ diff --git a/c/src/lib/libcpu/or1k/Makefile.am b/c/src/lib/libcpu/or1k/Makefile.am index 8971f4d65b..9c9921a100 100644 --- a/c/src/lib/libcpu/or1k/Makefile.am +++ b/c/src/lib/libcpu/or1k/Makefile.am @@ -6,11 +6,7 @@ CLEANFILES = DISTCLEANFILES = noinst_PROGRAMS = -include_libcpudir = $(includedir)/libcpu - ## shared/cache -include_libcpu_HEADERS = ../shared/include/cache.h -include_libcpu_HEADERS += shared/cache/cache_.h noinst_PROGRAMS += shared/cache.rel shared_cache_rel_SOURCES = shared/cache/cache.c ../shared/src/cache_manager.c shared_cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/cache diff --git a/c/src/lib/libcpu/or1k/preinstall.am b/c/src/lib/libcpu/or1k/preinstall.am index 84864cb86b..dba6cc4d81 100644 --- a/c/src/lib/libcpu/or1k/preinstall.am +++ b/c/src/lib/libcpu/or1k/preinstall.am @@ -5,24 +5,3 @@ $(srcdir)/preinstall.am: Makefile.am $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am endif -PREINSTALL_DIRS = -DISTCLEANFILES += $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES += $(PREINSTALL_FILES) - -$(PROJECT_INCLUDE)/libcpu/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu - @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - -$(PROJECT_INCLUDE)/libcpu/cache.h: ../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h - -$(PROJECT_INCLUDE)/libcpu/cache_.h: shared/cache/cache_.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache_.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache_.h - diff --git a/c/src/lib/libcpu/or1k/shared/cache/cache_.h b/c/src/lib/libcpu/or1k/shared/cache/cache_.h index 8d96595cf6..ea379580d5 100644 --- a/c/src/lib/libcpu/or1k/shared/cache/cache_.h +++ b/c/src/lib/libcpu/or1k/shared/cache/cache_.h @@ -6,7 +6,7 @@ #define __OR1K_CACHE_H #include -#include +#include "../../../shared/include/cache.h" #define CPU_CACHE_SUPPORT_PROVIDES_RANGE_FUNCTIONS 1 diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am index 8278d60974..ed4c6056a2 100644 --- a/c/src/lib/libcpu/powerpc/Makefile.am +++ b/c/src/lib/libcpu/powerpc/Makefile.am @@ -86,8 +86,6 @@ shared_cache_rel_SOURCES = shared/src/cache_.h \ shared_cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/src shared_cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include_libcpu_HEADERS += ../shared/include/cache.h - # shared/stack noinst_PROGRAMS += shared/stack.rel shared_stack_rel_SOURCES = shared/src/stack.c shared/include/spr.h shared/src/stackTrace.h diff --git a/c/src/lib/libcpu/powerpc/preinstall.am b/c/src/lib/libcpu/powerpc/preinstall.am index 398def6bd2..69dd1d3517 100644 --- a/c/src/lib/libcpu/powerpc/preinstall.am +++ b/c/src/lib/libcpu/powerpc/preinstall.am @@ -94,10 +94,6 @@ $(PROJECT_INCLUDE)/libcpu/cpuIdent.h: shared/include/cpuIdent.h $(PROJECT_INCLUD $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cpuIdent.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cpuIdent.h -$(PROJECT_INCLUDE)/libcpu/cache.h: ../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h - $(PROJECT_INCLUDE)/libcpu/spr.h: shared/include/spr.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/spr.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/spr.h diff --git a/c/src/lib/libcpu/sh/Makefile.am b/c/src/lib/libcpu/sh/Makefile.am index 5c0a6ed960..f659bf66c6 100644 --- a/c/src/lib/libcpu/sh/Makefile.am +++ b/c/src/lib/libcpu/sh/Makefile.am @@ -4,9 +4,6 @@ include $(top_srcdir)/../../../automake/compile.am noinst_PROGRAMS = -include_libcpudir = $(includedir)/libcpu -include_libcpu_HEADERS = ../shared/include/cache.h - noinst_PROGRAMS += cache.rel cache_rel_SOURCES = ../shared/src/cache_manager.c cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/cache diff --git a/c/src/lib/libcpu/sh/preinstall.am b/c/src/lib/libcpu/sh/preinstall.am index d6d7b83976..9b12347225 100644 --- a/c/src/lib/libcpu/sh/preinstall.am +++ b/c/src/lib/libcpu/sh/preinstall.am @@ -13,15 +13,6 @@ all-am: $(PREINSTALL_FILES) PREINSTALL_FILES = CLEANFILES = $(PREINSTALL_FILES) -$(PROJECT_INCLUDE)/libcpu/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu - @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - -$(PROJECT_INCLUDE)/libcpu/cache.h: ../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h - if sh7032 $(PROJECT_INCLUDE)/sh/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/sh diff --git a/c/src/lib/libcpu/sparc/Makefile.am b/c/src/lib/libcpu/sparc/Makefile.am index c7565d8dd8..f9872214f4 100644 --- a/c/src/lib/libcpu/sparc/Makefile.am +++ b/c/src/lib/libcpu/sparc/Makefile.am @@ -5,7 +5,7 @@ include $(top_srcdir)/../../../automake/compile.am noinst_PROGRAMS = include_libcpudir = $(includedir)/libcpu -include_libcpu_HEADERS = ../shared/include/cache.h +include_libcpu_HEADERS = include_libcpu_HEADERS += include/libcpu/byteorder.h include_libcpu_HEADERS += include/libcpu/access.h diff --git a/c/src/lib/libcpu/sparc/preinstall.am b/c/src/lib/libcpu/sparc/preinstall.am index 2efe38bb30..3e4a2a3c88 100644 --- a/c/src/lib/libcpu/sparc/preinstall.am +++ b/c/src/lib/libcpu/sparc/preinstall.am @@ -18,10 +18,6 @@ $(PROJECT_INCLUDE)/libcpu/$(dirstamp): @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -$(PROJECT_INCLUDE)/libcpu/cache.h: ../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h - $(PROJECT_INCLUDE)/libcpu/byteorder.h: include/libcpu/byteorder.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/byteorder.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/byteorder.h diff --git a/c/src/lib/libcpu/sparc64/Makefile.am b/c/src/lib/libcpu/sparc64/Makefile.am index b0a1f84bcb..f7b3beb350 100644 --- a/c/src/lib/libcpu/sparc64/Makefile.am +++ b/c/src/lib/libcpu/sparc64/Makefile.am @@ -10,9 +10,6 @@ noinst_PROGRAMS = # The other shared code is probably usable, but should be defined separately. # See the example at the end of Makefile.am. if shared -include_libcpudir = $(includedir)/libcpu - -include_libcpu_HEADERS = ../shared/include/cache.h noinst_PROGRAMS += shared/shared-score.rel shared_shared_score_rel_SOURCES = shared/score/cpu.c shared/score/interrupt.S diff --git a/c/src/lib/libcpu/sparc64/preinstall.am b/c/src/lib/libcpu/sparc64/preinstall.am index 83b91530a4..dba6cc4d81 100644 --- a/c/src/lib/libcpu/sparc64/preinstall.am +++ b/c/src/lib/libcpu/sparc64/preinstall.am @@ -5,21 +5,3 @@ $(srcdir)/preinstall.am: Makefile.am $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am endif -PREINSTALL_DIRS = -DISTCLEANFILES = $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - -if shared -$(PROJECT_INCLUDE)/libcpu/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu - @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - -$(PROJECT_INCLUDE)/libcpu/cache.h: ../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h -endif diff --git a/c/src/lib/libcpu/sparc64/shared/cache/cache_.h b/c/src/lib/libcpu/sparc64/shared/cache/cache_.h index 064456f796..fc3600f380 100644 --- a/c/src/lib/libcpu/sparc64/shared/cache/cache_.h +++ b/c/src/lib/libcpu/sparc64/shared/cache/cache_.h @@ -18,7 +18,7 @@ #define CPU_INSTRUCTION_CACHE_ALIGNMENT 0 #endif -#include +#include "../../../shared/include/cache.h" #endif /* end of include file */ -- cgit v1.2.3