diff --git a/c/src/lib/libcpu/m68k/mcf5206/ChangeLog b/c/src/lib/libcpu/m68k/mcf5206/ChangeLog index 3ae6f6b60b..be84c65d07 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/ChangeLog +++ b/c/src/lib/libcpu/m68k/mcf5206/ChangeLog @@ -1,3 +1,11 @@ +2003-12-01 Ralf Corsepius + + * Makefile.am: Reformat. + * clock/Makefile.am: Reformat. + * console/Makefile.am: Reformat. + * include/Makefile.am: Reformat. Use dirstamps for preinstallation. + * timer/Makefile.am: Reformat. + 2003-10-22 Ralf Corsepius * configure.ac: Remove RTEMS_CANONICAL_HOST. diff --git a/c/src/lib/libcpu/m68k/mcf5206/Makefile.am b/c/src/lib/libcpu/m68k/mcf5206/Makefile.am index e2bf5e3ae3..57b8535ffb 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/Makefile.am +++ b/c/src/lib/libcpu/m68k/mcf5206/Makefile.am @@ -8,4 +8,3 @@ SUBDIRS = include clock console mbus timer include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am - diff --git a/c/src/lib/libcpu/m68k/mcf5206/clock/Makefile.am b/c/src/lib/libcpu/m68k/mcf5206/clock/Makefile.am index d85982da2f..3d537eb6a7 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/clock/Makefile.am +++ b/c/src/lib/libcpu/m68k/mcf5206/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = ckinit.c diff --git a/c/src/lib/libcpu/m68k/mcf5206/console/Makefile.am b/c/src/lib/libcpu/m68k/mcf5206/console/Makefile.am index a463953c58..867e322ff7 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/console/Makefile.am +++ b/c/src/lib/libcpu/m68k/mcf5206/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/console.rel C_FILES = mcfuart.c diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/Makefile.am b/c/src/lib/libcpu/m68k/mcf5206/include/Makefile.am index 29cdf18644..007b6dbf6a 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/include/Makefile.am +++ b/c/src/lib/libcpu/m68k/mcf5206/include/Makefile.am @@ -2,22 +2,31 @@ ## $Id$ ## - include_mcf5206dir = $(includedir)/mcf5206 include_mcf5206_HEADERS = mcf5206e.h mcfmbus.h mcfuart.h -$(PROJECT_INCLUDE)/mcf5206: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/mcf5206/%.h: %.h - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(PROJECT_INCLUDE)/mcf5206 \ - $(include_mcf5206_HEADERS:%=$(PROJECT_INCLUDE)/mcf5206/%) - all-local: $(TMPINSTALL_FILES) EXTRA_DIST = $(include_mcf5206_HEADERS) +PREINSTALL_FILES = + +$(PROJECT_INCLUDE)/mcf5206/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/mcf5206 + @: > $(PROJECT_INCLUDE)/mcf5206/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5206/$(dirstamp) + +$(PROJECT_INCLUDE)/mcf5206/mcf5206e.h: 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: 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: mcfuart.h $(PROJECT_INCLUDE)/mcf5206/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5206/mcfuart.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5206/mcfuart.h + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libcpu/m68k/mcf5206/timer/Makefile.am b/c/src/lib/libcpu/m68k/mcf5206/timer/Makefile.am index cc02c491ec..d72735af37 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/timer/Makefile.am +++ b/c/src/lib/libcpu/m68k/mcf5206/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/timer.rel C_FILES = timer.c