7 files changed, 2 insertions, 39 deletions
diff --git a/c/src/lib/libcpu/arm/shared/include/am335x.h b/bsps/arm/include/libcpu/am335x.h
index 367e97cae9..367e97cae9 100644
--- a/c/src/lib/libcpu/arm/shared/include/am335x.h
+++ b/bsps/arm/include/libcpu/am335x.h
diff --git a/c/src/lib/libcpu/arm/shared/include/mmu.h b/bsps/arm/include/libcpu/mmu.h
index b82e838695..b82e838695 100644
--- a/c/src/lib/libcpu/arm/shared/include/mmu.h
+++ b/bsps/arm/include/libcpu/mmu.h
diff --git a/c/src/lib/libcpu/arm/shared/include/omap3.h b/bsps/arm/include/libcpu/omap3.h
index 0cc43d6383..0cc43d6383 100644
--- a/c/src/lib/libcpu/arm/shared/include/omap3.h
+++ b/bsps/arm/include/libcpu/omap3.h
diff --git a/c/src/lib/libcpu/arm/shared/include/omap_timer.h b/bsps/arm/include/libcpu/omap_timer.h
index ef8787a571..ef8787a571 100644
--- a/c/src/lib/libcpu/arm/shared/include/omap_timer.h
+++ b/bsps/arm/include/libcpu/omap_timer.h
diff --git a/c/src/lib/libcpu/arm/Makefile.am b/c/src/lib/libcpu/arm/Makefile.am
index 7f76673cfd..35b08e2495 100644
--- a/c/src/lib/libcpu/arm/Makefile.am
+++ b/c/src/lib/libcpu/arm/Makefile.am
@@ -6,17 +6,9 @@ EXTRA_DIST =
 
 noinst_PROGRAMS =
 
-include_bspdir = $(includedir)/bsp
-include_libcpudir = $(includedir)/libcpu
-
-include_bsp_HEADERS =
-include_libcpu_HEADERS =
-
 ## shared/include
 if shared
 
-include_libcpu_HEADERS += shared/include/mmu.h
-
 ## shared/arm920
 noinst_PROGRAMS += shared/arm920.rel
 shared_arm920_rel_SOURCES = shared/arm920/mmu.c
@@ -24,5 +16,4 @@ shared_arm920_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/src
 shared_arm920_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/arm/configure.ac b/c/src/lib/libcpu/arm/configure.ac
index c72c34eb19..a5e3e1cc88 100644
--- a/c/src/lib/libcpu/arm/configure.ac
+++ b/c/src/lib/libcpu/arm/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libcpu-arm],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([shared])
 RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 
diff --git a/c/src/lib/libcpu/arm/preinstall.am b/c/src/lib/libcpu/arm/preinstall.am
deleted file mode 100644
index 31e0da295b..0000000000
--- a/c/src/lib/libcpu/arm/preinstall.am
+++ /dev/null
@@ -1,30 +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)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
-	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-if shared
-$(PROJECT_INCLUDE)/libcpu/mmu.h: shared/include/mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mmu.h
-endif