summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libcpu/nios2
diff options
context:
space:
mode:
Diffstat (limited to 'c/src/lib/libcpu/nios2')
-rw-r--r--c/src/lib/libcpu/nios2/Makefile.am2
-rw-r--r--c/src/lib/libcpu/nios2/preinstall.am18
-rw-r--r--c/src/lib/libcpu/nios2/shared/cache/cache_.h2
3 files changed, 1 insertions, 21 deletions
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 <libcpu/cache.h>
+#include "../../../shared/include/cache.h"
#endif
/* end of include file */