NuttX: the adapt to new implementation of ROMFS mounting at /etc

[omk.git] / snippets / keil16x.omk

diff --git a/snippets/keil16x.omk b/snippets/keil16x.omk
index fd6a6e738a8ec88ed9454919832958528bfe9347..9c224f1f3d01ce17b6e63038901bbaef03978137 100644 (file)
--- a/snippets/keil16x.omk
+++ b/snippets/keil16x.omk
@@ -10,13 +10,11 @@
 # Rules for compilation of C, C++ and assembler sources using Keil's
 # (X)C16x tools. For documentation see gcc snippet.
 
-clean-local: clean-keil
-
-clean-keil:
+clean-local::
        $(Q)rm -f $(USER_OBJS_DIR)/*.obj $(USER_OBJS_DIR)/*.lst
 
 
-FILTER_KEIL_OUTPUT = | sed -e '/COPYRIGHT KEIL/d' -e '/^[ \r\t]*$$$$/d'
+FILTER_KEIL_OUTPUT = | $(SED4OMK) -e '/COPYRIGHT KEIL/d' -e '/^[ \r\t]*$$$$/d'
 FILTER_KEIL_CC_OUTPUT = $(FILTER_KEIL_OUTPUT) -e '/C166 COMPIL/d'
 FILTER_KEIL_LINKER_OUTPUT = $(FILTER_KEIL_OUTPUT) -e '/L166 LINKER/d' -e '/^".*",\?\r$$$$/,/\(L166 RUN COMPLETE\|ERROR\)/d'
 FILTER_KEIL_LIB_OUTPUT = $(FILTER_KEIL_OUTPUT) -e '/LIB166 LIBRARY/d'
@@ -36,14 +34,14 @@ LI = l166
 
 ifndef DEFAULT_INCLUDES
 override DEFAULT_INCLUDES = $$(INCLUDES) -I $$(INCLUDE_DIR) -I $$(SOURCES_DIR) \
-  $$(shell echo $$$${C166INC} | sed -e 's/;/ -I /g' -e 's/^\(.\)/-I \1/')
+  $$(shell echo $$$${C166INC} | $(SED4OMK) -e 's/;/ -I /g' -e 's/^\(.\)/-I \1/')
 endif
 #$$(warning DEFAULT_INCLUDES = $$(DEFAULT_INCLUDES))
 
 
-c_o_COMPILE = $$(CC) #$$(DEFS) $$(AM_CPPFLAGS)
+c_o_COMPILE = $$(CC) #$$(DEFS) $$(OMK_CPPFLAGS)
 
-cc_o_COMPILE = $$(CXX) #$$(DEFS) $$(AM_CPPFLAGS) 
+cc_o_COMPILE = $$(CXX) #$$(DEFS) $$(OMK_CPPFLAGS) 
 
 endef # COMPILER_DEFS_template
 
@@ -52,7 +50,7 @@ define COMPILE_c_o_template
 $(2): $(1) $$(GEN_HEADERS)
        @$(QUIET_CMD_ECHO) "  CC      $$@"
 # Export include paths in an environment variable
-       $(Q)export C166INC=`echo '$$(shell cygpath -w $$(subst -I,,$$(DEFAULT_INCLUDES)))'|sed -e "s/ \+/;/g"`; \
+       $(Q)export C166INC=`echo '$$(shell cygpath -w $$(subst -I,,$$(DEFAULT_INCLUDES)))'|$(SED4OMK) -e "s/ \+/;/g"`; \
        $$(c_o_COMPILE) $(3) '$$(shell cygpath -w $$<)' 'OBJECT($$@)' 'PRINT($$(@:%$$(OBJ_EXT)=%.lst))' '$$(CCDIRECTIVES)' $(FILTER_KEIL_CC_OUTPUT); \
        EL=$$$$?; if [ $$$$EL -le 1 ] ; then touch "$$@.d" ; \
        else echo ERRORLEVEL $$$$EL ; exit 1; \
@@ -95,9 +93,9 @@ $(2)/$(1): $(USER_LIB_DIR)/timestamp
 
 
 #      $(Q) $$(shell if [ -z "$$(filter %.cc,$$($(1)_SOURCES))" ] ; \
-#        then echo $$(CC)  $$(CPPFLAGS) $$(AM_CPPFLAGS) $$(AM_CFLAGS) $$(CFLAGS) ; \
-#        else echo $$(CXX) $$(CPPFLAGS) $$(AM_CPPFLAGS) $$(AM_CXXFLAGS) $$(CXXFLAGS) ; fi) \
-#        $$(AM_LDFLAGS) $$(LDFLAGS) $$($(1)_OBJS) $$(LOADLIBES) $$($(1)_LIBS:%=-l%) \
+#        then echo $$(CC)  $$(CPPFLAGS) $$(OMK_CPPFLAGS) $$(OMK_CFLAGS) $$(CFLAGS) ; \
+#        else echo $$(CXX) $$(CPPFLAGS) $$(OMK_CPPFLAGS) $$(OMK_CXXFLAGS) $$(CXXFLAGS) ; fi) \
+#        $$(OMK_LDFLAGS) $$(LDFLAGS) $$($(1)_OBJS) $$(LOADLIBES) $$($(1)_LIBS:%=-l%) \
 #        -o $(2)/$(1)
 #      $(HC) $(2)/$(1) >$(2)/$(1).hex
 
@@ -110,7 +108,7 @@ $(2)/$(1): $$($(1)_OBJS) $$(LIN_FILE:%=$$(USER_LIB_DIR)/%)
                     $$(lib_LOADLIBES:%=$$(USER_LIB_DIR)/%$$(LIB_EXT)) \
                     $$($(1)_LIBS:%=$$(USER_LIB_DIR)/%$$(LIB_EXT)) \
                     $$(STARTUP_CODE:%=$$(USER_LIB_DIR)/%)\
-           | sed -e 's/\(.*\)/"\1"/' -e '$$$$! s/$$$$/,/' > $(1).lnp; \
+           | $(SED4OMK) -e 's/\(.*\)/"\1"/' -e '$$$$! s/$$$$/,/' > $(1).lnp; \
          echo TO '$$(shell cygpath -w $$@)' >> $(1).lnp; \
          echo '$$(LIDIRECTIVES)' >> $(1).lnp; \
          if [[ "$$(LIN_FILE)" ]]; then cat $$(USER_LIB_DIR)/$$(LIN_FILE) >> $(1).lnp; fi; \