From: Michal Sojka Date: Sat, 17 Jan 2009 22:57:48 +0000 (+0100) Subject: Snippets renamed to *.omk X-Git-Url: http://rtime.felk.cvut.cz/gitweb/omk.git/commitdiff_plain/f57335a827451ac7878ccc4b0d7a3862636ef099 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 d90c5ee..761b1e8 100644 --- 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 e9aa57f..231865f 100644 --- 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 3bef394..231c9aa 100644 --- 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 3134e76..3b6162d 100644 --- 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 5e74b95..edad220 100644 --- 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 fe26ca8..2afaab2 100644 --- 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 cfbe2b3..c5b684a 100644 --- 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 62c0039..ed9eb64 100644 --- 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 01d1e8a..fb536b5 100644 --- 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 ae834ee..523fb26 100644 --- 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