From a748603cb4565d395db1acf812cb1aee2f0642d9 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Sun, 14 May 2017 11:52:52 +1000 Subject: build-system: Parallel build all subdirs. --- c/src/lib/libbsp/Makefile.am | 4 ++-- c/src/lib/libbsp/arm/Makefile.am | 2 +- c/src/lib/libbsp/bfin/Makefile.am | 2 +- c/src/lib/libbsp/epiphany/Makefile.am | 2 +- c/src/lib/libbsp/i386/Makefile.am | 2 +- c/src/lib/libbsp/i386/pc386/Makefile.am | 3 ++- c/src/lib/libbsp/lm32/Makefile.am | 2 +- c/src/lib/libbsp/m32c/Makefile.am | 2 +- c/src/lib/libbsp/m68k/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am | 2 +- c/src/lib/libbsp/mips/Makefile.am | 2 +- c/src/lib/libbsp/moxie/Makefile.am | 2 +- c/src/lib/libbsp/nios2/Makefile.am | 2 +- c/src/lib/libbsp/no_cpu/Makefile.am | 2 +- c/src/lib/libbsp/or1k/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am | 7 ++++--- c/src/lib/libbsp/sh/Makefile.am | 2 +- c/src/lib/libbsp/sparc/Makefile.am | 2 +- c/src/lib/libbsp/sparc64/Makefile.am | 2 +- c/src/lib/libbsp/v850/Makefile.am | 2 +- 21 files changed, 26 insertions(+), 24 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/Makefile.am b/c/src/lib/libbsp/Makefile.am index 85ddbe217b..840d52b033 100644 --- a/c/src/lib/libbsp/Makefile.am +++ b/c/src/lib/libbsp/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/automake/compile.am -SUBDIRS = @libbsp_cpu_subdir@ +_SUBDIRS = @libbsp_cpu_subdir@ DIST_SUBDIRS = @libbsp_cpu_subdir@ EXTRA_DIST = MERGE.PROCEDURE bsp.am @@ -42,5 +42,5 @@ include_bsp_HEADERS += shared/include/console-termios.h include_bsp_HEADERS += shared/include/gpio.h include $(srcdir)/preinstall.am -include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am +include $(top_srcdir)/automake/subdirs.am diff --git a/c/src/lib/libbsp/arm/Makefile.am b/c/src/lib/libbsp/arm/Makefile.am index a567a2c1c6..a8a0178560 100644 --- a/c/src/lib/libbsp/arm/Makefile.am +++ b/c/src/lib/libbsp/arm/Makefile.am @@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal ## Descend into the @RTEMS_BSP_FAMILY@ directory ## Currently, the shared directory is not explicitly ## added but it is present in the source tree. -SUBDIRS = @RTEMS_BSP_FAMILY@ +_SUBDIRS = @RTEMS_BSP_FAMILY@ include_bspdir = $(includedir)/bsp include_bsp_HEADERS = shared/include/linker-symbols.h diff --git a/c/src/lib/libbsp/bfin/Makefile.am b/c/src/lib/libbsp/bfin/Makefile.am index 140d76ee20..c25b2d3f99 100644 --- a/c/src/lib/libbsp/bfin/Makefile.am +++ b/c/src/lib/libbsp/bfin/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal # Descend into the @RTEMS_BSP_FAMILY@ directory -SUBDIRS = @RTEMS_BSP_FAMILY@ +_SUBDIRS = @RTEMS_BSP_FAMILY@ include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/epiphany/Makefile.am b/c/src/lib/libbsp/epiphany/Makefile.am index cdcc3fbd5c..86705a772c 100644 --- a/c/src/lib/libbsp/epiphany/Makefile.am +++ b/c/src/lib/libbsp/epiphany/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal ## Descend into the @RTEMS_BSP_FAMILY@ directory ## Currently, the shared directory is not explicitly ## added but it is present in the source tree. -SUBDIRS = @RTEMS_BSP_FAMILY@ +_SUBDIRS = @RTEMS_BSP_FAMILY@ include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/Makefile.am b/c/src/lib/libbsp/i386/Makefile.am index 567f75fdbd..959646762f 100644 --- a/c/src/lib/libbsp/i386/Makefile.am +++ b/c/src/lib/libbsp/i386/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal ## Descend into the @RTEMS_BSP_FAMILY@ directory -SUBDIRS = @RTEMS_BSP_FAMILY@ +_SUBDIRS = @RTEMS_BSP_FAMILY@ EXTRA_DIST = diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am index d051da8ec7..8408db0095 100644 --- a/c/src/lib/libbsp/i386/pc386/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/Makefile.am @@ -23,7 +23,7 @@ DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -SUBDIRS = . tools +_SUBDIRS = . tools nodist_include_bsp_HEADERS += include/bspimpl.h include_bsp_HEADERS = ../../i386/shared/irq/irq.h @@ -258,3 +258,4 @@ EXTRA_DIST += times_p5 include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/lm32/Makefile.am b/c/src/lib/libbsp/lm32/Makefile.am index 140d76ee20..c25b2d3f99 100644 --- a/c/src/lib/libbsp/lm32/Makefile.am +++ b/c/src/lib/libbsp/lm32/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal # Descend into the @RTEMS_BSP_FAMILY@ directory -SUBDIRS = @RTEMS_BSP_FAMILY@ +_SUBDIRS = @RTEMS_BSP_FAMILY@ include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/m32c/Makefile.am b/c/src/lib/libbsp/m32c/Makefile.am index f504c03a19..e99d8df18f 100644 --- a/c/src/lib/libbsp/m32c/Makefile.am +++ b/c/src/lib/libbsp/m32c/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal ## Descend into the @RTEMS_BSP_FAMILY@ directory -SUBDIRS = @RTEMS_BSP_FAMILY@ +_SUBDIRS = @RTEMS_BSP_FAMILY@ EXTRA_DIST = diff --git a/c/src/lib/libbsp/m68k/Makefile.am b/c/src/lib/libbsp/m68k/Makefile.am index 925b543d13..634f7ff898 100644 --- a/c/src/lib/libbsp/m68k/Makefile.am +++ b/c/src/lib/libbsp/m68k/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal ## Descend into the @RTEMS_BSP_FAMILY@ directory -SUBDIRS = @RTEMS_BSP_FAMILY@ +_SUBDIRS = @RTEMS_BSP_FAMILY@ include_bspdir = $(includedir)/bsp include_bsp_HEADERS = shared/include/linker-symbols.h diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am index 3411b27651..2ca635ba8b 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am @@ -13,7 +13,7 @@ nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h -SUBDIRS = . tools +_SUBDIRS = . tools include_HEADERS += include/coverhd.h include_HEADERS += include/i2c.h diff --git a/c/src/lib/libbsp/mips/Makefile.am b/c/src/lib/libbsp/mips/Makefile.am index d294e842ec..526453030c 100644 --- a/c/src/lib/libbsp/mips/Makefile.am +++ b/c/src/lib/libbsp/mips/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal ## Descend into the @RTEMS_BSP_FAMILY@ directory -SUBDIRS = @RTEMS_BSP_FAMILY@ +_SUBDIRS = @RTEMS_BSP_FAMILY@ include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/moxie/Makefile.am b/c/src/lib/libbsp/moxie/Makefile.am index d8b53da543..3caad19373 100644 --- a/c/src/lib/libbsp/moxie/Makefile.am +++ b/c/src/lib/libbsp/moxie/Makefile.am @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal # Descend into the @RTEMS_BSP_FAMILY@ directory -SUBDIRS = @RTEMS_BSP_FAMILY@ +_SUBDIRS = @RTEMS_BSP_FAMILY@ include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/nios2/Makefile.am b/c/src/lib/libbsp/nios2/Makefile.am index 140d76ee20..c25b2d3f99 100644 --- a/c/src/lib/libbsp/nios2/Makefile.am +++ b/c/src/lib/libbsp/nios2/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal # Descend into the @RTEMS_BSP_FAMILY@ directory -SUBDIRS = @RTEMS_BSP_FAMILY@ +_SUBDIRS = @RTEMS_BSP_FAMILY@ include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/no_cpu/Makefile.am b/c/src/lib/libbsp/no_cpu/Makefile.am index 140d76ee20..c25b2d3f99 100644 --- a/c/src/lib/libbsp/no_cpu/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal # Descend into the @RTEMS_BSP_FAMILY@ directory -SUBDIRS = @RTEMS_BSP_FAMILY@ +_SUBDIRS = @RTEMS_BSP_FAMILY@ include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/or1k/Makefile.am b/c/src/lib/libbsp/or1k/Makefile.am index 0ce20e62fa..6d6feb2699 100644 --- a/c/src/lib/libbsp/or1k/Makefile.am +++ b/c/src/lib/libbsp/or1k/Makefile.am @@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal ## Descend into the @RTEMS_BSP_FAMILY@ directory ## Currently, the shared directory is not explicitly ## added but it is present in the source tree. -SUBDIRS = @RTEMS_BSP_FAMILY@ +_SUBDIRS = @RTEMS_BSP_FAMILY@ include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/Makefile.am index a2795f2ef9..1309072f53 100644 --- a/c/src/lib/libbsp/powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal ## Descend into the @RTEMS_BSP_FAMILY@ directory -SUBDIRS = @RTEMS_BSP_FAMILY@ +_SUBDIRS = @RTEMS_BSP_FAMILY@ # FIXME: This does not work # DIST_SUBDIRS = @all_subdirs@ support/old_exception_processing \ diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am index e098206083..af7a71f723 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am @@ -1,9 +1,9 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal -SUBDIRS = . -SUBDIRS+= bootloader +_SUBDIRS = . +_SUBDIRS += bootloader if QEMU -SUBDIRS+= qemu_fakerom +_SUBDIRS += qemu_fakerom endif include $(top_srcdir)/../../../../automake/compile.am @@ -166,3 +166,4 @@ EXTRA_DIST += times.mcp750 times.mvme2307 include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/sh/Makefile.am b/c/src/lib/libbsp/sh/Makefile.am index 33c5db1613..35db1bb6fa 100644 --- a/c/src/lib/libbsp/sh/Makefile.am +++ b/c/src/lib/libbsp/sh/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal # Descend into the @RTEMS_BSP_FAMILY@ directory -SUBDIRS = @RTEMS_BSP_FAMILY@ +_SUBDIRS = @RTEMS_BSP_FAMILY@ EXTRA_DIST = EXTRA_DIST += shared/console.c diff --git a/c/src/lib/libbsp/sparc/Makefile.am b/c/src/lib/libbsp/sparc/Makefile.am index d17d691a55..30ea8497b5 100644 --- a/c/src/lib/libbsp/sparc/Makefile.am +++ b/c/src/lib/libbsp/sparc/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal # Descend into the @RTEMS_BSP_FAMILY@ directory -SUBDIRS = @RTEMS_BSP_FAMILY@ +_SUBDIRS = @RTEMS_BSP_FAMILY@ EXTRA_DIST = diff --git a/c/src/lib/libbsp/sparc64/Makefile.am b/c/src/lib/libbsp/sparc64/Makefile.am index d294e842ec..526453030c 100644 --- a/c/src/lib/libbsp/sparc64/Makefile.am +++ b/c/src/lib/libbsp/sparc64/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal ## Descend into the @RTEMS_BSP_FAMILY@ directory -SUBDIRS = @RTEMS_BSP_FAMILY@ +_SUBDIRS = @RTEMS_BSP_FAMILY@ include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libbsp/v850/Makefile.am b/c/src/lib/libbsp/v850/Makefile.am index d5747beb2f..15054fee72 100644 --- a/c/src/lib/libbsp/v850/Makefile.am +++ b/c/src/lib/libbsp/v850/Makefile.am @@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal ## Descend into the @RTEMS_BSP_FAMILY@ directory ## Currently, the shared directory is not explicitly ## added but it is present in the source tree. -SUBDIRS = @RTEMS_BSP_FAMILY@ +_SUBDIRS = @RTEMS_BSP_FAMILY@ EXTRA_DIST = -- cgit v1.2.3