18 files changed, 2 insertions, 156 deletions
diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/mcf5206e.h b/bsps/m68k/include/mcf5206/mcf5206e.h
index 06dadca9b1..06dadca9b1 100644
--- a/c/src/lib/libcpu/m68k/mcf5206/include/mcf5206e.h
+++ b/bsps/m68k/include/mcf5206/mcf5206e.h
diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h b/bsps/m68k/include/mcf5206/mcfmbus.h
index f70a70e483..f70a70e483 100644
--- a/c/src/lib/libcpu/m68k/mcf5206/include/mcfmbus.h
+++ b/bsps/m68k/include/mcf5206/mcfmbus.h
diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h b/bsps/m68k/include/mcf5206/mcfuart.h
index bd9df5bb56..bd9df5bb56 100644
--- a/c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h
+++ b/bsps/m68k/include/mcf5206/mcfuart.h
diff --git a/c/src/lib/libcpu/m68k/mcf5223x/include/mcf5223x.h b/bsps/m68k/include/mcf5223x/mcf5223x.h
index 0886105b17..0886105b17 100644
--- a/c/src/lib/libcpu/m68k/mcf5223x/include/mcf5223x.h
+++ b/bsps/m68k/include/mcf5223x/mcf5223x.h
diff --git a/c/src/lib/libcpu/m68k/mcf5225x/include/fec.h b/bsps/m68k/include/mcf5225x/fec.h
index 8d8d6c3763..8d8d6c3763 100644
--- a/c/src/lib/libcpu/m68k/mcf5225x/include/fec.h
+++ b/bsps/m68k/include/mcf5225x/fec.h
diff --git a/c/src/lib/libcpu/m68k/mcf5225x/include/mcf5225x.h b/bsps/m68k/include/mcf5225x/mcf5225x.h
index ded447ffac..ded447ffac 100644
--- a/c/src/lib/libcpu/m68k/mcf5225x/include/mcf5225x.h
+++ b/bsps/m68k/include/mcf5225x/mcf5225x.h
diff --git a/c/src/lib/libcpu/m68k/mcf5235/include/mcf5235.h b/bsps/m68k/include/mcf5235/mcf5235.h
index 87e0d91541..87e0d91541 100644
--- a/c/src/lib/libcpu/m68k/mcf5235/include/mcf5235.h
+++ b/bsps/m68k/include/mcf5235/mcf5235.h
diff --git a/c/src/lib/libcpu/m68k/mcf5272/include/mcf5272.h b/bsps/m68k/include/mcf5272/mcf5272.h
index 37dae92d98..37dae92d98 100644
--- a/c/src/lib/libcpu/m68k/mcf5272/include/mcf5272.h
+++ b/bsps/m68k/include/mcf5272/mcf5272.h
diff --git a/c/src/lib/libcpu/m68k/mcf5282/include/mcf5282.h b/bsps/m68k/include/mcf5282/mcf5282.h
index 3724f489de..3724f489de 100644
--- a/c/src/lib/libcpu/m68k/mcf5282/include/mcf5282.h
+++ b/bsps/m68k/include/mcf5282/mcf5282.h
diff --git a/c/src/lib/libcpu/m68k/mcf532x/include/mcf532x.h b/bsps/m68k/include/mcf532x/mcf532x.h
index 798fb1175b..798fb1175b 100644
--- a/c/src/lib/libcpu/m68k/mcf532x/include/mcf532x.h
+++ b/bsps/m68k/include/mcf532x/mcf532x.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dma.h b/bsps/m68k/include/mcf548x/MCD_dma.h
index ea6f8863cb..ea6f8863cb 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_dma.h
+++ b/bsps/m68k/include/mcf548x/MCD_dma.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_progCheck.h b/bsps/m68k/include/mcf548x/MCD_progCheck.h
index e0f578fdaf..e0f578fdaf 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_progCheck.h
+++ b/bsps/m68k/include/mcf548x/MCD_progCheck.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasksInit.h b/bsps/m68k/include/mcf548x/MCD_tasksInit.h
index daf871cd6d..daf871cd6d 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/MCD_tasksInit.h
+++ b/bsps/m68k/include/mcf548x/MCD_tasksInit.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/mcdma/mcdma_glue.h b/bsps/m68k/include/mcf548x/mcdma_glue.h
index de0621120f..de0621120f 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/mcdma/mcdma_glue.h
+++ b/bsps/m68k/include/mcf548x/mcdma_glue.h
diff --git a/c/src/lib/libcpu/m68k/mcf548x/include/mcf548x.h b/bsps/m68k/include/mcf548x/mcf548x.h
index 7a9dc73698..7a9dc73698 100644
--- a/c/src/lib/libcpu/m68k/mcf548x/include/mcf548x.h
+++ b/bsps/m68k/include/mcf548x/mcf548x.h
diff --git a/c/src/lib/libcpu/m68k/Makefile.am b/c/src/lib/libcpu/m68k/Makefile.am
index 18724352d6..2800e421c4 100644
--- a/c/src/lib/libcpu/m68k/Makefile.am
+++ b/c/src/lib/libcpu/m68k/Makefile.am
@@ -67,10 +67,6 @@ EXTRA_DIST = m68040/fpsp/README
 
 if mcf5206
 # mcf5206/include
-include_mcf5206dir = $(includedir)/mcf5206
-include_mcf5206_HEADERS = mcf5206/include/mcf5206e.h mcf5206/include/mcfmbus.h \
-    mcf5206/include/mcfuart.h
-
 ## mcf5206/clock
 noinst_PROGRAMS += mcf5206/clock.rel
 mcf5206_clock_rel_SOURCES = mcf5206/clock/ckinit.c
@@ -98,9 +94,6 @@ endif
 
 if mcf5223x
 ## mcf5223x/include
-include_mcf5223xdir = $(includedir)/mcf5223x
-include_mcf5223x_HEADERS = mcf5223x/include/mcf5223x.h
-
 ## mcf5223x/cache
 noinst_PROGRAMS += mcf5223x/cachepd.rel
 mcf5223x_cachepd_rel_SOURCES = mcf5223x/cache/cachepd.c
@@ -110,9 +103,6 @@ endif
 
 if mcf5225x
 ## mcf5225x/include
-include_mcf5225xdir = $(includedir)/mcf5225x
-include_mcf5225x_HEADERS = mcf5225x/include/mcf5225x.h
-
 # mcf5225x/cache
 noinst_PROGRAMS += mcf5225x/cachepd.rel
 mcf5225x_cachepd_rel_SOURCES = mcf5225x/cache/cachepd.c
@@ -121,15 +111,11 @@ mcf5225x_cachepd_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # Network
 if HAS_NETWORKING
-include_mcf5225x_HEADERS += mcf5225x/include/fec.h
 endif ## HAS_NETWORKING
 endif
 
 if mcf5235
 ## mcf5235/include
-include_mcf5235dir = $(includedir)/mcf5235
-include_mcf5235_HEADERS = mcf5235/include/mcf5235.h
-
 ## mcf5235/cache
 noinst_PROGRAMS += mcf5235/cachepd.rel
 mcf5235_cachepd_rel_SOURCES = mcf5235/cache/cachepd.c
@@ -139,9 +125,6 @@ endif
 
 if mcf532x
 ## mcf532x/include
-include_mcf532xdir = $(includedir)/mcf532x
-include_mcf532x_HEADERS = mcf532x/include/mcf532x.h
-
 ## mcf532x/cache
 noinst_PROGRAMS += mcf532x/cachepd.rel
 mcf532x_cachepd_rel_SOURCES = mcf532x/cache/cachepd.c
@@ -151,9 +134,6 @@ endif
 
 if mcf5272
 ## mcf5272/include
-include_mcf5272dir = $(includedir)/mcf5272
-include_mcf5272_HEADERS = mcf5272/include/mcf5272.h
-
 ## clock
 noinst_PROGRAMS += mcf5272/clock.rel
 mcf5272_clock_rel_SOURCES = mcf5272/clock/ckinit.c
@@ -169,9 +149,6 @@ endif
 
 if mcf5282
 ## mcf5282/include
-include_mcf5282dir = $(includedir)/mcf5282
-include_mcf5282_HEADERS = mcf5282/include/mcf5282.h
-
 noinst_PROGRAMS += mcf5282/cachepd.rel
 mcf5282_cachepd_rel_SOURCES = mcf5282/cache/cachepd.c
 mcf5282_cachepd_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/cache
@@ -180,13 +157,8 @@ endif
 
 if mcf548x
 ## mcf548x/include
-include_mcf548xdir = $(includedir)/mcf548x
-include_mcf548x_HEADERS = mcf548x/include/mcf548x.h
-
 ## mcf548x/mcdma
 noinst_PROGRAMS += mcf548x/mcdma.rel
-include_mcf548x_HEADERS +=  mcf548x/mcdma/MCD_progCheck.h mcf548x/mcdma/MCD_dma.h \
-                            mcf548x/mcdma/MCD_tasksInit.h mcf548x/mcdma/mcdma_glue.h
 mcf548x_mcdma_rel_SOURCES = mcf548x/mcdma/MCD_dmaApi.c mcf548x/mcdma/MCD_tasksInit.c \
                             mcf548x/mcdma/MCD_tasks.c  mcf548x/mcdma/mcdma_glue.c
 
@@ -194,5 +166,4 @@ mcf548x_mcdma_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mcf548x_mcdma_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/m68k/configure.ac b/c/src/lib/libcpu/m68k/configure.ac
index 99596c1a3e..5f24e9efd4 100644
--- a/c/src/lib/libcpu/m68k/configure.ac
+++ b/c/src/lib/libcpu/m68k/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libcpu-m68k],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([m68040])
 RTEMS_TOP([../../../../..],[../../..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 
diff --git a/c/src/lib/libcpu/m68k/preinstall.am b/c/src/lib/libcpu/m68k/preinstall.am
deleted file mode 100644
index 258f0cb6ca..0000000000
--- a/c/src/lib/libcpu/m68k/preinstall.am
+++ /dev/null
@@ -1,127 +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)
-
-if shared
-endif
-if mcf5206
-$(PROJECT_INCLUDE)/mcf5206/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5206
-	@: > $(PROJECT_INCLUDE)/mcf5206/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5206/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf5206/mcf5206e.h: mcf5206/include/mcf5206e.h $(PROJECT_INCLUDE)/mcf5206/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5206/mcf5206e.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5206/mcf5206e.h
-
-$(PROJECT_INCLUDE)/mcf5206/mcfmbus.h: mcf5206/include/mcfmbus.h $(PROJECT_INCLUDE)/mcf5206/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5206/mcfmbus.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5206/mcfmbus.h
-
-$(PROJECT_INCLUDE)/mcf5206/mcfuart.h: mcf5206/include/mcfuart.h $(PROJECT_INCLUDE)/mcf5206/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5206/mcfuart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5206/mcfuart.h
-endif
-if mcf5223x
-$(PROJECT_INCLUDE)/mcf5223x/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5223x
-	@: > $(PROJECT_INCLUDE)/mcf5223x/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5223x/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf5223x/mcf5223x.h: mcf5223x/include/mcf5223x.h $(PROJECT_INCLUDE)/mcf5223x/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5223x/mcf5223x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5223x/mcf5223x.h
-endif
-if mcf5225x
-$(PROJECT_INCLUDE)/mcf5225x/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5225x
-	@: > $(PROJECT_INCLUDE)/mcf5225x/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5225x/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf5225x/mcf5225x.h: mcf5225x/include/mcf5225x.h $(PROJECT_INCLUDE)/mcf5225x/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5225x/mcf5225x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5225x/mcf5225x.h
-
-if HAS_NETWORKING
-$(PROJECT_INCLUDE)/mcf5225x/fec.h: mcf5225x/include/fec.h $(PROJECT_INCLUDE)/mcf5225x/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5225x/fec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5225x/fec.h
-endif ## HAS_NETWORKING
-endif
-if mcf5235
-$(PROJECT_INCLUDE)/mcf5235/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5235
-	@: > $(PROJECT_INCLUDE)/mcf5235/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5235/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf5235/mcf5235.h: mcf5235/include/mcf5235.h $(PROJECT_INCLUDE)/mcf5235/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5235/mcf5235.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5235/mcf5235.h
-endif
-if mcf532x
-$(PROJECT_INCLUDE)/mcf532x/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mcf532x
-	@: > $(PROJECT_INCLUDE)/mcf532x/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf532x/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf532x/mcf532x.h: mcf532x/include/mcf532x.h $(PROJECT_INCLUDE)/mcf532x/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf532x/mcf532x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf532x/mcf532x.h
-endif
-if mcf5272
-$(PROJECT_INCLUDE)/mcf5272/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5272
-	@: > $(PROJECT_INCLUDE)/mcf5272/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5272/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf5272/mcf5272.h: mcf5272/include/mcf5272.h $(PROJECT_INCLUDE)/mcf5272/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5272/mcf5272.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5272/mcf5272.h
-endif
-if mcf5282
-$(PROJECT_INCLUDE)/mcf5282/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mcf5282
-	@: > $(PROJECT_INCLUDE)/mcf5282/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf5282/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf5282/mcf5282.h: mcf5282/include/mcf5282.h $(PROJECT_INCLUDE)/mcf5282/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5282/mcf5282.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5282/mcf5282.h
-endif
-if mcf548x
-$(PROJECT_INCLUDE)/mcf548x/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/mcf548x
-	@: > $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
-
-$(PROJECT_INCLUDE)/mcf548x/mcf548x.h: mcf548x/include/mcf548x.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/mcf548x.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/mcf548x.h
-
-$(PROJECT_INCLUDE)/mcf548x/MCD_progCheck.h: mcf548x/mcdma/MCD_progCheck.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/MCD_progCheck.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/MCD_progCheck.h
-
-$(PROJECT_INCLUDE)/mcf548x/MCD_dma.h: mcf548x/mcdma/MCD_dma.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/MCD_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/MCD_dma.h
-
-$(PROJECT_INCLUDE)/mcf548x/MCD_tasksInit.h: mcf548x/mcdma/MCD_tasksInit.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/MCD_tasksInit.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/MCD_tasksInit.h
-
-$(PROJECT_INCLUDE)/mcf548x/mcdma_glue.h: mcf548x/mcdma/mcdma_glue.h $(PROJECT_INCLUDE)/mcf548x/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf548x/mcdma_glue.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf548x/mcdma_glue.h
-endif