From a12c25383bff484166b05553e3cf514d83694ada Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 15:02:51 +0000 Subject: 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. Don't preinstall bsp_specs.dl. * dlentry/Makefile.am: Cosmetics. * flashentry/Makefile.am: Cosmetics. * startup/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/powerpc/helas403/ChangeLog | 9 +++++++++ c/src/lib/libbsp/powerpc/helas403/Makefile.am | 8 ++------ c/src/lib/libbsp/powerpc/helas403/dlentry/Makefile.am | 1 - c/src/lib/libbsp/powerpc/helas403/flashentry/Makefile.am | 1 - c/src/lib/libbsp/powerpc/helas403/startup/Makefile.am | 1 - c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am | 7 ++++--- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/c/src/lib/libbsp/powerpc/helas403/ChangeLog b/c/src/lib/libbsp/powerpc/helas403/ChangeLog index 4deb8ebaab..eaaa1c16db 100644 --- a/c/src/lib/libbsp/powerpc/helas403/ChangeLog +++ b/c/src/lib/libbsp/powerpc/helas403/ChangeLog @@ -1,3 +1,12 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + Don't preinstall bsp_specs.dl. + * dlentry/Makefile.am: Cosmetics. + * flashentry/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/helas403/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/Makefile.am index 634d46a9f4..b599536f30 100644 --- a/c/src/lib/libbsp/powerpc/helas403/Makefile.am +++ b/c/src/lib/libbsp/powerpc/helas403/Makefile.am @@ -18,13 +18,9 @@ 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_ROOT)/@RTEMS_BSP@/lib/bsp_specs.dl: bsp_specs.dl - $(INSTALL_DATA) $< $@ -PREINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs.dl - include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/helas403/dlentry/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/dlentry/Makefile.am index 712cd8678f..d6280d9825 100644 --- a/c/src/lib/libbsp/powerpc/helas403/dlentry/Makefile.am +++ b/c/src/lib/libbsp/powerpc/helas403/dlentry/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/dlentry.rel S_FILES = dlentry.S diff --git a/c/src/lib/libbsp/powerpc/helas403/flashentry/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/flashentry/Makefile.am index 4c60b2f1dd..2926759b68 100644 --- a/c/src/lib/libbsp/powerpc/helas403/flashentry/Makefile.am +++ b/c/src/lib/libbsp/powerpc/helas403/flashentry/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/flashentry.rel S_FILES = flashentry.S diff --git a/c/src/lib/libbsp/powerpc/helas403/startup/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/startup/Makefile.am index 5e972c4214..a52f1ccb58 100644 --- a/c/src/lib/libbsp/powerpc/helas403/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/helas403/startup/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/startup.rel diff --git a/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am index ee921b041d..d38e12726f 100644 --- a/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am @@ -7,9 +7,10 @@ BSP_PIECES = startup dlentry flashentry CPU_PIECES = clock timer console 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)/$(RTEMS_CPU_MODEL)/$(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)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3