From 3aade41fa28592616ffdb2a44ce666cdf35b93fd Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 07:33:07 +0000 Subject: 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. * clock/Makefile.am: Cosmetics. * console/Makefile.am: Cosmetics. * spurious/Makefile.am: Cosmetics. * start/Makefile.am: Cosmetics. * startup/Makefile.am: Cosmetics. * timer/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/m68k/efi332/ChangeLog | 11 +++++++++++ c/src/lib/libbsp/m68k/efi332/Makefile.am | 8 ++++---- c/src/lib/libbsp/m68k/efi332/clock/Makefile.am | 1 - c/src/lib/libbsp/m68k/efi332/console/Makefile.am | 1 - c/src/lib/libbsp/m68k/efi332/spurious/Makefile.am | 1 - c/src/lib/libbsp/m68k/efi332/start/Makefile.am | 3 ++- c/src/lib/libbsp/m68k/efi332/startup/Makefile.am | 1 - c/src/lib/libbsp/m68k/efi332/timer/Makefile.am | 1 - c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.am | 5 +++-- 9 files changed, 20 insertions(+), 12 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/m68k/efi332/ChangeLog b/c/src/lib/libbsp/m68k/efi332/ChangeLog index d0ea38d7f3..69e17788ed 100644 --- a/c/src/lib/libbsp/m68k/efi332/ChangeLog +++ b/c/src/lib/libbsp/m68k/efi332/ChangeLog @@ -1,3 +1,14 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * clock/Makefile.am: Cosmetics. + * console/Makefile.am: Cosmetics. + * spurious/Makefile.am: Cosmetics. + * start/Makefile.am: Cosmetics. + * startup/Makefile.am: Cosmetics. + * timer/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/m68k/efi332/Makefile.am b/c/src/lib/libbsp/m68k/efi332/Makefile.am index 1c5058bfc1..e908110b45 100644 --- a/c/src/lib/libbsp/m68k/efi332/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/Makefile.am @@ -18,12 +18,12 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = times -$(PROJECT_INCLUDE)/efi332.h: include/efi332.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/efi332.h: include/efi332.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/efi332.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/efi332.h -$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/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/m68k/efi332/clock/Makefile.am b/c/src/lib/libbsp/m68k/efi332/clock/Makefile.am index 499a664bbb..01bde7b3e4 100644 --- a/c/src/lib/libbsp/m68k/efi332/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = ckinit.c diff --git a/c/src/lib/libbsp/m68k/efi332/console/Makefile.am b/c/src/lib/libbsp/m68k/efi332/console/Makefile.am index 0d451d4e79..9f4fde7145 100644 --- a/c/src/lib/libbsp/m68k/efi332/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/console.rel C_FILES = console.c diff --git a/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.am b/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.am index a5cf5fccac..265ed15700 100644 --- a/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/spurious/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/spurious.rel C_FILES = spinit.c diff --git a/c/src/lib/libbsp/m68k/efi332/start/Makefile.am b/c/src/lib/libbsp/m68k/efi332/start/Makefile.am index 55c0feef75..1a4e2a24ee 100644 --- a/c/src/lib/libbsp/m68k/efi332/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/start/Makefile.am @@ -15,7 +15,8 @@ include $(top_srcdir)/../../../../automake/lib.am # START_O_FILES = $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) -START_O_FILES += $(PROJECT_RELEASE)/lib/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT) +START_O_FILES += \ + $(PROJECT_RELEASE)/lib/except_vect_332_ROM$(LIB_VARIANT).$(OBJEXT) START_O_FILES += $(PROJECT_RELEASE)/lib/ram_init$(LIB_VARIANT) START_O_FILES += $(PROJECT_RELEASE)/lib/ram_init_FW$(LIB_VARIANT) diff --git a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am index 035cc2e9e0..467063c761 100644 --- a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared PGM = $(ARCH)/startup.rel diff --git a/c/src/lib/libbsp/m68k/efi332/timer/Makefile.am b/c/src/lib/libbsp/m68k/efi332/timer/Makefile.am index 607ab5a1f9..89cd2f36f3 100644 --- a/c/src/lib/libbsp/m68k/efi332/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/timer.rel C_FILES = timer.c diff --git a/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.am index 8b2b11a3cb..0103f7dbca 100644 --- a/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.am @@ -5,8 +5,9 @@ BSP_PIECES = startup clock console spurious timer # 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)) LIB = $(ARCH)/libbsp.a include $(top_srcdir)/../../../../automake/compile.am -- cgit v1.2.3