From 232fe2d7e6bdc1d68ffabfa639f0e30ba023de0e Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Tue, 22 Feb 2011 16:46:49 +0100 Subject: [PATCH] Update Makefile.rules -- fixes a bug in bin_SCRIPTS --- build/aquosa/Makefile.rules | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/build/aquosa/Makefile.rules b/build/aquosa/Makefile.rules index 59b23a88..2b54b9e3 100644 --- a/build/aquosa/Makefile.rules +++ b/build/aquosa/Makefile.rules @@ -1,10 +1,10 @@ # Makefile.rules - OCERA make framework common project rules -*- makefile-gmake -*- #OMK:base.omk # # (C) Copyright 2003, 2006, 2007, 2008, 2009 by Pavel Pisa - OCERA team member -# (C) Copyright 2006, 2007, 2008, 2009, 2010 by Michal Sojka - Czech Technical University, FEE, DCE +# (C) Copyright 2006, 2007, 2008, 2009, 2010, 2011 by Michal Sojka - Czech Technical University, FEE, DCE # # Homepage: http://rtime.felk.cvut.cz/omk/ -# Version: 0.2-48-gee527d4 +# Version: 0.2-66-g4da1afe # # The OMK build system is distributed under the GNU General Public # License. See file COPYING for details. @@ -260,7 +260,7 @@ $(pass)-submakes: $(pass)-$(3)-subdir $(pass)-$(3)-subdir: MAKEOVERRIDES:=$(filter-out SUBDIRS=%,$(MAKEOVERRIDES)) $(pass)-$(3)-subdir: @$(call mkdir_def,$(2)/$(3)) - +@$(MAKE) SOURCES_DIR=$(SOURCES_DIR)/$(3) $(NO_PRINT_DIRECTORY) \ + +@$(MAKE) --no-builtin-rules SOURCES_DIR=$(SOURCES_DIR)/$(3) $(NO_PRINT_DIRECTORY) \ RELATIVE_DIR=$(RELATIVE_PREFIX)$(3) -C $(2)/$(3) \ -f $(SUBDIR_MAKEFILE) $(pass)-submakes # In subdirectories we can call submakes directly since passes are @@ -292,7 +292,7 @@ $(foreach subdir,$(SUBDIRS),$(eval $(call omk_pass_subdir_template,$(pass),$(2), $(pass): # Submakes have to be called this way and not as dependecies for pass # serialization to work - +@$(MAKE) SOURCES_DIR=$(SOURCES_DIR) $(NO_PRINT_DIRECTORY) \ + +@$(MAKE) --no-builtin-rules SOURCES_DIR=$(SOURCES_DIR) $(NO_PRINT_DIRECTORY) \ RELATIVE_DIR=$(RELATIVE_DIR) \ -f $(SOURCESDIR_MAKEFILE) $(pass)-submakes $(pass)-submakes: @@ -303,7 +303,7 @@ $(pass)-submakes: $(pass)-this-dir $(pass)-this-dir: $(foreach subdir,$(SUBDIRS),$(pass)-$(subdir)-subdir) +@echo "make[omk]: $(pass) in $(RELATIVE_DIR)" @$(call mkdir_def,$(2)) - +@$(MAKE) $(NO_PRINT_DIRECTORY) SOURCES_DIR=$(SOURCES_DIR) RELATIVE_DIR=$(RELATIVE_DIR) -C $(2) \ + +@$(MAKE) --no-builtin-rules $(NO_PRINT_DIRECTORY) SOURCES_DIR=$(SOURCES_DIR) RELATIVE_DIR=$(RELATIVE_DIR) -C $(2) \ -f $(SOURCESDIR_MAKEFILE) $(3) $(check-target) $(1:%=%-local) $(pass)-local: $($(pass)_HOOKS) endif @@ -551,13 +551,6 @@ override OMK_SERIALIZE_INCLUDED = y MAKEOVERRIDES := $(filter-out OMK_SERIALIZE_INCLUDED=n,$(MAKEOVERRIDES)) endif -# Checks for OMK tester -ifdef OMK_TESTSROOT -default-config-pass-check include-pass-check: -library-pass-check binary-pass-check: - @[ -x "$(shell which $(CC))" ] || $(call canttest,Cannot find compiler: $(CC)) -endif - #===================================================================== # User-space rules and templates to compile programs, libraries etc. -- 2.39.2