From 2ba33bad1fa2e69900d92bc88232947438eb48d2 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 05:17:29 +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. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/arm/vegaplus/Makefile.am | 8 ++++---- c/src/lib/libbsp/arm/vegaplus/clock/Makefile.am | 1 - c/src/lib/libbsp/arm/vegaplus/console/Makefile.am | 1 - c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am | 20 +++++++++++--------- c/src/lib/libbsp/arm/vegaplus/startup/Makefile.am | 1 - c/src/lib/libbsp/arm/vegaplus/timer/Makefile.am | 1 - c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am | 8 +++++--- 7 files changed, 20 insertions(+), 20 deletions(-) (limited to 'c/src') diff --git a/c/src/lib/libbsp/arm/vegaplus/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/Makefile.am index ee43f72c82..c0336688c0 100644 --- a/c/src/lib/libbsp/arm/vegaplus/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/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/vegaplus/clock/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/clock/Makefile.am index c01b48d7de..b0ab135108 100644 --- a/c/src/lib/libbsp/arm/vegaplus/clock/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = clockdrv.c diff --git a/c/src/lib/libbsp/arm/vegaplus/console/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/console/Makefile.am index 6e90dbf9ce..299255f5d3 100644 --- a/c/src/lib/libbsp/arm/vegaplus/console/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/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/vegaplus/irq/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am index 9347191f1a..ff378c126e 100644 --- a/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../shared/irq PGM = $(ARCH)/irq.rel @@ -26,14 +25,6 @@ include $(top_srcdir)/../../../../automake/lib.am AM_CPPFLAGS += -I$(srcdir) -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - $(PGM): $(OBJS) $(make-rel) @@ -45,4 +36,15 @@ all-local: $(OBJS) $(PGM) EXTRA_DIST = bsp_irq_asm.S bsp_irq_init.c irq.c +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/vegaplus/startup/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/startup/Makefile.am index 2c9f7d961c..7d5f1f0faa 100644 --- a/c/src/lib/libbsp/arm/vegaplus/startup/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/startup/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/startup.rel diff --git a/c/src/lib/libbsp/arm/vegaplus/timer/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/timer/Makefile.am index c247d386bb..8ec4b5ca6a 100644 --- a/c/src/lib/libbsp/arm/vegaplus/timer/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/timer.rel diff --git a/c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am index 6505cbbabb..2bd0e163ec 100644 --- a/c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am @@ -8,9 +8,11 @@ include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT)) \ - $(foreach piece, $(GENERIC_FILES), ../../../$(piece)/$(ARCH)/$(piece).rel) +OBJS = $(foreach piece, $(BSP_FILES), $(wildcard \ + ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT)) \ + $(foreach piece, $(GENERIC_FILES), \ + ../../../$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3