From 30d291711ad0d83ee558cba9ef0373985870d80c Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sat, 28 Feb 2015 00:32:41 +0100 Subject: [PATCH] Re-generated the Makefiles --- Makefile | 6 +++++- data/Makefile | 6 +++++- src/Makefile | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index dfc3264..95e7d06 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/data/Makefile b/data/Makefile index a42b33c..f8a593c 100644 --- a/data/Makefile +++ b/data/Makefile @@ -15,7 +15,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)Panel.pc: Panel.pc.in ../config.sh ./pkgconfig.sh -P "$(PREFIX)" -- "$(OBJDIR)Panel.pc" diff --git a/src/Makefile b/src/Makefile index 67846bd..af29a22 100644 --- a/src/Makefile +++ b/src/Makefile @@ -23,7 +23,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 libPanel_OBJS = $(OBJDIR)panel.o $(OBJDIR)window.o libPanel_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D PREFIX=\"$(PREFIX)\" $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libDesktop` -fPIC