X-Git-Url: http://rtime.felk.cvut.cz/gitweb/omk.git/blobdiff_plain/85ebc7c0f3b75600856e27b511b42f1734076d9e..639651630cd8dbab7b757afdea845eb66b99c564:/snippets/base.omk diff --git a/snippets/base.omk b/snippets/base.omk index a50de01..d43428f 100644 --- a/snippets/base.omk +++ b/snippets/base.omk @@ -1,7 +1,7 @@ # Makefile.rules - OCERA make framework common project rules -*- makefile-gmake -*- # # (C) Copyright 2003, 2006, 2007, 2008, 2009 by Pavel Pisa - OCERA team member -# (C) Copyright 2006, 2007, 2008, 2009, 2010, 2011 by Michal Sojka - Czech Technical University, FEE, DCE +# (C) Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2015 by Michal Sojka - Czech Technical University, FEE, DCE # # Homepage: http://rtime.felk.cvut.cz/omk/ # Version: @git-describe@ @@ -267,8 +267,10 @@ $(pass)-this-dir: $(foreach subdir,$(SUBDIRS),$(pass)-$(subdir)-subdir) @$(call mkdir_def,$(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) +ifneq ($(pass),clean) $(pass)-local: $($(pass)_HOOKS) endif +endif endef # ======================= @@ -298,7 +300,7 @@ omkize: fi $(Q)for i in `find -L . -name Makefile.omk` ; do \ d=`dirname $${i}`; \ - if ! test -f "$${d}/Makefile.rules" && ( test -f "$${d}/Makefile" && ! cmp -s Makefile "$${d}/Makefile" ); then \ + if ! test -f "$${d}/Makefile.rules" && ! cmp -s Makefile "$${d}/Makefile"; then \ rm -f "$${d}/Makefile"; \ cp -v Makefile "$${d}/Makefile"; \ fi \