From ccc15ab31161633cf428a12be62e483d5e024cae Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 4 Dec 2003 18:35:25 +0000 Subject: 2003-12-04 Ralf Corsepius * configure.ac: Cosmetics. * clock/Makefile.am: Remove. * console/Makefile.am: Remove. * include/Makefile.am: Remove. * mbus/Makefile.am: Remove. * timer/Makefile.am: Remove. * Makefile.am: Merge-in former clock/Makefile.am, console/Makefile.am, include/Makefile.am, mbus/Makefile.am, timer/Makefile.am. * configure.ac: Reflect changes above. --- c/src/lib/libcpu/m68k/mcf5206/ChangeLog | 12 +++ c/src/lib/libcpu/m68k/mcf5206/Makefile.am | 101 +++++++++++++++++++++- c/src/lib/libcpu/m68k/mcf5206/clock/Makefile.am | 28 ------ c/src/lib/libcpu/m68k/mcf5206/configure.ac | 7 +- c/src/lib/libcpu/m68k/mcf5206/console/Makefile.am | 26 ------ c/src/lib/libcpu/m68k/mcf5206/include/Makefile.am | 32 ------- c/src/lib/libcpu/m68k/mcf5206/mbus/Makefile.am | 28 ------ c/src/lib/libcpu/m68k/mcf5206/timer/Makefile.am | 30 ------- 8 files changed, 112 insertions(+), 152 deletions(-) delete mode 100644 c/src/lib/libcpu/m68k/mcf5206/clock/Makefile.am delete mode 100644 c/src/lib/libcpu/m68k/mcf5206/console/Makefile.am delete mode 100644 c/src/lib/libcpu/m68k/mcf5206/include/Makefile.am delete mode 100644 c/src/lib/libcpu/m68k/mcf5206/mbus/Makefile.am delete mode 100644 c/src/lib/libcpu/m68k/mcf5206/timer/Makefile.am (limited to 'c/src/lib/libcpu/m68k') diff --git a/c/src/lib/libcpu/m68k/mcf5206/ChangeLog b/c/src/lib/libcpu/m68k/mcf5206/ChangeLog index 5a78ddbdd5..680154e9da 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/ChangeLog +++ b/c/src/lib/libcpu/m68k/mcf5206/ChangeLog @@ -1,3 +1,15 @@ +2003-12-04 Ralf Corsepius + + * configure.ac: Cosmetics. + * clock/Makefile.am: Remove. + * console/Makefile.am: Remove. + * include/Makefile.am: Remove. + * mbus/Makefile.am: Remove. + * timer/Makefile.am: Remove. + * Makefile.am: Merge-in former clock/Makefile.am, console/Makefile.am, + include/Makefile.am, mbus/Makefile.am, timer/Makefile.am. + * configure.ac: Reflect changes above. + 2003-12-03 Ralf Corsepius * clock/Makefile.am: Cosmetics. diff --git a/c/src/lib/libcpu/m68k/mcf5206/Makefile.am b/c/src/lib/libcpu/m68k/mcf5206/Makefile.am index 57b8535ffb..9d49e7e425 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/Makefile.am +++ b/c/src/lib/libcpu/m68k/mcf5206/Makefile.am @@ -4,7 +4,104 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal -SUBDIRS = include clock console mbus timer +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am + +# include +include_mcf5206dir = $(includedir)/mcf5206 +include_mcf5206_HEADERS = include/mcf5206e.h include/mcfmbus.h \ + include/mcfuart.h + +## clock + +clock_C_FILES = clock/ckinit.c +clock_OBJS = $(clock_C_FILES:clock/%.c=clock/$(ARCH)/%.$(OBJEXT)) +EXTRA_DIST = $(clock_C_FILES) + +clock/$(ARCH)/$(dirstamp): + @$(mkinstalldirs) clock/$(ARCH) + @: > clock/$(ARCH)/$(dirstamp) +clock/$(ARCH)/%.$(OBJEXT): clock/%.c clock/$(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< +clock/$(ARCH)/clock.rel: $(clock_OBJS) + $(make-rel) +PGMS = clock/$(ARCH)/clock.rel + +## console + +console_C_FILES = console/mcfuart.c +console_OBJS = $(console_C_FILES:console/%.c=console/$(ARCH)/%.$(OBJEXT)) +EXTRA_DIST += $(console_C_FILES) + +console/$(ARCH)/$(dirstamp): + @$(mkinstalldirs) console/$(ARCH) + @: > console/$(ARCH)/$(dirstamp) +console/$(ARCH)/%.$(OBJEXT): console/%.c console/$(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< +console/$(ARCH)/console.rel: $(console_OBJS) + $(make-rel) +PGMS += console/$(ARCH)/console.rel + +## mbus + +mbus_C_FILES = mbus/mcfmbus.c +mbus_OBJS = $(mbus_C_FILES:mbus/%.c=mbus/$(ARCH)/%.$(OBJEXT)) +EXTRA_DIST += $(mbus_C_FILES) + +mbus/$(ARCH)/$(dirstamp): + @$(mkinstalldirs) mbus/$(ARCH) + @: > mbus/$(ARCH)/$(dirstamp) +mbus/$(ARCH)/%.$(OBJEXT): mbus/%.c mbus/$(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< +mbus/$(ARCH)/mbus.rel: $(mbus_OBJS) + $(make-rel) +PGMS += mbus/$(ARCH)/mbus.rel + +## timer + +timer_C_FILES = timer/timer.c +timer_OBJS = $(timer_C_FILES:timer/%.c=timer/$(ARCH)/%.$(OBJEXT)) +EXTRA_DIST += $(timer_C_FILES) + +timer_S_FILES = timer/timerisr.S +timer_OBJS += $(timer_S_FILES:timer/%.S=timer/$(ARCH)/%.$(OBJEXT)) +EXTRA_DIST += $(timer_S_FILES) + +timer/$(ARCH)/$(dirstamp): + @$(mkinstalldirs) timer/$(ARCH) + @: > timer/$(ARCH)/$(dirstamp) +timer/$(ARCH)/%.$(OBJEXT): timer/%.c timer/$(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< +timer/$(ARCH)/%.o: timer/%.S timer/$(ARCH)/$(dirstamp) + ${CCASCOMPILE} -DASM -o $@ -c $< +timer/$(ARCH)/timer.rel: $(timer_OBJS) + $(make-rel) +PGMS += timer/$(ARCH)/timer.rel + +## -- + +all-local: $(PGMS) +CLEANDIRS = */$(ARCH) + +.PRECIOUS: $(PGMS) + +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: 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: 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: include/mcfuart.h $(PROJECT_INCLUDE)/mcf5206/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mcf5206/mcfuart.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5206/mcfuart.h -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 deleted file mode 100644 index 935edb124e..0000000000 --- a/c/src/lib/libcpu/m68k/mcf5206/clock/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/clock.rel - -C_FILES = ckinit.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all: $(ARCH) $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = $(C_FILES) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libcpu/m68k/mcf5206/configure.ac b/c/src/lib/libcpu/m68k/mcf5206/configure.ac index 37dd7ef9b8..121b5d4b37 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/configure.ac +++ b/c/src/lib/libcpu/m68k/mcf5206/configure.ac @@ -25,10 +25,5 @@ RTEMS_PROG_CCAS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -clock/Makefile -console/Makefile -include/Makefile -mbus/Makefile -timer/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libcpu/m68k/mcf5206/console/Makefile.am b/c/src/lib/libcpu/m68k/mcf5206/console/Makefile.am deleted file mode 100644 index 08ade13182..0000000000 --- a/c/src/lib/libcpu/m68k/mcf5206/console/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/console.rel - -C_FILES = mcfuart.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -all-local: $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = $(C_FILES) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/Makefile.am b/c/src/lib/libcpu/m68k/mcf5206/include/Makefile.am deleted file mode 100644 index 007b6dbf6a..0000000000 --- a/c/src/lib/libcpu/m68k/mcf5206/include/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -## -## $Id$ -## - -include_mcf5206dir = $(includedir)/mcf5206 - -include_mcf5206_HEADERS = mcf5206e.h mcfmbus.h mcfuart.h - -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/mbus/Makefile.am b/c/src/lib/libcpu/m68k/mcf5206/mbus/Makefile.am deleted file mode 100644 index 14d08054dd..0000000000 --- a/c/src/lib/libcpu/m68k/mcf5206/mbus/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/mbus.rel - -C_FILES = mcfmbus.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all: $(ARCH) $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = $(C_FILES) - -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 deleted file mode 100644 index d109e96605..0000000000 --- a/c/src/lib/libcpu/m68k/mcf5206/timer/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/timer.rel - -C_FILES = timer.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -S_FILES = timerisr.S -OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all: $(ARCH) $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = $(C_FILES) - -include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3