X-Git-Url: http://rtime.felk.cvut.cz/gitweb/omk.git/blobdiff_plain/b78484206372f7ab6e6da763f7b4ea07ad84b048..7b398af59d53a891b64621027ae0e820e3e7321c:/snippets/rtems

diff --git a/snippets/rtems b/snippets/rtems
index 555edf2..2ab968b 100644
--- a/snippets/rtems
+++ b/snippets/rtems
@@ -10,11 +10,15 @@
 # utils_PROGRAMS   .. list of the development utility programs
 # test_PROGRAMS    .. list of the test programs
 # xxx_SOURCES      .. list of specific target sources
+# xxx_LIBS         .. list of specific target libraries
 # INCLUDES         .. additional include directories and defines for user-space
 # tar_EMBEDFILES   .. list of tars with embedded files
 
-# Include RTEMS target configuration defining RTEMS_MAKEFILE_PATH
-include $(MAKERULES_DIR)/config.target
+ifdef OMK_TESTSROOT
+ifeq ($(RTEMS_MAKEFILE_PATH),)
+$(error $(shell $(call canttest,RTEMS_MAKEFILE_PATH not defined)))
+endif
+endif
 
 include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
 include $(RTEMS_CUSTOM)
@@ -78,6 +82,7 @@ library-pass: include-pass
 binary-pass: library-pass
 
 override OMK_SERIALIZE_INCLUDED = y
+MAKEOVERRIDES := $(filter-out OMK_SERIALIZE_INCLUDED=n,$(MAKEOVERRIDES))
 endif
 
 #=====================================================================
@@ -90,8 +95,8 @@ define TARFILE_template
 
 $(2):
 	$(Q) ABSOLUTETARFILE=`cd $$(dir $$@) ; pwd`/$$@ ; \
-	     ( test -e $$$$ABSOLUTETARFILE && ( cd  $(3) && tar -df $$$$ABSOLUTETARFILE ) ) || \
-	     ( cd  $(3) && tar -cf $$$$ABSOLUTETARFILE . )
+	     ( test -e $$$$ABSOLUTETARFILE && ( cd  $(3) && tar $$(TARFLAGS) -df $$$$ABSOLUTETARFILE ) ) || \
+	     ( cd  $(3) && tar $$(TARFLAGS) -cf $$$$ABSOLUTETARFILE . )
 
 $(2).o: $(2)
 	@$(QUIET_CMD_ECHO) "  TARFILE $$@"
@@ -292,15 +297,14 @@ $(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLAT
 
 $(eval $(call omk_pass_template,clean,$(USER_OBJS_DIR),,always))
 
-check-dir:
+check-dir::
 	@$(call mkdir_def,$(USER_INCLUDE_DIR))
 	@$(call mkdir_def,$(USER_LIB_DIR))
 	@$(call mkdir_def,$(USER_BIN_DIR))
 	@$(call mkdir_def,$(USER_UTILS_DIR))
 	@$(call mkdir_def,$(USER_TESTS_DIR))
 
-include-pass-local:
-	$(call include-pass-template,$(USER_INCLUDE_DIR),include)
+$(eval $(call include-pass-template,$(USER_INCLUDE_DIR),include))
 
 ifdef USER_RULE_TEMPLATES