gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use --no-print-directory in recursive make invocations

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@26946 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2008-10-21 15:07:11 +00:00
parent 0c9645c148
commit 934965313f
4 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,5 +1,15 @@
2008-10-21 Nicola Pero <nicola@localhost.localdomain>
Implemented suggestion from David Chisnall <theraven@sucs.org> of
using --no-print-directory for recursive make.
* common.make (GNUSTEP_MAKE_NO_PRINT_DIRECTORY_FLAG): New variable.
Set it to --no-print-directory unless messages=yes.
* Master/aggregate.make: Use it when doing recursive invocations
that change directory.
* Master/rules.make: Same change.
2008-10-21 Nicola Pero <nicola.pero@meta-innovation.com>
* GNUstep.sh.in: When adding paths to PATH, CLASSPATH,
GUILE_LOAD_PATH and INFOPATH, check that each path is not already
there before adding it. Previously we were checking, but checking

2
Master/aggregate.make
View file

@ -71,7 +71,7 @@ internal-all internal-install internal-uninstall internal-clean \
else \
gsbuild="$${abs_build_dir}/$$f"; \
fi; \
if $(MAKE) -C $$f -f $$mf --no-keep-going $$operation \
if $(MAKE) -C $$f -f $$mf $(GNUSTEP_MAKE_NO_PRINT_DIRECTORY_FLAG) --no-keep-going $$operation \
GNUSTEP_BUILD_DIR="$$gsbuild"; then \
:; else exit $$?; \
fi; \

4
Master/rules.make
View file

@ -308,7 +308,7 @@ if [ "$($(basename $(basename $*))_SUBPROJECTS)" != "" ]; then \
else \
owning_project_header_dir="../$(OWNING_PROJECT_HEADER_DIR_NAME)"; \
fi; \
if $(MAKE) -C $$f -f $$mf --no-keep-going $$operation \
if $(MAKE) -C $$f -f $$mf $(GNUSTEP_MAKE_NO_PRINT_DIRECTORY_FLAG) --no-keep-going $$operation \
OWNING_PROJECT_HEADER_DIR_NAME="$${owning_project_header_dir}" \
DERIVED_SOURCES="../$(DERIVED_SOURCES)" \
GNUSTEP_BUILD_DIR="$$gsbuild" \
@ -383,7 +383,7 @@ if [ "$($(basename $(basename $*))_SUBPROJECTS)" != "" ]; then \
else \
owning_project_header_dir="../$(OWNING_PROJECT_HEADER_DIR_NAME)"; \
fi; \
if $(MAKE) -C $$f -f $$mf --no-keep-going $$operation \
if $(MAKE) -C $$f -f $$mf $(GNUSTEP_MAKE_NO_PRINT_DIRECTORY_FLAG) --no-keep-going $$operation \
OWNING_PROJECT_HEADER_DIR_NAME="$${owning_project_header_dir}" \
DERIVED_SOURCES="../$(DERIVED_SOURCES)" \
GNUSTEP_BUILD_DIR="$$gsbuild" \

10
common.make
View file

@ -92,6 +92,16 @@ endif
#
include $(GNUSTEP_MAKEFILES)/messages.make
ifneq ($(messages),yes)
# This flag is passed to make so we do not print the directories that
# we recurse into unless messages=yes is used.
GNUSTEP_MAKE_NO_PRINT_DIRECTORY_FLAG = --no-print-directory
else
# If messages=yes is used, let make print out each directory it
# recurses into.
GNUSTEP_MAKE_NO_PRINT_DIRECTORY_FLAG =
endif
#
# Get flags/config options for core libraries
#