9 files changed, 2 insertions, 62 deletions
diff --git a/c/src/lib/libcpu/mips/au1x00/include/au1x00.h b/bsps/mips/include/libcpu/au1x00.h
index a85a39ed48..a85a39ed48 100644
--- a/c/src/lib/libcpu/mips/au1x00/include/au1x00.h
+++ b/bsps/mips/include/libcpu/au1x00.h
diff --git a/c/src/lib/libcpu/mips/shared/interrupts/isr_entries.h b/bsps/mips/include/libcpu/isr_entries.h
index e142018be7..e142018be7 100644
--- a/c/src/lib/libcpu/mips/shared/interrupts/isr_entries.h
+++ b/bsps/mips/include/libcpu/isr_entries.h
diff --git a/c/src/lib/libcpu/mips/rm52xx/include/rm5231.h b/bsps/mips/include/libcpu/rm5231.h
index c9ad3f9861..c9ad3f9861 100644
--- a/c/src/lib/libcpu/mips/rm52xx/include/rm5231.h
+++ b/bsps/mips/include/libcpu/rm5231.h
diff --git a/c/src/lib/libcpu/mips/tx39/include/tx3904.h b/bsps/mips/include/libcpu/tx3904.h
index b573d3c7d9..b573d3c7d9 100644
--- a/c/src/lib/libcpu/mips/tx39/include/tx3904.h
+++ b/bsps/mips/include/libcpu/tx3904.h
diff --git a/c/src/lib/libcpu/mips/tx49/include/tx4925.h b/bsps/mips/include/libcpu/tx4925.h
index 56f58d9bf3..56f58d9bf3 100644
--- a/c/src/lib/libcpu/mips/tx49/include/tx4925.h
+++ b/bsps/mips/include/libcpu/tx4925.h
diff --git a/c/src/lib/libcpu/mips/tx49/include/tx4938.h b/bsps/mips/include/libcpu/tx4938.h
index 5005cc4149..5005cc4149 100644
--- a/c/src/lib/libcpu/mips/tx49/include/tx4938.h
+++ b/bsps/mips/include/libcpu/tx4938.h
diff --git a/c/src/lib/libcpu/mips/Makefile.am b/c/src/lib/libcpu/mips/Makefile.am
index 2630fc29d7..84dc521fac 100644
--- a/c/src/lib/libcpu/mips/Makefile.am
+++ b/c/src/lib/libcpu/mips/Makefile.am
@@ -7,10 +7,6 @@ EXTRA_DIST =
 noinst_PROGRAMS =
 
 ## cache
-include_libcpudir = $(includedir)/libcpu
-
-include_libcpu_HEADERS =
-
 noinst_PROGRAMS += shared/cache.rel
 shared_cache_rel_SOURCES = shared/cache/cache.c \
     ../shared/src/cache_manager.c shared/cache/cache_.h
@@ -36,15 +32,10 @@ shared_interrupts_rel_SOURCES = shared/interrupts/installisrentries.c \
     shared/interrupts/isr_entries.S shared/interrupts/isr_entries.h
 shared_interrupts_rel_CPPFLAGS = $(AM_CPPFLAGS) $(interrupts_CPPFLAGS)
 shared_interrupts_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-include_libcpu_HEADERS += shared/interrupts/isr_entries.h
-
 if tx39
-include_libcpu_HEADERS += tx39/include/tx3904.h
 endif
 
 if tx49
-include_libcpu_HEADERS += tx49/include/tx4925.h tx49/include/tx4938.h
-
 noinst_PROGRAMS += tx49/timer.rel
 tx49_timer_rel_SOURCES = timer/timer.c timer/gettime.S
 tx49_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
@@ -52,18 +43,13 @@ tx49_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
 if au1x00
-include_libcpu_HEADERS += au1x00/include/au1x00.h
-
 endif
 
 if rm52xx
-include_libcpu_HEADERS += rm52xx/include/rm5231.h
-
 noinst_PROGRAMS += rm52xx/timer.rel
 rm52xx_timer_rel_SOURCES = timer/timer.c timer/gettime.S
 rm52xx_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
 rm52xx_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/configure.ac b/c/src/lib/libcpu/mips/configure.ac
index 324dd312f7..6a9e2665d9 100644
--- a/c/src/lib/libcpu/mips/configure.ac
+++ b/c/src/lib/libcpu/mips/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libcpu-mips],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([timer])
 RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 
diff --git a/c/src/lib/libcpu/mips/preinstall.am b/c/src/lib/libcpu/mips/preinstall.am
deleted file mode 100644
index 6d302e501b..0000000000
--- a/c/src/lib/libcpu/mips/preinstall.am
+++ /dev/null
@@ -1,48 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(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/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
-
-if tx39
-$(PROJECT_INCLUDE)/libcpu/tx3904.h: tx39/include/tx3904.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/tx3904.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx3904.h
-endif
-if tx49
-$(PROJECT_INCLUDE)/libcpu/tx4925.h: tx49/include/tx4925.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/tx4925.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx4925.h
-
-$(PROJECT_INCLUDE)/libcpu/tx4938.h: tx49/include/tx4938.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/tx4938.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx4938.h
-endif
-if au1x00
-$(PROJECT_INCLUDE)/libcpu/au1x00.h: au1x00/include/au1x00.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/au1x00.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/au1x00.h
-endif
-if rm52xx
-$(PROJECT_INCLUDE)/libcpu/rm5231.h: rm52xx/include/rm5231.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/rm5231.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/rm5231.h
-endif