From 255a208e9b99e0dc03398db130e1e861d1758cca Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 07:33:34 +0000 Subject: 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. * console/Makefile.am: Cosmetics. * i2c/Makefile.am: Cosmetics. * nvram/Makefile.am: Cosmetics. * startup/Makefile.am: Cosmetics. * tod/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog | 10 +++++++++ c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am | 24 +++++++++++----------- .../libbsp/m68k/mcf5206elite/console/Makefile.am | 1 - c/src/lib/libbsp/m68k/mcf5206elite/i2c/Makefile.am | 1 - .../lib/libbsp/m68k/mcf5206elite/nvram/Makefile.am | 1 - .../libbsp/m68k/mcf5206elite/startup/Makefile.am | 11 ++++------ c/src/lib/libbsp/m68k/mcf5206elite/tod/Makefile.am | 1 - .../libbsp/m68k/mcf5206elite/wrapup/Makefile.am | 7 ++++--- 8 files changed, 30 insertions(+), 26 deletions(-) (limited to 'c/src') diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog index cdb9bce873..d75d577ebf 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog @@ -1,3 +1,13 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * console/Makefile.am: Cosmetics. + * i2c/Makefile.am: Cosmetics. + * nvram/Makefile.am: Cosmetics. + * startup/Makefile.am: Cosmetics. + * tod/Makefile.am: Cosmetics. + * wrapup/Makefile.am: Cosmetics. + 2003-12-02 Ralf Corsepius * start/Makefile.am: Remove all-local: $(ARCH). diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am index b49040dfb5..a9777aa2fa 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am @@ -22,28 +22,28 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = times -$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h -$(PROJECT_INCLUDE)/i2c.h: include/i2c.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/i2c.h: include/i2c.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i2c.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/i2c.h -$(PROJECT_INCLUDE)/i2cdrv.h: include/i2cdrv.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/i2cdrv.h: include/i2cdrv.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i2cdrv.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/i2cdrv.h -$(PROJECT_INCLUDE)/ds1307.h: include/ds1307.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/ds1307.h: include/ds1307.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ds1307.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/ds1307.h -$(PROJECT_INCLUDE)/nvram.h: include/nvram.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/nvram.h: include/nvram.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nvram.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/nvram.h -$(PROJECT_INCLUDE)/tod.h: $(top_srcdir)/../../shared/tod.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/tod.h: $(top_srcdir)/../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/console/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/console/Makefile.am index 8a861e6776..2fb561c9c5 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/console.rel C_FILES = console.c diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/i2c/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/i2c/Makefile.am index ae779a5f8a..48f8ecb583 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/i2c/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/i2c/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/i2c.rel C_FILES = i2c.c i2cdrv.c diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/nvram/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/nvram/Makefile.am index 183d6add2e..a28f0fcf86 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/nvram/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/nvram/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/nvram.rel C_FILES = nvram.c diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/startup/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/startup/Makefile.am index c126830595..157f038331 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/startup/Makefile.am @@ -2,14 +2,12 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared PGM = $(ARCH)/startup.rel -C_FILES = bspclean.c bsplibc.c bsppost.c m68kpretaskinghook.c \ - bspstart.c init5206e.c bootcard.c main.c sbrk.c setvec.c \ - gnatinstallhandler.c +C_FILES = bspclean.c bsplibc.c bsppost.c m68kpretaskinghook.c bspstart.c \ + init5206e.c bootcard.c main.c sbrk.c setvec.c gnatinstallhandler.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) @@ -37,14 +35,13 @@ $(PROJECT_RELEASE)/lib/linkcmds.flash: linkcmds.flash # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds \ - $(PROJECT_RELEASE)/lib/linkcmds.flash \ - $(PROJECT_RELEASE)/lib/gdbinit + $(PROJECT_RELEASE)/lib/linkcmds.flash $(PROJECT_RELEASE)/lib/gdbinit all: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES) .PRECIOUS: $(PGM) EXTRA_DIST = bspclean.c bspstart.c init5206e.c linkcmds linkcmds.flash \ - gdbinit + gdbinit include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/tod/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/tod/Makefile.am index bdbd08c373..57c23f73a3 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/tod/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/tod/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/tod.rel diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am index f0c50c41ec..5466075506 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am @@ -7,10 +7,11 @@ BSP_PIECES = startup console i2c tod nvram CPU_PIECES = clock console timer mbus # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) \ +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ + ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) \ $(foreach piece, $(CPU_PIECES), $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel)) \ + ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel)) \ $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3