Snippets renamed to *.omk

If OMK is tested by make -I and there is a file or a directory in the source
tree of the same name as a snippet (e.g. include) it doesn't work.

diff --git a/snippets/Makefile b/snippets/Makefile.omk
similarity index 100%
rename from snippets/Makefile
rename to snippets/Makefile.omk

diff --git a/snippets/Makefile.rules.linux b/snippets/Makefile.rules.linux
index d90c5ee530ef9d276bedc2989791d0d6c7f1acc7..761b1e85fa9a6fc4d12ca741cb6190ec21a56f0b 100644 (file)
--- a/snippets/Makefile.rules.linux
+++ b/snippets/Makefile.rules.linux
@@ -1,7 +1,7 @@
 OMK_RULES_TYPE=linux
-include base #omkbuild
-include include #omkbuild
-include linux #omkbuild
-include config_h #omkbuild
-include qt #omkbuild
-include sources-list #omkbuild
+include base.omk #omkbuild
+include include.omk #omkbuild
+include linux.omk #omkbuild
+include config_h.omk #omkbuild
+include qt.omk #omkbuild
+include sources-list.omk #omkbuild

diff --git a/snippets/Makefile.rules.rtems b/snippets/Makefile.rules.rtems
index e9aa57f1a5656f9a7839c5c29765e91259d0af4c..231865f4c04da8123a055e9c177c6619cf7ddf60 100644 (file)
--- a/snippets/Makefile.rules.rtems
+++ b/snippets/Makefile.rules.rtems
@@ -1,6 +1,6 @@
 OMK_RULES_TYPE=rtems
-include base #omkbuild
-include include #omkbuild
-include rtems #omkbuild
-include config_h #omkbuild
-include sources-list #omkbuild
+include base.omk #omkbuild
+include include.omk #omkbuild
+include rtems.omk #omkbuild
+include config_h.omk #omkbuild
+include sources-list.omk #omkbuild

diff --git a/snippets/Makefile.rules.sdcc b/snippets/Makefile.rules.sdcc
index 3bef39406e5fea424c922c7c44f5db908ab979db..231c9aa69db6a135d55d930dada47882689063ae 100644 (file)
--- a/snippets/Makefile.rules.sdcc
+++ b/snippets/Makefile.rules.sdcc
@@ -1,7 +1,7 @@
 OMK_RULES_TYPE=sdcc
-include base #omkbuild
-include include #omkbuild
-include sdcc #omkbuild
-include config_h #omkbuild
-include sources-list #omkbuild
-include localeval #omkbuild
+include base.omk #omkbuild
+include include.omk #omkbuild
+include sdcc.omk #omkbuild
+include config_h.omk #omkbuild
+include sources-list.omk #omkbuild
+include localeval.omk #omkbuild

diff --git a/snippets/Makefile.rules.sysless b/snippets/Makefile.rules.sysless
index 3134e766a95873d6a8f4294e63724c7a03aab582..3b6162d5023832b3db73dfa31e39a8d0b43c543a 100644 (file)
--- a/snippets/Makefile.rules.sysless
+++ b/snippets/Makefile.rules.sysless
@@ -1,8 +1,8 @@
 OMK_RULES_TYPE=sysless
-include base #omkbuild
-include gcc #omkbuild
-include include #omkbuild
-include sysless #omkbuild
-include config_h #omkbuild
-include sources-list #omkbuild
-include localeval #omkbuild
+include base.omk #omkbuild
+include gcc.omk #omkbuild
+include include.omk #omkbuild
+include sysless.omk #omkbuild
+include config_h.omk #omkbuild
+include sources-list.omk #omkbuild
+include localeval.omk #omkbuild

diff --git a/snippets/Makefile.rules.sysless-keil16x b/snippets/Makefile.rules.sysless-keil16x
index 5e74b9554d3503d30b07786ee31c72341a1767f1..edad2200d2c9a0ccf1845098d23761a87a98640a 100644 (file)
--- a/snippets/Makefile.rules.sysless-keil16x
+++ b/snippets/Makefile.rules.sysless-keil16x
@@ -1,8 +1,8 @@
 OMK_RULES_TYPE=sysless-keil16x
-include base #omkbuild
-include keil16x #omkbuild
-include include #omkbuild
-include sysless #omkbuild
-include config_h #omkbuild
-include sources-list #omkbuild
-include localeval #omkbuild
+include base.omk #omkbuild
+include keil16x.omk #omkbuild
+include include.omk #omkbuild
+include sysless.omk #omkbuild
+include config_h.omk #omkbuild
+include sources-list.omk #omkbuild
+include localeval.omk #omkbuild

diff --git a/snippets/Makefile.rules.sysless-keil51 b/snippets/Makefile.rules.sysless-keil51
index fe26ca89dad251c0f58c9e4aa4438b5676bc17f3..2afaab20393f451685cb519b1eff8bf08ea72d7c 100644 (file)
--- a/snippets/Makefile.rules.sysless-keil51
+++ b/snippets/Makefile.rules.sysless-keil51
@@ -1,8 +1,8 @@
 OMK_RULES_TYPE=sysless-keil51
-include base #omkbuild
-include keil51 #omkbuild
-include include #omkbuild
-include sysless #omkbuild
-include config_h #omkbuild
-include sources-list #omkbuild
-include localeval #omkbuild
+include base.omk #omkbuild
+include keil51.omk #omkbuild
+include include.omk #omkbuild
+include sysless.omk #omkbuild
+include config_h.omk #omkbuild
+include sources-list.omk #omkbuild
+include localeval.omk #omkbuild

diff --git a/snippets/Makefile.rules.test b/snippets/Makefile.rules.test
index cfbe2b32d7f0034ebea9940fd7a771f0cf0154b9..c5b684ae07b5e848bad05c66dde539616982422b 100644 (file)
--- a/snippets/Makefile.rules.test
+++ b/snippets/Makefile.rules.test
@@ -1,6 +1,6 @@
 
 # -*- makefile-gmake -*-
-include base #omkbuild
+include base.omk #omkbuild
 
 USER_INCLUDE_DIR := $(OUTPUT_DIR)/$(COMPILED_DIR_NAME)/include
 USER_LIB_DIR     := $(OUTPUT_DIR)/$(COMPILED_DIR_NAME)/lib
@@ -98,4 +98,4 @@ solib_cmd = set -e; \
        echo >>$(_dep_file)
 
 
-include cprog #omkbuild
+include cprog.omk #omkbuild

diff --git a/snippets/Makefile.rules.vxworks b/snippets/Makefile.rules.vxworks
index 62c0039bad1a7f61039b3cb60ff866a7ed8f03d4..ed9eb646d7a3d2cedfbfa21431efb8322ec97105 100644 (file)
--- a/snippets/Makefile.rules.vxworks
+++ b/snippets/Makefile.rules.vxworks
@@ -1,6 +1,6 @@
 OMK_RULES_TYPE=vxworks
-include base #omkbuild
-include include #omkbuild
-include vxworks #omkbuild
-include config_h #omkbuild
-include sources-list #omkbuild
+include base.omk #omkbuild
+include include.omk #omkbuild
+include vxworks.omk #omkbuild
+include config_h.omk #omkbuild
+include sources-list.omk #omkbuild

diff --git a/snippets/base b/snippets/base.omk
similarity index 99%
rename from snippets/base
rename to snippets/base.omk
index 01d1e8a924875d648758ac05ef4d46d61c94c1aa..fb536b573a74badb9f0c4be7495d1991e96c6d65 100644 (file)
--- a/snippets/base
+++ b/snippets/base.omk
@@ -312,8 +312,8 @@ omkize:
           fi \
        done
 
-include prepare #omkbuild
-include build #omkbuild
+include prepare.omk #omkbuild
+include build.omk #omkbuild
 
 # Local Variables:
 # mode:makefile-gmake

diff --git a/snippets/build b/snippets/build.omk
similarity index 100%
rename from snippets/build
rename to snippets/build.omk

diff --git a/snippets/config_h b/snippets/config_h.omk
similarity index 100%
rename from snippets/config_h
rename to snippets/config_h.omk

diff --git a/snippets/cprog b/snippets/cprog.omk
similarity index 98%
rename from snippets/cprog
rename to snippets/cprog.omk
index ae834ee996e2b3d8712f5a538145d4d836a62827..523fb26dd57917b726c1c888ea4e4cf66abf19b0 100644 (file)
--- a/snippets/cprog
+++ b/snippets/cprog.omk
@@ -87,5 +87,5 @@ $(foreach src,$(filter %.c,$(USER_SOURCES)),\
                "CC      ",\
                $(c_o_cmd))))
 
-include include #omkbuild
+include include.omk #omkbuild
 $(eval $(call include-pass-template,$(USER_INCLUDE_DIR),include))

diff --git a/snippets/gcc b/snippets/gcc.omk
similarity index 100%
rename from snippets/gcc
rename to snippets/gcc.omk

diff --git a/snippets/include b/snippets/include.omk
similarity index 100%
rename from snippets/include
rename to snippets/include.omk

diff --git a/snippets/keil16x b/snippets/keil16x.omk
similarity index 100%
rename from snippets/keil16x
rename to snippets/keil16x.omk

diff --git a/snippets/keil51 b/snippets/keil51.omk
similarity index 100%
rename from snippets/keil51
rename to snippets/keil51.omk

diff --git a/snippets/linux b/snippets/linux.omk
similarity index 100%
rename from snippets/linux
rename to snippets/linux.omk

diff --git a/snippets/localeval b/snippets/localeval.omk
similarity index 100%
rename from snippets/localeval
rename to snippets/localeval.omk

diff --git a/snippets/prepare b/snippets/prepare.omk
similarity index 100%
rename from snippets/prepare
rename to snippets/prepare.omk

diff --git a/snippets/qt b/snippets/qt.omk
similarity index 100%
rename from snippets/qt
rename to snippets/qt.omk

diff --git a/snippets/rtems b/snippets/rtems.omk
similarity index 100%
rename from snippets/rtems
rename to snippets/rtems.omk

diff --git a/snippets/sdcc b/snippets/sdcc.omk
similarity index 100%
rename from snippets/sdcc
rename to snippets/sdcc.omk

diff --git a/snippets/sources-list b/snippets/sources-list.omk
similarity index 100%
rename from snippets/sources-list
rename to snippets/sources-list.omk

diff --git a/snippets/sysless b/snippets/sysless.omk
similarity index 100%
rename from snippets/sysless
rename to snippets/sysless.omk

diff --git a/snippets/vxworks b/snippets/vxworks.omk
similarity index 100%
rename from snippets/vxworks
rename to snippets/vxworks.omk