From 283dd51021e92a23354eca4dc5588b92f2dc631f Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 21 Jan 2004 15:09:34 +0000 Subject: 2004-01-21 Ralf Corsepius * Makefile.am: Add PREINSTALL_DIRS. * irq/Makefile.am: Add PREINSTALL_DIRS. * vectors/Makefile.am: Add PREINSTALL_DIRS. * wrapup/Makefile.am: Reflect changes to libcpu. --- c/src/lib/libbsp/powerpc/eth_comm/ChangeLog | 7 +++++++ c/src/lib/libbsp/powerpc/eth_comm/Makefile.am | 5 ++++- c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am | 4 +++- c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am | 4 +++- c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am | 9 +++++++-- c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog | 7 +++++++ c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am | 5 +++-- c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am | 4 +++- c/src/lib/libbsp/powerpc/mbx8xx/vectors/Makefile.am | 4 +++- c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am | 12 +++++++----- c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog | 7 +++++++ c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am | 3 +++ c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am | 4 +++- c/src/lib/libbsp/powerpc/mpc8260ads/vectors/Makefile.am | 4 +++- c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am | 14 ++++++++------ 15 files changed, 71 insertions(+), 22 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog index 933df63124..362e2ab2dd 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog +++ b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog @@ -1,3 +1,10 @@ +2004-01-21 Ralf Corsepius + + * Makefile.am: Add PREINSTALL_DIRS. + * irq/Makefile.am: Add PREINSTALL_DIRS. + * vectors/Makefile.am: Add PREINSTALL_DIRS. + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-14 Ralf Corsepius * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am index 3d59f784fd..51d81d5a33 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am @@ -20,10 +20,12 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = times +PREINSTALL_DIRS = + $(PROJECT_INCLUDE)/bsp/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/bsp @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h @@ -46,6 +48,7 @@ $(PROJECT_INCLUDE)/bsp/8xx_immap.h: include/8xx_immap.h $(PROJECT_INCLUDE)/bsp/$ PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/8xx_immap.h CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am index 2305c187a5..1ee123056b 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am @@ -23,17 +23,19 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = irq.c irq_asm.S irq_init.c +PREINSTALL_DIRS = PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/bsp @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp) +PREINSTALL_DIRS += $(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 CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am index 8594802823..553880679e 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am @@ -25,17 +25,19 @@ $(PGM): $(OBJS) all-local: $(PREINSTALL_FILES) $(OBJS) +PREINSTALL_DIRS = PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/bsp @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(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 CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am index ebbd015136..2be48edd1a 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am @@ -15,8 +15,13 @@ BSP_PIECES = clock irq startup start canbus vectors console $(NETWORKING) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \ - ../@exceptions@/$(ARCH)/rtems-cpu.rel $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.$(OBJEXT)) + ../@exceptions@/$(ARCH)/rtems-cpu.rel \ + ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/cpm$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/console-generic$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/exceptions$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/mmu$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog index f9bc758e5f..c0ac0abba5 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog @@ -1,3 +1,10 @@ +2004-01-21 Ralf Corsepius + + * Makefile.am: Add PREINSTALL_DIRS. + * irq/Makefile.am: Add PREINSTALL_DIRS. + * vectors/Makefile.am: Add PREINSTALL_DIRS. + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-14 Ralf Corsepius * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am index e5c40a88cd..dfa436cbb5 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am @@ -18,12 +18,12 @@ include_bsp_HEADERS = include/mbx.h include/commproc.h include/8xx_immap.h all-local: $(PREINSTALL_FILES) -EXTRA_DIST = times +PREINSTALL_DIRS = $(PROJECT_INCLUDE)/bsp/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/bsp @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h @@ -42,6 +42,7 @@ $(PROJECT_INCLUDE)/bsp/8xx_immap.h: include/8xx_immap.h $(PROJECT_INCLUDE)/bsp/$ PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/8xx_immap.h CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am index 572a3983c4..8ace4c43c1 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am @@ -20,17 +20,19 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = irq.c irq_asm.S irq_init.c +PREINSTALL_DIRS = PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/bsp @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp) +PREINSTALL_DIRS += $(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 CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/vectors/Makefile.am index 8594802823..553880679e 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/vectors/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/vectors/Makefile.am @@ -25,17 +25,19 @@ $(PGM): $(OBJS) all-local: $(PREINSTALL_FILES) $(OBJS) +PREINSTALL_DIRS = PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/bsp @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(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 CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am index 5547db59c6..9072f1766a 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am @@ -8,15 +8,17 @@ NETWORKING = network endif BSP_PIECES = clock irq ide startup console vectors $(NETWORKING) -# pieces to pick up out of libcpu/ppc -# CPU_PIECES = mpc8xx/clock mpc8xx/console-generic mpc8xx/cpm \ -# mpc8xx/mmu mpc8xx/timer mpc8xx/vectors # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \ - ../@exceptions@/$(ARCH)/rtems-cpu.rel $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/mpc8xx/*/$(ARCH)/*.$(OBJEXT)) + ../@exceptions@/$(ARCH)/rtems-cpu.rel \ + ../../../../libcpu/powerpc/mpc8xx/clock$(LIB_VARIANT).rel \ + ../../../../libcpu/powerpc/mpc8xx/console-generic$(LIB_VARIANT).rel \ + ../../../../libcpu/powerpc/mpc8xx/cpm$(LIB_VARIANT).rel \ + ../../../../libcpu/powerpc/mpc8xx/mmu$(LIB_VARIANT).rel \ + ../../../../libcpu/powerpc/mpc8xx/timer$(LIB_VARIANT).rel \ + ../../../../libcpu/powerpc/mpc8xx/exceptions$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog index 1e7425c70b..b1a495563f 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog @@ -1,3 +1,10 @@ +2004-01-21 Ralf Corsepius + + * Makefile.am: Add PREINSTALL_DIRS. + * irq/Makefile.am: Add PREINSTALL_DIRS. + * vectors/Makefile.am: Add PREINSTALL_DIRS. + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-14 Ralf Corsepius * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am index b7edb1f41d..9b214f2869 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am @@ -17,11 +17,14 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = times +PREINSTALL_DIRS = + $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am index e5be66cf4a..92dfc0e283 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am @@ -23,17 +23,19 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = irq.c irq.h irq_asm.S irq_init.c +PREINSTALL_DIRS = PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/bsp @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp) +PREINSTALL_DIRS += $(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 CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/Makefile.am index 8594802823..553880679e 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/Makefile.am @@ -25,17 +25,19 @@ $(PGM): $(OBJS) all-local: $(PREINSTALL_FILES) $(OBJS) +PREINSTALL_DIRS = PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/bsp @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(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 CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) 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 e5016eb1e1..975b6b7bf6 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am @@ -8,15 +8,17 @@ NETWORKING = network endif BSP_PIECES = clock irq start startup console vectors $(NETWORKING) -# pieces to pick up out of libcpu/ppc -# CPU_PIECES = mpc8xx/clock mpc8xx/console-generic mpc8xx/cpm \ -# mpc8xx/mmu mpc8xx/timer mpc8xx/vectors # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \ - ../@exceptions@/$(ARCH)/rtems-cpu.rel $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/mpc8260/*/$(ARCH)/*.$(OBJEXT)) + $(wildcard ../../../../libcpu/powerpc/shared/*/$(ARCH)/*.$(OBJEXT)) \ + ../@exceptions@/$(ARCH)/rtems-cpu.rel \ + ../../../../libcpu/powerpc/mpc8260/clock$(LIB_VARIANT).rel \ + ../../../../libcpu/powerpc/mpc8260/console-generic$(LIB_VARIANT).rel \ + ../../../../libcpu/powerpc/mpc8260/cpm$(LIB_VARIANT).rel \ + ../../../../libcpu/powerpc/mpc8260/mmu$(LIB_VARIANT).rel \ + ../../../../libcpu/powerpc/mpc8260/timer$(LIB_VARIANT).rel \ + ../../../../libcpu/powerpc/mpc8260/exceptions$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am -- cgit v1.2.3