Re-generated the Makefiles

This commit is contained in:
Pierre Pronchery 2015-03-03 20:44:27 +01:00
parent 5f625f171a
commit fb4d5cc899
4 changed files with 21 additions and 4 deletions

View File

@ -10,7 +10,11 @@ MKDIR = mkdir -m 0755 -p
all: subdirs all: subdirs
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: clean:
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done

View File

@ -12,7 +12,11 @@ INSTALL = install
all: subdirs $(TARGETS) all: subdirs $(TARGETS)
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
$(OBJDIR)gtkdoc/libDesktop.types: ../config.sh $(OBJDIR)gtkdoc/libDesktop.types: ../config.sh
./gtkdoc.sh -P "$(PREFIX)" -- "$(OBJDIR)gtkdoc/libDesktop.types" ./gtkdoc.sh -P "$(PREFIX)" -- "$(OBJDIR)gtkdoc/libDesktop.types"

View File

@ -1,10 +1,15 @@
SUBDIRS = tmpl SUBDIRS = tmpl
MKDIR = mkdir -m 0755 -p
all: subdirs all: subdirs
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: clean:
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done

View File

@ -12,7 +12,11 @@ INCLUDEDIR= $(PREFIX)/include
all: subdirs all: subdirs
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: clean:
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done