diff options
Diffstat (limited to 'c/src/lib/libcpu/or1k')
| -rw-r--r-- | c/src/lib/libcpu/or1k/Makefile.am | 4 | ||||
| -rw-r--r-- | c/src/lib/libcpu/or1k/preinstall.am | 21 | ||||
| -rw-r--r-- | c/src/lib/libcpu/or1k/shared/cache/cache_.h | 2 |
3 files changed, 1 insertions, 26 deletions
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 <bsp/cache_.h> -#include <libcpu/cache.h> +#include "../../../shared/include/cache.h" #define CPU_CACHE_SUPPORT_PROVIDES_RANGE_FUNCTIONS 1 |