From fabfa6bb70902e77d81ac8275b070b7b57562820 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sat, 17 Jan 2009 23:57:48 +0100 Subject: [PATCH] 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. --- snippets/{Makefile => Makefile.omk} | 0 snippets/Makefile.rules.linux | 12 ++++++------ snippets/Makefile.rules.rtems | 10 +++++----- snippets/Makefile.rules.sdcc | 12 ++++++------ snippets/Makefile.rules.sysless | 14 +++++++------- snippets/Makefile.rules.sysless-keil16x | 14 +++++++------- snippets/Makefile.rules.sysless-keil51 | 14 +++++++------- snippets/Makefile.rules.test | 2 -- snippets/Makefile.rules.vxworks | 10 +++++----- snippets/{base => base.omk} | 2 +- snippets/{config_h => config_h.omk} | 0 snippets/{gcc => gcc.omk} | 0 snippets/{include => include.omk} | 0 snippets/{keil16x => keil16x.omk} | 0 snippets/{keil51 => keil51.omk} | 0 snippets/{linux => linux.omk} | 0 snippets/{localeval => localeval.omk} | 0 snippets/{qt => qt.omk} | 0 snippets/{rtems => rtems.omk} | 0 snippets/{sdcc => sdcc.omk} | 0 snippets/{sources-list => sources-list.omk} | 0 snippets/{sysless => sysless.omk} | 0 snippets/{vxworks => vxworks.omk} | 0 23 files changed, 44 insertions(+), 46 deletions(-) rename snippets/{Makefile => Makefile.omk} (100%) delete mode 100644 snippets/Makefile.rules.test rename snippets/{base => base.omk} (99%) rename snippets/{config_h => config_h.omk} (100%) rename snippets/{gcc => gcc.omk} (100%) rename snippets/{include => include.omk} (100%) rename snippets/{keil16x => keil16x.omk} (100%) rename snippets/{keil51 => keil51.omk} (100%) rename snippets/{linux => linux.omk} (100%) rename snippets/{localeval => localeval.omk} (100%) rename snippets/{qt => qt.omk} (100%) rename snippets/{rtems => rtems.omk} (100%) rename snippets/{sdcc => sdcc.omk} (100%) rename snippets/{sources-list => sources-list.omk} (100%) rename snippets/{sysless => sysless.omk} (100%) rename snippets/{vxworks => vxworks.omk} (100%) 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 deleted file mode 100644 index 44304da..0000000 --- a/snippets/Makefile.rules.test +++ /dev/null @@ -1,2 +0,0 @@ -include base #omkbuild -include build #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 e7fb2e5..c62d8ee 100644 --- a/snippets/base +++ b/snippets/base.omk @@ -1,4 +1,4 @@ -# Makefile.rules - OCERA make framework common project rules -*- makefile -*- +# Makefile.rules - OCERA make framework common project rules -*- makefile-gmake -*- # # (C) Copyright 2003 by Pavel Pisa - OCERA team member # (C) Copyright 2006 by Michal Sojka - Czech Technical University, FEE, DCE 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/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/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 -- 2.39.2