From 18cd8944915b5206d3068315ad08bad863a2ffb3 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Tue, 3 Mar 2015 20:48:05 +0100 Subject: [PATCH] Re-generated the Makefiles --- Makefile | 6 +++++- doc/Makefile | 6 +++++- include/Makefile | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0686b9e..b5a16f3 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,11 @@ MKDIR = mkdir -m 0755 -p all: subdirs subdirs: - @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE)) || exit; done + @for i in $(SUBDIRS); do (cd "$$i" && \ + if [ -n "$(OBJDIR)" ]; then \ + ([ -d "$(OBJDIR)$$i" ] || $(MKDIR) -- "$(OBJDIR)$$i") && \ + $(MAKE) OBJDIR="$(OBJDIR)$$i/"; \ + else $(MAKE); fi) || exit; done clean: @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done diff --git a/doc/Makefile b/doc/Makefile index 6ed32a6..cd774c9 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -12,7 +12,11 @@ INSTALL = install all: subdirs $(TARGETS) subdirs: - @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE)) || exit; done + @for i in $(SUBDIRS); do (cd "$$i" && \ + if [ -n "$(OBJDIR)" ]; then \ + ([ -d "$(OBJDIR)$$i" ] || $(MKDIR) -- "$(OBJDIR)$$i") && \ + $(MAKE) OBJDIR="$(OBJDIR)$$i/"; \ + else $(MAKE); fi) || exit; done $(OBJDIR)AppBroker.1: AppBroker.xml ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)AppBroker.1" diff --git a/include/Makefile b/include/Makefile index 8ad1805..0fb9e65 100644 --- a/include/Makefile +++ b/include/Makefile @@ -12,7 +12,11 @@ INCLUDEDIR= $(PREFIX)/include all: subdirs subdirs: - @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE)) || exit; done + @for i in $(SUBDIRS); do (cd "$$i" && \ + if [ -n "$(OBJDIR)" ]; then \ + ([ -d "$(OBJDIR)$$i" ] || $(MKDIR) -- "$(OBJDIR)$$i") && \ + $(MAKE) OBJDIR="$(OBJDIR)$$i/"; \ + else $(MAKE); fi) || exit; done clean: @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done