From 7f0e84c5fad5cb757647ec6d94cbff3aedfb88bb Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 05:16:57 +0000 Subject: 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. * clock/Makefile.am: Cosmetics. * console/Makefile.am: Cosmetics. * irq/Makefile.am: Add preinstallation dirstamp support. * startup/Makefile.am: Cosmetics. * timer/Makefile.am: Cosmetics. --- c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog | 9 +++++++++ c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am | 8 ++++---- c/src/lib/libbsp/arm/arm_bare_bsp/clock/Makefile.am | 1 - .../lib/libbsp/arm/arm_bare_bsp/console/Makefile.am | 1 - c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am | 20 +++++++++++--------- .../lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am | 1 - c/src/lib/libbsp/arm/arm_bare_bsp/timer/Makefile.am | 1 - 7 files changed, 24 insertions(+), 17 deletions(-) (limited to 'c/src/lib') diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog b/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog index 9b76dab1ff..7f7a10f64e 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog @@ -1,3 +1,12 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * clock/Makefile.am: Cosmetics. + * console/Makefile.am: Cosmetics. + * irq/Makefile.am: Add preinstallation dirstamp support. + * startup/Makefile.am: Cosmetics. + * timer/Makefile.am: Cosmetics. + 2003-12-02 Ralf Corsepius * clock/Makefile.am: Remove all-local: $(ARCH). diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am index 67cd1314d2..9c02c90027 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am @@ -16,12 +16,12 @@ nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h all-local: $(PREINSTALL_FILES) -$(PROJECT_INCLUDE)/registers.h: include/registers.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/registers.h: include/registers.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/registers.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/registers.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/arm/arm_bare_bsp/clock/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/clock/Makefile.am index c01b48d7de..b0ab135108 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/clock/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = clockdrv.c diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am index 8e0a82e3d2..f64278663c 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../shared/comm:@srcdir@/../../shared/io PGM = $(ARCH)/console.rel diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am index 4f92dc486a..bb4a07ff87 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../shared/irq PGM = $(ARCH)/irq.rel @@ -16,14 +15,6 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) irq_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am @@ -40,4 +31,15 @@ all: $(PREINSTALL_FILES) $(ARCH) $(irq_rel_OBJECTS) $(PGM) EXTRA_DIST = irq.c bsp_irq_init.c bsp_irq_asm.S +PREINSTALL_FILES = + +$(PROJECT_INCLUDE)/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE) + @: > $(PROJECT_INCLUDE)/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp) + +$(PROJECT_INCLUDE)/irq.h: irq.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/irq.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/irq.h + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am index b817fe0a97..85fc9df879 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared C_FILES = bsplibc.c bsppost.c bspstart.c exit.c bootcard.c main.c sbrk.c \ diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/timer/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/timer/Makefile.am index c247d386bb..8ec4b5ca6a 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/timer/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/timer.rel -- cgit v1.2.3