From e1f6878d12a2bf3112a692ddc15c6a32f598d1cb Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 14:37:30 +0000 Subject: 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. * dlentry/Makefile.am: Cosmetics. * startup/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/powerpc/gen405/ChangeLog | 7 +++++++ c/src/lib/libbsp/powerpc/gen405/Makefile.am | 4 ++-- c/src/lib/libbsp/powerpc/gen405/dlentry/Makefile.am | 1 - c/src/lib/libbsp/powerpc/gen405/startup/Makefile.am | 1 - c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am | 7 ++++--- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/c/src/lib/libbsp/powerpc/gen405/ChangeLog b/c/src/lib/libbsp/powerpc/gen405/ChangeLog index b9977bdd3c..7e5fb206fe 100644 --- a/c/src/lib/libbsp/powerpc/gen405/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen405/ChangeLog @@ -1,3 +1,10 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * dlentry/Makefile.am: Cosmetics. + * startup/Makefile.am: Cosmetics. + * wrapup/Makefile.am: Cosmetics. + 2003-12-02 Ralf Corsepius * dlentry/Makefile.am: Remove all-local: $(ARCH). diff --git a/c/src/lib/libbsp/powerpc/gen405/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/Makefile.am index 028d24b726..b24d4fa085 100644 --- a/c/src/lib/libbsp/powerpc/gen405/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen405/Makefile.am @@ -16,8 +16,8 @@ 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 include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/powerpc/gen405/dlentry/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/dlentry/Makefile.am index 712cd8678f..d6280d9825 100644 --- a/c/src/lib/libbsp/powerpc/gen405/dlentry/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen405/dlentry/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/dlentry.rel S_FILES = dlentry.S diff --git a/c/src/lib/libbsp/powerpc/gen405/startup/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/startup/Makefile.am index 5e972c4214..a52f1ccb58 100644 --- a/c/src/lib/libbsp/powerpc/gen405/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen405/startup/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/startup.rel diff --git a/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am index 965235ed1a..ec899f48a5 100644 --- a/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am @@ -7,9 +7,10 @@ BSP_PIECES = startup dlentry CPU_PIECES = clock timer console tty_drv vectors ictrl # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ - ../@exceptions@/$(ARCH)/rtems-cpu.rel \ - $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/ppc403/$(piece)/$(ARCH)/$(piece).rel) +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ + ../$(piece)/$(ARCH)/*.$(OBJEXT))) ../@exceptions@/$(ARCH)/rtems-cpu.rel \ + $(foreach piece, $(CPU_PIECES), \ + ../../../../libcpu/$(RTEMS_CPU)/ppc403/$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3