>From 4de860e4cffa817037bf7fc081358ab7fc0038c2 Mon Sep 17 00:00:00 2001 From: Tilman Vogel Date: Fri, 22 Feb 2013 11:58:29 +0100 Subject: [PATCH] Makefiles: allow parallel builds top-level Makefile: add .NOTPARALLEL for serial build of modules */Makefile.in: add libsrc-all dependency to tests-all target where missing --- Makefile | 2 ++ dcmimgle/Makefile.in | 2 +- dcmjpeg/Makefile.in | 2 +- dcmjpls/Makefile.in | 2 +- dcmnet/Makefile.in | 2 +- dcmpstat/Makefile.in | 2 +- dcmsign/Makefile.in | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index a937dd6..973c9e6 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,8 @@ configdir = config include $(configdir)/Makefile.def +.NOTPARALLEL: + all: config-all ofstd-all oflog-all dcmdata-all dcmtls-all dcmnet-all dcmqrdb-all dcmwlm-all dcmimgle-all dcmsr-all dcmsign-all dcmpstat-all dcmimage-all dcmjpeg-all dcmjpls-all libsrc-all: ofstd-libsrc-all oflog-libsrc-all dcmdata-libsrc-all dcmtls-libsrc-all dcmnet-libsrc-all dcmqrdb-libsrc-all dcmwlm-libsrc-all dcmimgle-libsrc-all dcmsr-libsrc-all dcmsign-libsrc-all dcmpstat-libsrc-all dcmimage-libsrc-all dcmjpeg-libsrc-all dcmjpls-libsrc-all diff --git a/dcmimgle/Makefile.in b/dcmimgle/Makefile.in index d78d6e1..8313d81 100644 --- a/dcmimgle/Makefile.in +++ b/dcmimgle/Makefile.in @@ -41,7 +41,7 @@ libsrc-all: include-all apps-all: libsrc-all (cd apps && $(MAKE) ARCH="$(ARCH)" all) -tests-all: +tests-all: libsrc-all (cd docs && $(MAKE) all) diff --git a/dcmjpeg/Makefile.in b/dcmjpeg/Makefile.in index 3b469ff..9663d82 100644 --- a/dcmjpeg/Makefile.in +++ b/dcmjpeg/Makefile.in @@ -44,7 +44,7 @@ libsrc-all: include-all apps-all: libsrc-all (cd apps && $(MAKE) ARCH="$(ARCH)" all) -tests-all: +tests-all: libsrc-all (cd tests && $(MAKE) all) diff --git a/dcmjpls/Makefile.in b/dcmjpls/Makefile.in index 558cb6b..6bc04c3 100644 --- a/dcmjpls/Makefile.in +++ b/dcmjpls/Makefile.in @@ -42,7 +42,7 @@ libsrc-all: include-all apps-all: libsrc-all (cd apps && $(MAKE) ARCH="$(ARCH)" all) -tests-all: +tests-all: libsrc-all (cd tests && $(MAKE) ARCH="$(ARCH)" all) diff --git a/dcmnet/Makefile.in b/dcmnet/Makefile.in index d758a0b..23de4c0 100644 --- a/dcmnet/Makefile.in +++ b/dcmnet/Makefile.in @@ -41,7 +41,7 @@ libsrc-all: include-all apps-all: libsrc-all (cd apps && $(MAKE) ARCH="$(ARCH)" all) -tests-all: +tests-all: libsrc-all (cd tests && $(MAKE) ARCH="$(ARCH)" all) diff --git a/dcmpstat/Makefile.in b/dcmpstat/Makefile.in index bbbfa79..041bd04 100644 --- a/dcmpstat/Makefile.in +++ b/dcmpstat/Makefile.in @@ -41,7 +41,7 @@ libsrc-all: include-all apps-all: libsrc-all (cd apps && $(MAKE) ARCH="$(ARCH)" all) -tests-all: +tests-all: libsrc-all (cd tests && $(MAKE) all) diff --git a/dcmsign/Makefile.in b/dcmsign/Makefile.in index 6025c36..d4be0e4 100644 --- a/dcmsign/Makefile.in +++ b/dcmsign/Makefile.in @@ -41,7 +41,7 @@ libsrc-all: include-all apps-all: libsrc-all (cd apps && $(MAKE) ARCH="$(ARCH)" all) -tests-all: +tests-all: libsrc-all (cd tests && $(MAKE) all) -- 1.7.4.2.2.gb844.dirty