From 518ce3925edc55cbb79744c8cf918d43b135f71d Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 21 Jan 2004 15:09:27 +0000 Subject: 2004-01-21 Ralf Corsepius * Makefile.am: Add PREINSTALL_DIRS. * irq/Makefile.am: Add PREINSTALL_DIRS. * motorola/Makefile.am: Add PREINSTALL_DIRS. * openpic/Makefile.am: Add PREINSTALL_DIRS. * pci/Makefile.am: Add PREINSTALL_DIRS. * vectors/Makefile.am: Add PREINSTALL_DIRS. * vme/Makefile.am: Add PREINSTALL_DIRS. * wrapup/Makefile.am: Reflect changes to libcpu. --- c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog | 11 +++++++++++ c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am | 5 ++++- c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am | 4 +++- .../lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am | 4 +++- c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am | 4 +++- c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am | 4 +++- c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am | 4 +++- c/src/lib/libbsp/powerpc/motorola_powerpc/vme/Makefile.am | 4 +++- c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am | 8 +++++--- 9 files changed, 38 insertions(+), 10 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/motorola_powerpc') diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog index a3b80346e3..f7506ee9ff 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog @@ -1,3 +1,14 @@ +2004-01-21 Ralf Corsepius + + * Makefile.am: Add PREINSTALL_DIRS. + * irq/Makefile.am: Add PREINSTALL_DIRS. + * motorola/Makefile.am: Add PREINSTALL_DIRS. + * openpic/Makefile.am: Add PREINSTALL_DIRS. + * pci/Makefile.am: Add PREINSTALL_DIRS. + * vectors/Makefile.am: Add PREINSTALL_DIRS. + * vme/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/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am index 362ece8579..fbb657c8c4 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am @@ -25,10 +25,12 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = BOOTING README.MVME2300 README.OTHERBOARDS README.dec21140 EXTRA_DIST += times.mcp750 times.mvme2307 +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)/nvram.h: ../shared/include/nvram.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/nvram.h @@ -55,6 +57,7 @@ $(PROJECT_INCLUDE)/bsp/motorola.h: ../shared/motorola/motorola.h $(PROJECT_INCLU PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/motorola.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/motorola_powerpc/irq/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am index a7feba72ba..52e3f8799e 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am @@ -30,17 +30,19 @@ noinst_DATA = $(OBJS) all-local: $(PREINSTALL_FILES) +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: $(top_srcdir)/../../powerpc/shared/irq/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/motorola_powerpc/motorola/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am index 8dd64e2d97..f2589cdd44 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am @@ -21,17 +21,19 @@ noinst_DATA = $(OBJS) all-local: $(PREINSTALL_FILES) +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/motorola.h: $(top_srcdir)/../../powerpc/shared/motorola/motorola.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/motorola.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/motorola.h CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am index 6dab163b14..0ba4fe2a66 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am @@ -21,17 +21,19 @@ noinst_DATA = $(OBJS) all-local: $(PREINSTALL_FILES) +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/openpic.h: $(top_srcdir)/../../powerpc/shared/openpic/openpic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/openpic.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/openpic.h CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am index b76d5d0342..48e45f1161 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am @@ -19,17 +19,19 @@ $(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/pci/%.c $(ARCH)/$(dirsta noinst_DATA = $(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/pci.h: $(top_srcdir)/../../powerpc/shared/pci/pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am index 78e7e0c081..9c3ee44a1c 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am @@ -29,17 +29,19 @@ noinst_DATA = $(OBJS) all-local: $(PREINSTALL_FILES) +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: $(top_srcdir)/../../powerpc/shared/vectors/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/motorola_powerpc/vme/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/vme/Makefile.am index fcb108254a..320abffbd6 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/vme/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/vme/Makefile.am @@ -30,12 +30,13 @@ noinst_DATA = $(OBJS) all-local: $(PREINSTALL_FILES) +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/vmeUniverse.h: $(top_srcdir)/../../shared/vmeUniverse/vmeUniverse.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverse.h @@ -50,5 +51,6 @@ $(PROJECT_INCLUDE)/bsp/VME.h: $(top_srcdir)/../../powerpc/shared/vme/VME.h $(PRO PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am index 690ebb2a3a..7fda5a00bb 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am @@ -8,9 +8,11 @@ BSP_PIECES = clock console irq openpic pci residual startup vectors motorola \ # 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)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/*/$(ARCH)/*.$(OBJEXT)) \ - ../@exceptions@/$(ARCH)/rtems-cpu.rel $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.$(OBJEXT)) + ../@exceptions@/$(ARCH)/rtems-cpu.rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/clock$(LIB_VARIANT).rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/exceptions$(LIB_VARIANT).rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/mmu$(LIB_VARIANT).rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/timer$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am -- cgit v1.2.3