From 6a5e592ad1065cf03018c9df963bbec4ce1562fa Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 14:38:19 +0000 Subject: 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. * clock/Makefile.am: Cosmetics. * console/Makefile.am: Cosmetics. * shmsupp/Makefile.am: Cosmetics. * startup/Makefile.am: Cosmetics. * timer/Makefile.am: Cosmetics. * vectors/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/powerpc/psim/ChangeLog | 11 +++++++++++ c/src/lib/libbsp/powerpc/psim/Makefile.am | 4 ++-- c/src/lib/libbsp/powerpc/psim/clock/Makefile.am | 1 - c/src/lib/libbsp/powerpc/psim/console/Makefile.am | 1 - c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am | 1 - c/src/lib/libbsp/powerpc/psim/startup/Makefile.am | 1 - c/src/lib/libbsp/powerpc/psim/timer/Makefile.am | 1 - c/src/lib/libbsp/powerpc/psim/vectors/Makefile.am | 1 - c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am | 7 ++++--- 9 files changed, 17 insertions(+), 11 deletions(-) (limited to 'c/src/lib/libbsp/powerpc') diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog index c6038d9ed3..148c7960bc 100644 --- a/c/src/lib/libbsp/powerpc/psim/ChangeLog +++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog @@ -1,3 +1,14 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * clock/Makefile.am: Cosmetics. + * console/Makefile.am: Cosmetics. + * shmsupp/Makefile.am: Cosmetics. + * startup/Makefile.am: Cosmetics. + * timer/Makefile.am: Cosmetics. + * vectors/Makefile.am: Cosmetics. + * wrapup/Makefile.am: Cosmetics. + 2003-12-02 Ralf Corsepius * clock/Makefile.am: Remove all-local: $(ARCH). diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am index 8292a61a0c..41588a2d54 100644 --- a/c/src/lib/libbsp/powerpc/psim/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am @@ -15,8 +15,8 @@ include_HEADERS += include/coverhd.h all-local: $(PREINSTALL_FILES) -$(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/psim/clock/Makefile.am b/c/src/lib/libbsp/powerpc/psim/clock/Makefile.am index 4087d450b2..29e4a74073 100644 --- a/c/src/lib/libbsp/powerpc/psim/clock/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = clock.c diff --git a/c/src/lib/libbsp/powerpc/psim/console/Makefile.am b/c/src/lib/libbsp/powerpc/psim/console/Makefile.am index 86c915af02..fd2b8ac540 100644 --- a/c/src/lib/libbsp/powerpc/psim/console/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/console.rel diff --git a/c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am b/c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am index f8e4c6f54a..61df97aac7 100644 --- a/c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/shmsupp.rel C_FILES = addrconv.c getcfg.c lock.c mpisr.c diff --git a/c/src/lib/libbsp/powerpc/psim/startup/Makefile.am b/c/src/lib/libbsp/powerpc/psim/startup/Makefile.am index c574e54df0..40a181d2db 100644 --- a/c/src/lib/libbsp/powerpc/psim/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/startup/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/startup.rel diff --git a/c/src/lib/libbsp/powerpc/psim/timer/Makefile.am b/c/src/lib/libbsp/powerpc/psim/timer/Makefile.am index 607ab5a1f9..89cd2f36f3 100644 --- a/c/src/lib/libbsp/powerpc/psim/timer/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/timer.rel C_FILES = timer.c diff --git a/c/src/lib/libbsp/powerpc/psim/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/psim/vectors/Makefile.am index 3280d6eb19..feb5cacde6 100644 --- a/c/src/lib/libbsp/powerpc/psim/vectors/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/vectors/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/vectors.rel S_FILES = align_h.S vectors.S diff --git a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am index 6ef2e5274d..5b8fb1737d 100644 --- a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am @@ -16,9 +16,10 @@ endif BSP_PIECES = startup clock console timer vectors $(BSP_MP_O_PIECES) # 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, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ + ../$(piece)/$(ARCH)/*.$(OBJEXT))) ../@exceptions@/$(ARCH)/rtems-cpu.rel \ + $(foreach piece, $(GENERIC_PIECES), \ + ../../../$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a # -- cgit v1.2.3