From: Michal Sojka Date: Sat, 23 Aug 2008 20:58:00 +0000 (+0000) Subject: Leaf makefiles in tests replaced with dash-friendly version X-Git-Tag: v0.1-sssa~50 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/omk.git/commitdiff_plain/747b1ea13a92fe6b632ad0c6ac995944146ed7c2 Leaf makefiles in tests replaced with dash-friendly version darcs-hash:20080823205847-f2ef6-641492e287b4d85955a04f1655276fe45fae0a22.gz --- diff --git a/tests/all_omk_subdirs/Makefile b/tests/all_omk_subdirs/Makefile index f595272..b22a357 100644 --- a/tests/all_omk_subdirs/Makefile +++ b/tests/all_omk_subdirs/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/all_omk_subdirs/dir1/Makefile b/tests/all_omk_subdirs/dir1/Makefile index f595272..b22a357 100644 --- a/tests/all_omk_subdirs/dir1/Makefile +++ b/tests/all_omk_subdirs/dir1/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/all_omk_subdirs/dir2/Makefile b/tests/all_omk_subdirs/dir2/Makefile index f595272..b22a357 100644 --- a/tests/all_omk_subdirs/dir2/Makefile +++ b/tests/all_omk_subdirs/dir2/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/automatic_subdirs/Makefile b/tests/automatic_subdirs/Makefile index f595272..b22a357 100644 --- a/tests/automatic_subdirs/Makefile +++ b/tests/automatic_subdirs/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/automatic_subdirs/dir1/Makefile b/tests/automatic_subdirs/dir1/Makefile index f595272..b22a357 100644 --- a/tests/automatic_subdirs/dir1/Makefile +++ b/tests/automatic_subdirs/dir1/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/automatic_subdirs/dir2/Makefile b/tests/automatic_subdirs/dir2/Makefile index f595272..b22a357 100644 --- a/tests/automatic_subdirs/dir2/Makefile +++ b/tests/automatic_subdirs/dir2/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/config/default/Makefile b/tests/config/default/Makefile index f595272..b22a357 100644 --- a/tests/config/default/Makefile +++ b/tests/config/default/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/config/default/subdir/Makefile b/tests/config/default/subdir/Makefile index f595272..b22a357 100644 --- a/tests/config/default/subdir/Makefile +++ b/tests/config/default/subdir/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/config/override/Makefile b/tests/config/override/Makefile index f595272..b22a357 100644 --- a/tests/config/override/Makefile +++ b/tests/config/override/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/headers/files/Makefile b/tests/headers/files/Makefile index f595272..b22a357 100644 --- a/tests/headers/files/Makefile +++ b/tests/headers/files/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/headers/generated/Makefile b/tests/headers/generated/Makefile index f595272..b22a357 100644 --- a/tests/headers/generated/Makefile +++ b/tests/headers/generated/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/headers/generated/lincan/Makefile b/tests/headers/generated/lincan/Makefile index f595272..b22a357 100644 --- a/tests/headers/generated/lincan/Makefile +++ b/tests/headers/generated/lincan/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/headers/nonexising/Makefile b/tests/headers/nonexising/Makefile index f595272..b22a357 100644 --- a/tests/headers/nonexising/Makefile +++ b/tests/headers/nonexising/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/hooks/Makefile b/tests/hooks/Makefile index f595272..b22a357 100644 --- a/tests/hooks/Makefile +++ b/tests/hooks/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/libraries/Makefile b/tests/libraries/Makefile index aa6b442..b22a357 100644 --- a/tests/libraries/Makefile +++ b/tests/libraries/Makefile @@ -1,16 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif -print_vars: - echo $(COMPILED_DIR) \ No newline at end of file diff --git a/tests/libraries/shlibs/Makefile b/tests/libraries/shlibs/Makefile index aa6b442..b22a357 100644 --- a/tests/libraries/shlibs/Makefile +++ b/tests/libraries/shlibs/Makefile @@ -1,16 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif -print_vars: - echo $(COMPILED_DIR) \ No newline at end of file diff --git a/tests/no_vpath/Makefile b/tests/no_vpath/Makefile index aa6b442..b22a357 100644 --- a/tests/no_vpath/Makefile +++ b/tests/no_vpath/Makefile @@ -1,16 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif -print_vars: - echo $(COMPILED_DIR) \ No newline at end of file diff --git a/tests/omk_config/Makefile b/tests/omk_config/Makefile index f595272..b22a357 100644 --- a/tests/omk_config/Makefile +++ b/tests/omk_config/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/parallel_make/Makefile b/tests/parallel_make/Makefile index f595272..b22a357 100644 --- a/tests/parallel_make/Makefile +++ b/tests/parallel_make/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/parallel_make/dir1/Makefile b/tests/parallel_make/dir1/Makefile index f595272..b22a357 100644 --- a/tests/parallel_make/dir1/Makefile +++ b/tests/parallel_make/dir1/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/parallel_make/dir2/Makefile b/tests/parallel_make/dir2/Makefile index f595272..b22a357 100644 --- a/tests/parallel_make/dir2/Makefile +++ b/tests/parallel_make/dir2/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/parallel_make/dir3/Makefile b/tests/parallel_make/dir3/Makefile index f595272..b22a357 100644 --- a/tests/parallel_make/dir3/Makefile +++ b/tests/parallel_make/dir3/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/programs/Makefile b/tests/programs/Makefile index aa6b442..b22a357 100644 --- a/tests/programs/Makefile +++ b/tests/programs/Makefile @@ -1,16 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif -print_vars: - echo $(COMPILED_DIR) \ No newline at end of file diff --git a/tests/programs/includes/Makefile b/tests/programs/includes/Makefile index aa6b442..b22a357 100644 --- a/tests/programs/includes/Makefile +++ b/tests/programs/includes/Makefile @@ -1,16 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif -print_vars: - echo $(COMPILED_DIR) \ No newline at end of file diff --git a/tests/sources_dir/Makefile b/tests/sources_dir/Makefile index aa6b442..b22a357 100644 --- a/tests/sources_dir/Makefile +++ b/tests/sources_dir/Makefile @@ -1,16 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif -print_vars: - echo $(COMPILED_DIR) \ No newline at end of file diff --git a/tests/vxworks/Makefile b/tests/vxworks/Makefile index f595272..b22a357 100644 --- a/tests/vxworks/Makefile +++ b/tests/vxworks/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/vxworks/fibo-rtp/Makefile b/tests/vxworks/fibo-rtp/Makefile index f595272..b22a357 100644 --- a/tests/vxworks/fibo-rtp/Makefile +++ b/tests/vxworks/fibo-rtp/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/vxworks/fibo-rtplib/Makefile b/tests/vxworks/fibo-rtplib/Makefile index f595272..b22a357 100644 --- a/tests/vxworks/fibo-rtplib/Makefile +++ b/tests/vxworks/fibo-rtplib/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/whole_tree/Makefile b/tests/whole_tree/Makefile index f595272..b22a357 100644 --- a/tests/whole_tree/Makefile +++ b/tests/whole_tree/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/tests/whole_tree/subdir/Makefile b/tests/whole_tree/subdir/Makefile index f595272..b22a357 100644 --- a/tests/whole_tree/subdir/Makefile +++ b/tests/whole_tree/subdir/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else +else include $(MAKERULES_DIR)/Makefile.rules endif