Fixed serialization of passes when W=1 is used.

darcs-hash:20080129081109-f2ef6-b39fbfb3ecb88ef2237c5da514b316ea7f0d2b7e.gz

diff --git a/snippets/linux b/snippets/linux
index 3751c154a63e3dda541e5fde9bf5724441d9f885..ad599534949cef5797c87f2f680515e970e5bcfd 100644 (file)
--- a/snippets/linux
+++ b/snippets/linux
@@ -144,6 +144,7 @@ kernel-modpost-pass: kernel-mod-pass
 kernel-pass: kernel-mod-pass kernel-modpost-pass
 
 override OMK_SERIALIZE_INCLUDED = y
+MAKEOVERRIDES := $(filter-out OMK_SERIALIZE_INCLUDED=n,$(MAKEOVERRIDES))
 endif
 
 # Checks for OMK tester

diff --git a/snippets/rtems b/snippets/rtems
index 18e30ee42f0486a43f216c3d8b60af33f956aa19..5cd241d3ca1792c42ef68d00beb66ec07aa7431a 100644 (file)
--- a/snippets/rtems
+++ b/snippets/rtems
@@ -81,6 +81,7 @@ library-pass: include-pass
 binary-pass: library-pass
 
 override OMK_SERIALIZE_INCLUDED = y
+MAKEOVERRIDES := $(filter-out OMK_SERIALIZE_INCLUDED=n,$(MAKEOVERRIDES))
 endif
 
 #=====================================================================

diff --git a/snippets/sdcc b/snippets/sdcc
index 76b4286d0a352b7924d2dea6acc698c1fceddbdd..33bc2fce4f4172508d5e49a4b35b1e8f649a25c4 100644 (file)
--- a/snippets/sdcc
+++ b/snippets/sdcc
@@ -70,6 +70,7 @@ library-pass: include-pass
 binary-pass utils-pass: library-pass
 
 override OMK_SERIALIZE_INCLUDED = y
+MAKEOVERRIDES := $(filter-out OMK_SERIALIZE_INCLUDED=n,$(MAKEOVERRIDES))
 endif
 
 CPPFLAGS  += -I $(USER_INCLUDE_DIR)

diff --git a/snippets/sysless b/snippets/sysless
index 0e763a4215a14495e537da4855133eb108382a63..a4e9c8ca54d3c298208846e23439b3e3339b139e 100644 (file)
--- a/snippets/sysless
+++ b/snippets/sysless
@@ -54,6 +54,7 @@ library-pass: include-pass
 binary-pass utils-pass: library-pass
 
 override OMK_SERIALIZE_INCLUDED = y
+MAKEOVERRIDES := $(filter-out OMK_SERIALIZE_INCLUDED=n,$(MAKEOVERRIDES))
 endif
 
 # -------------------------------------

diff --git a/snippets/vxworks b/snippets/vxworks
index 443e05b7b490890d0587e793445b4bc5d10e16cb..c494ba0c00244aece014694775928d34306402a1 100644 (file)
--- a/snippets/vxworks
+++ b/snippets/vxworks
@@ -55,6 +55,7 @@ kernel-modpost-pass: kernel-mod-pass
 kernel-pass: kernel-mod-pass kernel-modpost-pass
 
 override OMK_SERIALIZE_INCLUDED = y
+MAKEOVERRIDES := $(filter-out OMK_SERIALIZE_INCLUDED=n,$(MAKEOVERRIDES))
 endif
 
 # Checks for OMK tester

diff --git a/tests/whole_tree/Makefile.omk b/tests/whole_tree/Makefile.omk
index c77e8bb3574b4b32b149411a8c2f068fb62ca033..96a091ac9c9b14c5273912aacb843550e852d7d3 100644 (file)
--- a/tests/whole_tree/Makefile.omk
+++ b/tests/whole_tree/Makefile.omk
@@ -1 +1,4 @@
 $(shell echo "Top-level executed" > toplevel.mark)
+
+SUBDIRS=subdir
+

diff --git a/tests/whole_tree/config.omk-default b/tests/whole_tree/config.omk-default
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/whole_tree/runtest b/tests/whole_tree/runtest
index c6f995bb6694a54a9db25ce7e141d47c195c654b..82ec174b43cfc996c223c25e9e6c22bfb70f4c8f 100755 (executable)
--- a/tests/whole_tree/runtest
+++ b/tests/whole_tree/runtest
@@ -2,7 +2,9 @@
 
 source ../functions.sh
 
-touch config.omk-default
+rm -f *.mark
+
 make -C subdir W=1 || canttest
 
 [ -f 'toplevel.mark' ] || error "Toplevel make was not called".
+[ `wc -l < subdir.mark` -eq 1 ] || error "OMK_SERIALIZE do not work"

diff --git a/tests/whole_tree/subdir/Makefile.omk b/tests/whole_tree/subdir/Makefile.omk
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..43f8508eedfe329a5527b3a5259006a316fc92d0 100644 (file)
--- a/tests/whole_tree/subdir/Makefile.omk
+++ b/tests/whole_tree/subdir/Makefile.omk
@@ -0,0 +1,4 @@
+include-pass: include-pass-test
+
+include-pass-test:
+       echo $@ >> $(MAKERULES_DIR)/subdir.mark