From 9fce0fded1f02efd715b4e1b461d3c0af922f592 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 21 Jan 2004 15:09:49 +0000 Subject: 2004-01-21 Ralf Corsepius * Makefile.am: Add PREINSTALL_DIRS. * wrapup/Makefile.am: Reflect changes to libcpu. --- c/src/lib/libbsp/powerpc/gen405/ChangeLog | 5 +++++ c/src/lib/libbsp/powerpc/gen405/Makefile.am | 3 +++ c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am | 10 +++++++--- c/src/lib/libbsp/powerpc/helas403/ChangeLog | 5 +++++ c/src/lib/libbsp/powerpc/helas403/Makefile.am | 2 ++ c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am | 9 ++++++--- c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog | 5 +++++ c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am | 3 +++ c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am | 1 - c/src/lib/libbsp/powerpc/score603e/ChangeLog | 5 +++++ c/src/lib/libbsp/powerpc/score603e/Makefile.am | 3 +++ c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am | 1 - 12 files changed, 44 insertions(+), 8 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/powerpc/gen405/ChangeLog b/c/src/lib/libbsp/powerpc/gen405/ChangeLog index 269c394537..0dff83bf4d 100644 --- a/c/src/lib/libbsp/powerpc/gen405/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen405/ChangeLog @@ -1,3 +1,8 @@ +2004-01-21 Ralf Corsepius + + * 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/gen405/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/Makefile.am index 9d3ac9d62d..b157af5ca0 100644 --- a/c/src/lib/libbsp/powerpc/gen405/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen405/Makefile.am @@ -16,11 +16,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/gen405/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am index 4e970ba624..72b67b0d68 100644 --- a/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am @@ -4,12 +4,16 @@ BSP_PIECES = startup dlentry # pieces to pick up out of libcpu/ppc -CPU_PIECES = clock timer console tty_drv vectors ictrl # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../@exceptions@/$(ARCH)/rtems-cpu.rel $(foreach piece, $(CPU_PIECES), \ - ../../../../libcpu/$(RTEMS_CPU)/ppc403/$(piece)/$(ARCH)/$(piece).rel) + ../@exceptions@/$(ARCH)/rtems-cpu.rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/clock$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/timer$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/console$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/tty_drv$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/vectors$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/ictrl$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/powerpc/helas403/ChangeLog b/c/src/lib/libbsp/powerpc/helas403/ChangeLog index dbb63c633a..59881259c4 100644 --- a/c/src/lib/libbsp/powerpc/helas403/ChangeLog +++ b/c/src/lib/libbsp/powerpc/helas403/ChangeLog @@ -1,3 +1,8 @@ +2004-01-21 Ralf Corsepius + + * 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/helas403/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/Makefile.am index a903172019..8001615697 100644 --- a/c/src/lib/libbsp/powerpc/helas403/Makefile.am +++ b/c/src/lib/libbsp/powerpc/helas403/Makefile.am @@ -18,6 +18,7 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = times +PREINSTALL_DIRS = TMPINSTALL_FILES = $(PROJECT_LIB)/bsp_specs.dl: bsp_specs.dl $(PROJECT_LIB)/$(dirstamp) @@ -29,6 +30,7 @@ $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am index 4ff25f2fdb..aa69624c7a 100644 --- a/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am @@ -4,12 +4,15 @@ BSP_PIECES = startup dlentry flashentry # pieces to pick up out of libcpu/ppc -CPU_PIECES = clock timer console vectors ictrl # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../@exceptions@/$(ARCH)/rtems-cpu.rel $(foreach piece, $(CPU_PIECES), \ - ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel) + ../@exceptions@/$(ARCH)/rtems-cpu.rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/clock$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/timer$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/console$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/vectors$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/ictrl$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog index c8f2d8d011..e0cfe7df42 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog @@ -1,3 +1,8 @@ +2004-01-21 Ralf Corsepius + + * 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/ppcn_60x/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am index 1ee9cdc76d..042edf700d 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am @@ -19,6 +19,8 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = STATUS +PREINSTALL_DIRS = + $(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 @@ -36,6 +38,7 @@ $(PROJECT_INCLUDE)/pci.h: include/pci.h $(PROJECT_INCLUDE)/$(dirstamp) PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci.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/ppcn_60x/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am index 6c289b3059..94834dc2ab 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am @@ -9,7 +9,6 @@ endif BSP_PIECES = startup clock console timer tod $(NETWORK) nvram universe pci \ vectors -# pieces to pick up out of libcpu/$(RTEMS_CPU) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog index e47dab680e..e1f5b99b76 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,3 +1,8 @@ +2004-01-21 Ralf Corsepius + + * 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/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am index afdbb46548..492a61ac92 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am @@ -16,6 +16,8 @@ include_HEADERS += include/tod.h all-local: $(PREINSTALL_FILES) +PREINSTALL_DIRS = + $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h @@ -29,6 +31,7 @@ $(PROJECT_INCLUDE)/tod.h: include/tod.h $(PROJECT_INCLUDE)/$(dirstamp) PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.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/score603e/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am index 8b04212abc..de32de186c 100644 --- a/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am @@ -3,7 +3,6 @@ ## BSP_PIECES = startup clock console timer tod vectors PCI_bus -# pieces to pick up out of libcpu/$(RTEMS_CPU) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ -- cgit v1.2.3