Apply allow sources in subdirectories to rtems and sdcc rules.

[omk.git] / snippets / vxworks.omk

diff --git a/snippets/vxworks.omk b/snippets/vxworks.omk
index 6b4bbbfb24cb3e41555d906527c592198f5c0a2b..69feaec61daa1fb40c6585ca69f659ad50f2602a 100644 (file)
--- a/snippets/vxworks.omk
+++ b/snippets/vxworks.omk
@@ -14,16 +14,16 @@
 # INCLUDES         .. additional include directories and defines for user-space
 
 ifndef WRENV
-$(error $(shell $(call canttest,WRENV is not defined in config.target)))
+$(error WRENV is not defined in config.target)
 endif
 ifndef WRPACKAGE
-$(error $(shell $(call canttest,WRPACKAGE is not defined in config.target)))
+$(error WRPACKAGE is not defined in config.target)
 endif
 ifndef CPU
-$(error $(shell $(call canttest,CPU is not defined in config.target)))
+$(error CPU is not defined in config.target)
 endif
 ifndef TOOL
-$(error $(shell $(call canttest,TOOL is not defined in config.target)))
+$(error TOOL is not defined in config.target)
 endif
 
 BUILD_DIR_NAME = _build/$(CPU)$(TOOL)
@@ -59,23 +59,14 @@ override OMK_SERIALIZE_INCLUDED = y
 MAKEOVERRIDES := $(filter-out OMK_SERIALIZE_INCLUDED=n,$(MAKEOVERRIDES))
 endif
 
-# Checks for OMK tester
-ifdef OMK_TESTSROOT
-default-config-pass-check include-pass-check:
-library-pass-check binary-pass-check:
-       @[ -x "$(shell which $(CC))" ] || $(call canttest,Cannot find compiler: $(CC))
-       @[ -x "$(WRENV)" ] || $(call canttest,Cannot execute wrenv script)
-endif
-
-
 # Export some variables to VxWorks makefiles
 CPPFLAGS  += -I $(USER_INCLUDE_DIR)
 
-ADDED_CFLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -DOMK_FOR_VXWORKS -DOMK_FOR_USER
+ADDED_CFLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(OMK_CPPFLAGS) \
+       $(CPPFLAGS) $(OMK_CFLAGS) $(CFLAGS) -DOMK_FOR_VXWORKS -DOMK_FOR_USER
 
-ADDED_C++FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -DOMK_FOR_VXWORKS -DOMK_FOR_USER
+ADDED_C++FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(OMK_CPPFLAGS) \
+       $(CPPFLAGS) $(OMK_CFLAGS) $(CFLAGS) -DOMK_FOR_VXWORKS -DOMK_FOR_USER
 
 export ADDED_CFLAGS ADDED_C++FLAGS
 
@@ -124,7 +115,7 @@ $(2)/$(1).vxe:
 #      $(Q) $$(shell if [ -z "$$(filter %.cc,$$($(1)_SOURCES:%.cxx=%.cc))" ] ; then echo $$(CC) ; else echo $$(CXX) ; fi) \
 #        $$($(1)_OBJS) $$($(1)_LIBS:%=-l%) $$(LOADLIBES) $$(LDFLAGS) -Wl,-Map,$(USER_OBJS_DIR)/$(1).exe.map -o $(2)/$(1)
 #      @echo "$(2)/$(1): \\" >$(USER_OBJS_DIR)/$(1).exe.d
-#      @sed -n -e 's/^LOAD \(.*\)$$$$/  \1  \\/p' $(USER_OBJS_DIR)/$(1).exe.map  >>$(USER_OBJS_DIR)/$(1).exe.d
+#      @$(SED4OMK) -n -e 's/^LOAD \(.*\)$$$$/  \1  \\/p' $(USER_OBJS_DIR)/$(1).exe.map  >>$(USER_OBJS_DIR)/$(1).exe.d
 #      @echo >>$(USER_OBJS_DIR)/$(1).exe.d
 endef
 
@@ -183,12 +174,11 @@ $(eval $(call omk_pass_template,include-pass,$(USER_OBJS_DIR),,always))
 
 $(eval $(call include-pass-template,$(USER_INCLUDE_DIR),include))
 
-library-pass-local: $(addprefix $(USER_INCLUDE_DIR)/,$(cmetric_include_HEADERS)) \
-                   $(lib_LIBRARIES:%=$(USER_LIB_DIR)/lib%.a) $(shared_LIBRARIES:%=$(USER_LIB_DIR)/lib%.$(SOLIB_EXT))
+library-pass-local: $(lib_LIBRARIES:%=$(USER_LIB_DIR)/lib%.a) $(shared_LIBRARIES:%=$(USER_LIB_DIR)/lib%.$(SOLIB_EXT))
 
 binary-pass-local: $(bin_PROGRAMS:%=$(USER_BIN_DIR)/%.vxe) $(test_PROGRAMS:%=$(USER_TESTS_DIR)/%.vxe) $(utils_PROGRAMS:%=$(USER_UTILS_DIR)/%.vxe)
 
-clean-local:
+clean-local::
        @echo Cleaning in $(USER_OBJS_DIR)
        @rm -f $(USER_OBJS_DIR)/*.o $(USER_OBJS_DIR)/*.lo \
               $(USER_OBJS_DIR)/*.d \