From 0896b3c51f61ecd73100864c13a9914dc2113c89 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 14:38:00 +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. * network/Makefile.am: Cosmetics. * startup/Makefile.am: Cosmetics. * vectors/Makefile.am: Add preinstallation dirstamp support. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog | 11 +++++++++++ c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am | 4 ++-- .../lib/libbsp/powerpc/mpc8260ads/clock/Makefile.am | 1 - .../libbsp/powerpc/mpc8260ads/console/Makefile.am | 1 - c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am | 21 +++++++++++---------- .../libbsp/powerpc/mpc8260ads/network/Makefile.am | 1 - .../libbsp/powerpc/mpc8260ads/startup/Makefile.am | 5 ++--- .../libbsp/powerpc/mpc8260ads/vectors/Makefile.am | 19 ++++++++++--------- .../libbsp/powerpc/mpc8260ads/wrapup/Makefile.am | 9 +++++---- 9 files changed, 41 insertions(+), 31 deletions(-) (limited to 'c/src/lib/libbsp/powerpc') diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog index d59239ca8e..c3825b8431 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog @@ -1,3 +1,14 @@ +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. + * network/Makefile.am: Cosmetics. + * startup/Makefile.am: Cosmetics. + * vectors/Makefile.am: Add preinstallation dirstamp support. + * wrapup/Makefile.am: Cosmetics. + 2003-12-02 Ralf Corsepius * clock/Makefile.am: Remove all-local: $(ARCH). diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am index 15304e0dae..8a761ed318 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am @@ -17,8 +17,8 @@ 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 include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/clock/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/clock/Makefile.am index fc841b4e1e..f20d3ae2c4 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/clock/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../shared/clock C_FILES = p_clock.c diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/console/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/console/Makefile.am index 0d451d4e79..9f4fde7145 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/console/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/console.rel C_FILES = console.c diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am index ee059b3f10..125d063a36 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - include_bspdir = $(includedir)/bsp C_FILES = irq.c irq_init.c @@ -16,15 +15,6 @@ OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am -$(PROJECT_INCLUDE)/bsp: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/bsp/%.h: %.h - $(INSTALL_DATA) $< $@ - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \ - $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%) - # # (OPTIONAL) Add local stuff here using += # @@ -38,4 +28,15 @@ all-local: $(PREINSTALL_FILES) $(OBJS) $(PGM) EXTRA_DIST = irq.c irq.h irq_asm.S irq_init.c +PREINSTALL_FILES = + +$(PROJECT_INCLUDE)/bsp/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp + @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp) + +$(PROJECT_INCLUDE)/bsp/irq.h: irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/network/Makefile.am index 2a962c8372..87f1e360a3 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/network/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/network.rel C_FILES = network.c if_hdlcsubr.c diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/Makefile.am index 3de8d6a740..f7b6a18a2c 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/Makefile.am @@ -2,13 +2,12 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/startup.rel -C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c \ - main.c sbrk.c setvec.c gnatinstallhandler.c cpuinit.c +C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c main.c sbrk.c \ + setvec.c gnatinstallhandler.c cpuinit.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) S_FILES = diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/Makefile.am index 79d46adce8..874c46f909 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/Makefile.am @@ -2,12 +2,11 @@ ## $Id$ ## - C_FILES = vectors_init.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_bspdir = $(includedir)/bsp -include_bsp_HEADERS = vectors.h +include_bsp_HEADERS = vectors.h S_FILES = vectors.S S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) @@ -24,15 +23,17 @@ include $(top_srcdir)/../../../../automake/lib.am $(PGM): $(OBJS) $(make-rel) -$(PROJECT_INCLUDE)/bsp: - $(mkinstalldirs) $@ +all-local: $(PREINSTALL_FILES) $(OBJS) -$(PROJECT_INCLUDE)/bsp/%.h: %.h - $(INSTALL_DATA) $< $@ +PREINSTALL_FILES = -PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \ - $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%) +$(PROJECT_INCLUDE)/bsp/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp + @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp) -all-local: $(PREINSTALL_FILES) $(OBJS) +$(PROJECT_INCLUDE)/bsp/vectors.h: vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am index cebcf58bb6..750dd1f8af 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am @@ -13,10 +13,11 @@ BSP_PIECES = clock irq start startup console vectors $(NETWORKING) # mpc8xx/mmu mpc8xx/timer mpc8xx/vectors # 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/*/$(ARCH)/*.$(OBJEXT)) \ - ../@exceptions@/$(ARCH)/rtems-cpu.rel \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc8260/*/$(ARCH)/*.$(OBJEXT)) +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ + ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \ + ../@exceptions@/$(ARCH)/rtems-cpu.rel $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/mpc8260/*/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a include $(top_srcdir)/../../../../automake/compile.am -- cgit v1.2.3