Merge branch 'master' of sojka@rtime.felk.cvut.cz:/var/git/omk into sssa

Conflicts:
	snippets/linux.omk

diff --combined snippets/linux.omk
index 8be7045411f43cba43e94eddf8a1093e3fc4467b,7d85b38354db74ac4389c365d9e4c772010316ad..29bba979dfccd9efee947140e433281dcf63439c
--- 1/snippets/linux.omk
--- 2/snippets/linux.omk
+++ b/snippets/linux.omk
@@@ -7,11 -7,9 +7,11 @@@
  # kernel_LIBRARIES .. list of the kernel-space libraries
  # rtlinux_LIBRARIES.. list of the RT-Linux kernel-space libraries
  # include_HEADERS  .. list of the user-space public header files
 +# include_DEST     .. root path of user-space includes
  # nobase_include_HEADERS .. public headers copied even with directory part
  # renamed_include_HEADERS .. public headers copied to the different target name
  # kernel_HEADERS   .. list of the kernel-space public header files
 +# kernel_DEST      .. root path of kernel-space includes
  # rtlinux_HEADERS  .. list of the RT-Linux kernel-space public header files
  # bin_PROGRAMS     .. list of the require binary programs
  # utils_PROGRAMS   .. list of the development utility programs
@@@ -19,11 -17,8 +19,11 @@@
  # kernel_MODULES   .. list of the kernel side modules/applications
  # rtlinux_MODULES  .. list of RT-Linux the kernel side modules/applications
  # xxx_SOURCES      .. list of specific target sources
 -# xxx_LIBS         .. list of specific target libraries (-l prefix is automatically added)
 -# xxx_LDFLAGS      .. list of specific target LDFLAGS
 +# xxx_CFLAGS       .. custom CFLAGS for .c modules of target xxx (in addition to CFLAGS)
 +# xxx_CXXFLAGS     .. custom CXXFLAGS for .cpp/.cxx modules of target xxx (in addition to CXXFLAGS)
 +# xxx_ASFLAGS      .. custom ASFLAGS for .S modules of target xxx (in addition to ASFLAGS)
 +# xxx_LIBS         .. custom libraries for target xxx (in addition to LIBS)
- # xxx_DLFLAGS      .. custom LDFLAGS for target xxx (in addition to LDFLAGS)
++# xxx_LDFLAGS      .. custom LDFLAGS for target xxx (in addition to LDFLAGS)
  # lib_LOADLIBES    .. list of libraries linked to each executable
  # INCLUDES         .. additional include directories and defines for user-space
  # kernel_INCLUDES  .. additional include directories and defines for kernel-space
@@@ -87,20 -82,13 +87,20 @@@ USER_UTILS_DIR   := $(OUTPUT_DIR)/$(COM
  USER_TESTS_DIR   := $(OUTPUT_DIR)/$(COMPILED_DIR_NAME)/bin-tests
  USER_BIN_DIR     := $(OUTPUT_DIR)/$(COMPILED_DIR_NAME)/bin
  USER_BUILD_DIR   := $(OUTPUT_DIR)/$(BUILD_DIR_NAME)/user
 +# SSSA: Support for documentation build
 +USER_DOC_DIR     := $(MAKERULES_DIR)/$(COMPILED_DIR_NAME)/documentation
  
  ifndef LINUX_VERSION
  LINUX_VERSION=$(shell uname -r)
  endif
  ifndef LINUX_DIR
 +# Support for autoconf-provided kernel sources directory
 +ifneq ($(kernel_sources),)
 +LINUX_DIR=$(kernel_sources)
 +else
  LINUX_DIR=/lib/modules/$(LINUX_VERSION)/build
  endif
 +endif
  endif # OCERA_DIR
  
  ifeq ($(BUILD_OS),)
@@@ -151,12 -139,8 +151,12 @@@ endi
  USER_OBJS_DIR = $(USER_BUILD_DIR)/$(RELATIVE_DIR)
  KERN_OBJS_DIR = $(KERN_BUILD_DIR)/$(RELATIVE_DIR)
  OMK_WORK_DIR  = $(USER_OBJS_DIR)
 +# SSSA: Support for documentation build
 +USER_DOCS_DIR = $(USER_DOC_DIR)/$(RELATIVE_DIR)
 +
  
  .PHONY: dep subdirs clean clean-custom cleandepend check-dir
 +.PHONY: sourceclean docs-pass
  
  # Some support to serialize some targets for parallel make
  ifneq ($(OMK_SERIALIZE_INCLUDED),y)
@@@ -167,7 -151,6 +167,7 @@@ kernel-lib-pass: include-pas
  kernel-mod-pass: kernel-lib-pass
  kernel-modpost-pass: kernel-mod-pass
  kernel-pass: kernel-mod-pass kernel-modpost-pass
 +docs-pass: check-dir
  
  override OMK_SERIALIZE_INCLUDED = y
  MAKEOVERRIDES := $(filter-out OMK_SERIALIZE_INCLUDED=n,$(MAKEOVERRIDES))
@@@ -192,16 -175,11 +192,16 @@@ USER_SOURCES2OBJSLO = .lo/.c .lo/.cc .l
  #%.lo: %.c
  #     $(CC) -o $@ $(LCFLAGS) -c $<
  
 +# Workaround for gcc 4.1.x with -fstack-protector enabled by default, that causes the linker to fail
 +# This is not needed for c_o_kern_COMPILE: kernelcfg2mk already grabs this in LINUX_CFLAGS from the kernel Makefile
 +CFLAGS += $(shell if ($(CC) -dumpspecs | grep -e fno-stack-protector > /dev/null); then echo "-fno-stack-protector"; fi)
 +CXXFLAGS += $(shell if ($(CC) -dumpspecs | grep -e fno-stack-protector > /dev/null); then echo "-fno-stack-protector"; fi)
 +
  c_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -DOMK_FOR_USER
  
  cc_o_COMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 -      $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -DOMK_FOR_USER
 +      $(CPPFLAGS) $(AM_CFLAGS) $(CXXFLAGS) -DOMK_FOR_USER
  
  S_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASFLAGS) -DOMK_FOR_USER
@@@ -212,7 -190,6 +212,7 @@@ idl_COMPILE = $(IDL_COMPILER
  ifndef CC_MAJOR_VERSION
  CC_MAJOR_VERSION := $(shell $(CC) -dumpversion | sed -e 's/\([^.]\)\..*/\1/')
  endif
 +
  # Prepare suitable define for dependency building
  ifeq ($(CC_MAJOR_VERSION),2)
  CC_DEPFLAGS = -Wp,-MD,"$@.d.tmp"
@@@ -225,7 -202,7 +225,7 @@@ endi
  define COMPILE_c_o_template
  $(2): $(1) $$(GEN_HEADERS)
        @$(QUIET_CMD_ECHO) "  CC      $$@"
 -      $(Q) if $$(c_o_COMPILE) $$(CC_DEPFLAGS) $(3) -o $$@ -c $$< ; \
 +      $(Q) if $$(c_o_COMPILE) $$(CC_DEPFLAGS) $$($(basename $(1))_CFLAGS) $(3) -o $$@ -c $$< ; \
        then mv -f "$$@.d.tmp" "$$@.d" ; \
        else rm -f "$$@.d.tmp" ; exit 1; \
        fi
@@@ -236,7 -213,7 +236,7 @@@ ende
  define COMPILE_cc_o_template
  $(2): $(1) $$(GEN_HEADERS)
        @$(QUIET_CMD_ECHO) "  CXX     $$@"
 -      $(Q) if $$(cc_o_COMPILE) $$(CC_DEPFLAGS) $(3) -o $$@ -c $$< ; \
 +      $(Q) if $$(cc_o_COMPILE) $$(CC_DEPFLAGS) $$($(basename $(1))_CXXFLAGS) $(3) -o $$@ -c $$< ; \
        then mv -f "$$@.d.tmp" "$$@.d" ; \
        else rm -f "$$@.d.tmp" ; exit 1; \
        fi
@@@ -246,11 -223,11 +246,11 @@@ ende
  # Syntax: $(call COMPILE_S_o_template,<source>,<target>,<additional c-flags>)
  define COMPILE_S_o_template
  $(2): $(1) $$(GEN_HEADERS)
 -      @$(QUIET_CMD_ECHO) "  AS      $$@"
 -      $(Q) if $$(S_o_COMPILE) -D__ASSEMBLY__ $$(CC_DEPFLAGS) $(3) -o $$@ -c $$< ; \
 +        @$(QUIET_CMD_ECHO) "  AS      $$@"
 +        $(Q) if $$(S_o_COMPILE) -D__ASSEMBLY__ $$(CC_DEPFLAGS) $(3) -o $$@ -c $$< ; \
        then mv -f "$$@.d.tmp" "$$@.d" ; \
 -      else rm -f "$$@.d.tmp" ; exit 1; \
 -      fi
 +        else rm -f "$$@.d.tmp" ; exit 1; \
 +        fi
  endef
  
  
@@@ -275,7 -252,7 +275,7 @@@ ende
  
  
  define COMPILE_idl_template
- $(2).c $(2)-stubs.c $(2)-skels.c $(2)-common.c $(2).h: $(1)
+ $(2).c $(2)-stubs.c $(2)-skels.c $(2)-common.c $(2).h: $(1) $$(wildcard $$(firstword $$(idl_COMPILE)))
        @$(QUIET_CMD_ECHO) "  IDL     $$@"
        $(Q) $$(idl_COMPILE) $$($(2)_IDLFLAGS) $(1)
  endef
@@@ -294,7 -271,7 +294,7 @@@ $(1)_GEN_SOURCES += $$(filter %.c,$$($(
  USER_GEN_SOURCES += $$($(1)_GEN_SOURCES)
  
  $(foreach x, $(USER_SOURCES2OBJS),
 -$(1)_OBJS += $$(patsubst %$(notdir $(x)),%$(dir $(x)),$$(filter %$(notdir $(x)),\
 +$(1)_OBJS += $$(patsubst %$(notdir $(x)),%-$(1)$(dir $(x)),$$(filter %$(notdir $(x)),\
                $$($(1)_SOURCES) $$($(1)_GEN_SOURCES)))
  )
  $(1)_OBJS := $$(sort $$($(1)_OBJS:%/=%))
@@@ -302,16 -279,10 +302,16 @@@
  USER_OBJS  += $$($(1)_OBJS)
  USER_SOURCES += $$($(1)_SOURCES)
  
 +$(foreach src,$(filter %.c,$($(1)_SOURCES) $($(1)_GEN_SOURCES)),$(eval $(call COMPILE_c_o_template,$(SOURCES_DIR)/$(src),$(src:%.c=%-$(1).o),$($(1)_CPPFLAGS) $($(1)_CFLAGS))))
 +$(foreach src,$(filter %.cc,$($(1)_SOURCES) $($(1)_GEN_SOURCES)),$(eval $(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cc=%-$(1).o),$($(1)_CPPFLAGS) $($(1)_CXXFLAGS))))
 +$(foreach src,$(filter %.cxx,$($(1)_SOURCES) $($(1)_GEN_SOURCES)),$(eval $(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cxx=%-$(1).o),$($(1)_CPPFLAGS) $($(1)_CXXFLAGS))))
 +$(foreach src,$(filter %.S,$($(1)_SOURCES) $($(1)_GEN_SOURCES)),$(eval $(call COMPILE_S_o_template,$(SOURCES_DIR)/$(src),$(src:%.S=%-$(1).o),$($(1)_ASFLAGS))))
 +
  $(2)/$(1)$(3): $$($(1)_OBJS)
        @$(QUIET_CMD_ECHO) "  LINK    $$@"
        $(Q) $$(if $$(filter %.cc,$$($(1)_SOURCES:%.cxx=%.cc)),$$(CXX),$$(CC)) \
 -        $$($(1)_OBJS) $$($(1)_LIBS:%=-l%) $$(LOADLIBES) $$(LDFLAGS) $$($(1)_LDFLAGS) -Wl,-rpath-link,$(USER_LIB_DIR) -Wl,-Map,$(USER_OBJS_DIR)/$(1).exe.map -o $$@
 +        $$($(1)_OBJS) $$($(1)_LIBS:%=-l%) $$(LOADLIBES) $$(CFLAGS) $$($(1)_CFLAGS) $$(LDFLAGS) $$($(1)_LDFLAGS) \
 +        -Wl,-rpath-link,$(USER_LIB_DIR) -Wl,-Map,$(USER_OBJS_DIR)/$(1).exe.map -o $$@
        @echo "$(2)/$(1)$(3): \\" >$(USER_OBJS_DIR)/$(1).exe.d
        @sed -n -e 's|^LOAD \(.*\)$$$$|  \1  \&|p' $(USER_OBJS_DIR)/$(1).exe.map|tr '&' '\134'  >>$(USER_OBJS_DIR)/$(1).exe.d
        @echo >>$(USER_OBJS_DIR)/$(1).exe.d
@@@ -330,7 -301,7 +330,7 @@@ $(1)_GEN_SOURCES += $$(filter %.c,$$($(
  USER_GEN_SOURCES += $$($(1)_GEN_SOURCES)
  
  $(foreach x, $(USER_SOURCES2OBJS),
 -$(1)_OBJS += $$(patsubst %$(notdir $(x)),%$(dir $(x)),$$(filter %$(notdir $(x)),\
 +$(1)_OBJS += $$(patsubst %$(notdir $(x)),%-$(1)$(dir $(x)),$$(filter %$(notdir $(x)),\
                $$($(1)_SOURCES) $$($(1)_GEN_SOURCES)))
  )
  $(1)_OBJS := $$(sort $$($(1)_OBJS:%/=%))
@@@ -338,11 -309,6 +338,11 @@@
  USER_OBJS  += $$($(1)_OBJS)
  USER_SOURCES += $$($(1)_SOURCES)
  
 +$(foreach src,$(filter %.c,$($(1)_SOURCES) $($(1)_GEN_SOURCES)),$(eval $(call COMPILE_c_o_template,$(SOURCES_DIR)/$(src),$(src:%.c=%-$(1).o),$($(1)_CPPFLAGS) $($(1)_CFLAGS))))
 +$(foreach src,$(filter %.cc,$($(1)_SOURCES) $($(1)_GEN_SOURCES)),$(eval $(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cc=%-$(1).o),$($(1)_CPPFLAGS) $($(1)_CXXFLAGS))))
 +$(foreach src,$(filter %.cxx,$($(1)_SOURCES) $($(1)_GEN_SOURCES)),$(eval $(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cxx=%-$(1).o),$($(1)_CPPFLAGS) $($(1)_CXXFLAGS))))
 +$(foreach src,$(filter %.S,$($(1)_SOURCES) $($(1)_GEN_SOURCES)),$(eval $(call COMPILE_S_o_template,$(SOURCES_DIR)/$(src),$(src:%.S=%-$(1).o),$($(1)_ASFLAGS))))
 +
  $(USER_LIB_DIR)/lib$(1).a: $$($(1)_OBJS)
        @$(QUIET_CMD_ECHO) "  AR      $$@"
        $(Q) $(AR) rcs $$@ $$^
@@@ -362,7 -328,7 +362,7 @@@ $(1)_GEN_SOURCES += $$(filter %.c,$$($(
  SOLIB_GEN_SOURCES += $$($(1)_GEN_SOURCES)
  
  $(foreach x, $(USER_SOURCES2OBJSLO),
 -$(1)_OBJSLO += $$(patsubst %$(notdir $(x)),%$(dir $(x)),$$(filter %$(notdir $(x)),\
 +$(1)_OBJSLO += $$(patsubst %$(notdir $(x)),%-$(1)$(dir $(x)),$$(filter %$(notdir $(x)),\
                $$($(1)_SOURCES) $$($(1)_GEN_SOURCES)))
  )
  $(1)_OBJSLO := $$(sort $$($(1)_OBJSLO:%/=%))
@@@ -370,17 -336,10 +370,18 @@@
  SOLIB_OBJS  += $$($(1)_OBJSLO)
  SOLIB_SOURCES += $$($(1)_SOURCES)
  
 +$(foreach src,$(filter %.c,$($(1)_SOURCES)$($(1)_GEN_SOURCES)),$(eval $(call COMPILE_c_o_template,$(SOURCES_DIR)/$(src),$(src:%.c=%-$(1).lo),$(SOLIB_PICFLAGS) $($(1)_CPPFLAGS) $($(1)_CFLAGS))))
 +
 +$(foreach src,$(filter %.cc,$($(1)_SOURCES)$($(1)_GEN_SOURCES)),$(eval $(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cc=%-$(1).lo),$(SOLIB_PICFLAGS) $($(1)_CPPFLAGS) $($(1)_CXXFLAGS))))
 +
 +$(foreach src,$(filter %.cxx,$($(1)_SOURCES)$($(1)_GEN_SOURCES)),$(eval $(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cxx=%-$(1).lo),$(SOLIB_PICFLAGS) $($(1)_CPPFLAGS) $($(1)_CXXFLAGS))))
 +
 +$(foreach src,$(filter %.S,$($(1)_SOURCES)$($(1)_GEN_SOURCES)),$(eval $(call COMPILE_S_o_template,$(SOURCES_DIR)/$(src),$(src:%.S=%-$(1).lo),$(SOLIB_PICFLAGS) $($(1)_ASFLAGS))))
 +
  $(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar: $$($(1)_OBJSLO) FORCE
 -      $(Q)echo '$(1)_objslo += $$$$(addprefix $(USER_OBJS_DIR)/,$$($(1)_OBJSLO))' > $$@.tmp; \
 +      $(Q)echo '$(1)_OBJSLO += $$$$(addprefix $(USER_OBJS_DIR)/,$$($(1)_OBJSLO))' > $$@.tmp; \
            echo '$(1)_libs += $$($(1)_LIBS) $$(lib_LOADLIBES)' >> $$@.tmp; \
+           echo '$(1)_ldflags += $$($(1)_LDFLAGS) $$(lib_LDFLAGS)' >> $$@.tmp; \
            echo 'shared_libs := $$$$(sort $(1) $$$$(shared_libs))' >> $$@.tmp; \
            if cmp -s $$@.tmp $$@; then rm $$@.tmp; else mv $$@.tmp $$@; fi
  endef
@@@ -429,9 -388,9 +430,9 @@@ ifeq ($(MAKECMDGOALS),link-shared-libs
  define solib_link_template
  $(1)_shared_libs = $$(patsubst %,$(USER_LIB_DIR)/lib%.$(SOLIB_EXT),$$(filter $$(shared_libs),$$($(1)_libs)))
  #$$(warning $(1)_shared_libs = $$($(1)_shared_libs))
- $(USER_LIB_DIR)/lib$(1).$(SOLIB_EXT): $$($(1)_shared_libs) $$($(1)_OBJSLO)
+ $(USER_LIB_DIR)/lib$(1).$(SOLIB_EXT): $$($(1)_shared_libs) $$($(1)_objslo)
        @$(QUIET_CMD_ECHO) "  LINK    $$@"
-       $(Q)$(CC) --shared -Xlinker -soname=lib$(1).$(SOLIB_EXT) -o $$@ $$($(1)_OBJSLO) $$(LOADLIBES) $$($(1)_libs:%=-l%)
+       $(Q)$(CC) --shared -Xlinker -soname=lib$(1).$(SOLIB_EXT) -Wl,-Map,$(USER_OBJS_DIR)/lib$(1).$(SOLIB_EXT).map -o $$@ $$($(1)_objslo) $$(LOADLIBES) $$($(1)_libs:%=-l%) $$(lib_ldflags) $$($(1)_ldflags)
  endef
  
  -include $(shell true; find $(USER_BUILD_DIR) -name 'lib*.omkvar') # `true' is a hack for MinGW
@@@ -472,7 -431,7 +473,7 @@@ include $(KERN_LIB_DIR)/kernel.m
  ifeq ($(LINUX_SRC),)
  LINUX_SRC = $(LINUX_DIR)
  endif
 -kernel_INCLUDES += -I $(KERN_INCLUDE_DIR) -I $(LINUX_DIR) -idirafter $(LINUX_SRC)/include/linux
 +kernel_INCLUDES += -I $(KERN_INCLUDE_DIR) -I $(LINUX_DIR)/include  -I $(LINUX_DIR) -idirafter $(LINUX_SRC)/include
  
  ifdef LINUX_CC
  KERN_CC = $(LINUX_CC)
@@@ -482,7 -441,7 +483,7 @@@ KERN_CC = echo KERN_CC not defined - co
  endif
  c_o_kern_COMPILE = $(KERN_CC) $(kernel_INCLUDES) -idirafter $(kern_GCCLIB_DIR)/include $(LINUX_CPPFLAGS) $(LINUX_CFLAGS) $(LINUX_CFLAGS_MODULE) -DOMK_FOR_KERNEL -DEXPORT_SYMTAB -nostdinc
  cc_o_kern_COMPILE = $(KERN_CC) $(kernel_INCLUDES) -idirafter $(kern_GCCLIB_DIR)/include $(LINUX_CPPFLAGS) $(LINUX_CFLAGS) $(LINUX_CFLAGS_MODULE) -DOMK_FOR_KERNEL -DEXPORT_SYMTAB
 -S_o_kern_COMPILE = $(KERN_CC) $(kernel_INCLUDES) -idirafter $(kern_GCCLIB_DIR)/include $(LINUX_CPPFLAGS) $(LINUX_AFLAGS) $(LINUX_CFLAGS_MODULE) -DOMK_FOR_KERNEL -DEXPORT_SYMTAB -nostdinc
 +S_o_kern_COMPILE = $(KERN_CC) $(kernel_INCLUDES) -idirafter $(kern_GCCLIB_DIR)/include $(LINUX_CPPFLAGS) $(LINUX_AFLAGS) $(LINUX_CFLAGS_MODULE) -DOMK_FOR_KERNEL -DEXPORT_SYMTAB
  KERN_EXE_SUFFIX := $(LINUX_MODULE_EXT)
  KERN_LDFLAGS = $(LINUX_LDFLAGS)
  ifdef LINUX_ARCH
@@@ -569,7 -528,7 +570,7 @@@ define COMPILE_c_o_kern_templat
  
  $(2): $(1)
        @$(QUIET_CMD_ECHO) "  CC [K]  $$@"
 -      $(Q) if $$(c_o_kern_COMPILE) $$(kern_CC_DEPFLAGS) $(3) $(KERN_KBUILD_MODNAME) \
 +      $(Q) if $$(c_o_kern_COMPILE) $$(kern_CC_DEPFLAGS) $$($(basename $(1))_CFLAGS) $(3) $(KERN_KBUILD_MODNAME) \
        -D"KBUILD_BASENAME=$(KERN_MQ)$(notdir $(basename $(1)))$(KERN_MQ)" \
        -o $$@ -c $$< ; \
        then mv -f "$$@.d.tmp" "$$@.d" ; \
@@@ -583,7 -542,7 +584,7 @@@ define COMPILE_cc_o_kern_templat
  
  $(2): $(1)
        @$(QUIET_CMD_ECHO) "  CXX [K] $$@"
 -      $(Q) if $$(cc_o_kern_COMPILE) $$(kern_CC_DEPFLAGS) $(3) $(KERN_KBUILD_MODNAME) \
 +      $(Q) if $$(cc_o_kern_COMPILE) $$(kern_CC_DEPFLAGS) $$($(basename $(1))_CXXFLAGS) $(3) $(KERN_KBUILD_MODNAME) \
        -D"KBUILD_BASENAME=$(KERN_MQ)$(notdir $(basename $(1)))$(KERN_MQ)" \
        -o $$@ -c $$< ; \
        then mv -f "$$@.d.tmp" "$$@.d" ; \
@@@ -608,19 -567,14 +609,19 @@@ ende
  
  
  define MODULE_kern_template
 -$(1)_OBJS += $$(filter %.o,$$($(1)_SOURCES:%.c=%.o))
 -$(1)_OBJS += $$(filter %.o,$$($(1)_SOURCES:%.cc=%.o))
 -$(1)_OBJS += $$(filter %.o,$$($(1)_SOURCES:%.cxx=%.o))
 +$(1)_OBJS += $$(filter %.o,$$($(1)_SOURCES:%.c=%-$(1).o))
 +$(1)_OBJS += $$(filter %.o,$$($(1)_SOURCES:%.cc=%-$(1).o))
 +$(1)_OBJS += $$(filter %.o,$$($(1)_SOURCES:%.cxx=%-$(1).o))
  $(1)_OBJS := $$(sort $$($(1)_OBJS))
  
  KERN_OBJS  += $$($(1)_OBJS)
  KERN_SOURCES += $$($(1)_SOURCES)
  
 +$(foreach src,$(filter %.c,$($(1)_SOURCES)),$(eval $(call COMPILE_c_o_kern_template,$(SOURCES_DIR)/$(src),$(src:%.c=%-$(1).o),$($(1)_CPPFLAGS) $($(1)_CFLAGS))))
 +$(foreach src,$(filter %.cc,$($(1)_SOURCES)),$(eval $(call COMPILE_cc_o_kern_template,$(SOURCES_DIR)/$(src),$(src:%.cc=%-$(1).o),$($(1)_CPPFLAGS) $($(1)_CXXFLAGS))))
 +$(foreach src,$(filter %.cxx,$($(1)_SOURCES)),$(eval $(call COMPILE_cc_o_kern_template,$(SOURCES_DIR)/$(src),$(src:%.cxx=%-$(1).o),$($(1)_CPPFLAGS) $($(1)_CXXFLAGS))))
 +$(foreach src,$(filter %.S,$($(1)_SOURCES)),$(eval $(call COMPILE_S_o_kern_template,$(SOURCES_DIR)/$(src),$(src:%.S=%-$(1).o),$($(1)_ASFLAGS))))
 +
  # this is hack to build "__this_module" structure for 2.6.x kernels
  # modpost is used for that purpose now
  
@@@ -665,19 -619,14 +666,19 @@@ ende
  
  
  define LIBRARY_kern_template
 -$(1)_OBJS += $$(filter %.o,$$($(1)_SOURCES:%.c=%.o))
 -$(1)_OBJS += $$(filter %.o,$$($(1)_SOURCES:%.cc=%.o))
 -$(1)_OBJS += $$(filter %.o,$$($(1)_SOURCES:%.cxx=%.o))
 +$(1)_OBJS += $$(filter %.o,$$($(1)_SOURCES:%.c=%-$(1).o))
 +$(1)_OBJS += $$(filter %.o,$$($(1)_SOURCES:%.cc=%-$(1).o))
 +$(1)_OBJS += $$(filter %.o,$$($(1)_SOURCES:%.cxx=%-$(1).o))
  $(1)_OBJS := $$(sort $$($(1)_OBJS))
  
  KERN_OBJS  += $$($(1)_OBJS)
  KERN_SOURCES += $$($(1)_SOURCES)
  
 +$(foreach src,$(filter %.c,$($(1)_SOURCES)),$(eval $(call COMPILE_c_o_kern_template,$(SOURCES_DIR)/$(src),$(src:%.c=%-$(1).o),$($(1)_CPPFLAGS) $($(1)_CFLAGS))))
 +$(foreach src,$(filter %.cc,$($(1)_SOURCES)),$(eval $(call COMPILE_cc_o_kern_template,$(SOURCES_DIR)/$(src),$(src:%.cc=%-$(1).o),$($(1)_CPPFLAGS) $($(1)_CXXFLAGS))))
 +$(foreach src,$(filter %.cxx,$($(1)_SOURCES)),$(eval $(call COMPILE_cc_o_kern_template,$(SOURCES_DIR)/$(src),$(src:%.cxx=%-$(1).o),$($(1)_CPPFLAGS) $($(1)_CXXFLAGS))))
 +$(foreach src,$(filter %.S,$($(1)_SOURCES)),$(eval $(call COMPILE_S_o_kern_template,$(SOURCES_DIR)/$(src),$(src:%.S=%-$(1).o),$($(1)_ASFLAGS))))
 +
  $(KERN_LIB_DIR)/lib$(1).a: $$($(1)_OBJS)
        @$(QUIET_CMD_ECHO) "  AR [K]  $$@"
        $(Q) $(KERN_AR) rcs $$@ $$^
@@@ -714,7 -663,6 +715,7 @@@ ifeq ($(KERN_MODPOST_PASS),y
  MODULES_LIST :=       $(wildcard *.mod.stamp)
  MODULES_LIST := $(MODULES_LIST:%.mod.stamp=%)
  
 +# Syntax: $(call MODPOST_kern_template,<module-name>,<module-dest-file>)
  define MODPOST_kern_template
  $(2) : $(1)$(KERN_LINK_SUFFIX) $(1).mod.c
        @$(QUIET_CMD_ECHO) "  LD [M]  $$@"
@@@ -724,10 -672,6 +725,10 @@@
        $(Q) $$(KERN_LD) $$(KERN_LDFLAGS) $(1)$(KERN_LINK_SUFFIX) $(1).mod.o -r -o $$@
  endef
  
 +# SSSA: iteration on modpost invocation was added because passing
 +#       all modules altogether to modpost was causing segfault (!?!).
 +#       The final true command avoids reporting error due to modpost WARNINGs about unresolved
 +#     module symbols (it doesn't know what modules are loaded together).
  kernel-modpost-versions: $(wildcard $(LINUX_DIR)/Module.symvers)
        @$(QUIET_CMD_ECHO) "  MODPOST    $(KERN_MODPOST_DIR)"
        @echo  >$(KERN_MODPOST_DIR)/modpost-running
@@@ -754,8 -698,8 +755,8 @@@ ifneq ($(kernel_LIBRARIES)$(rtlinux_LIB
  KERN_CONFIG_HEADERS_REQUIRED = y
  endif
  
 -$(eval $(call omk_pass_template, kernel-lib-pass,$(KERN_OBJS_DIR),KERN_RULE_TEMPLATES=y,$(kernel_LIBRARIES)$(rtlinux_LIBRARIES)))
 -$(eval $(call omk_pass_template, kernel-mod-pass,$(KERN_OBJS_DIR),KERN_RULE_TEMPLATES=y,$(kernel_MODULES)$(rtlinux_MODULES)))
 +$(eval $(call omk_pass_template, kernel-lib-pass,$(KERN_OBJS_DIR),KERN_RULE_TEMPLATES=y,$(kernel_LIBRARIES)$(rtlinux_LIBRARIES),$(kernel_SUBDIRS)))
 +$(eval $(call omk_pass_template, kernel-mod-pass,$(KERN_OBJS_DIR),KERN_RULE_TEMPLATES=y,$(kernel_MODULES)$(rtlinux_MODULES),$(kernel_SUBDIRS)))
  
  kernel-modpost-pass:
        +@if [ -e "$(KERN_MODPOST_DIR)/module-changes" -o -e "$(KERN_MODPOST_DIR)/modpost-running" ] ; \
@@@ -764,22 -708,18 +765,22 @@@
               -f $(SOURCES_DIR)/Makefile KERN_RULE_TEMPLATES=y KERN_MODPOST_PASS=y $(@:%=%-local) ; \
        fi
  
 -$(eval $(call omk_pass_template, library-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(lib_LIBRARIES)$(shared_LIBRARIES)))
 -$(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(bin_PROGRAMS)$(utils_PROGRAMS)$(test_PROGRAMS)))
 +$(eval $(call omk_pass_template, library-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(lib_LIBRARIES)$(shared_LIBRARIES),$(library_SUBDIRS)))
 +$(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(bin_PROGRAMS)$(utils_PROGRAMS)$(test_PROGRAMS),$(binary_SUBDIRS)))
  
 -$(eval $(call omk_pass_template,clean,$(USER_OBJS_DIR),,always))
 -$(eval $(call omk_pass_template,install,$(USER_OBJS_DIR),,always))
 -$(eval $(call omk_pass_template,include-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,always))
 +$(eval $(call omk_pass_template,clean,$(USER_OBJS_DIR),,always,$(all_SUBDIRS)))
 +$(eval $(call omk_pass_template,install,$(USER_OBJS_DIR),,always,$(install_SUBDIRS)))
 +$(eval $(call omk_pass_template,include-pass,$(USER_OBJS_DIR),,always,$(include_SUBDIRS)))
 +$(eval $(call omk_pass_template,docs-pass,$(USER_OBJS_DIR),,always,$(docs_SUBDIRS)))
 +$(eval $(call omk_pass_template,sourceclean,$(USER_OBJS_DIR),,always,$(all_SUBDIRS)))
  
  check-dir::
        @$(call mkdir_def,$(USER_BUILD_DIR))
        @$(call mkdir_def,$(KERN_BUILD_DIR))
        @$(call mkdir_def,$(USER_INCLUDE_DIR))
 +      @$(call mkdir_def,$(USER_INCLUDE_DIR)/$(include_DEST))
        @$(call mkdir_def,$(KERN_INCLUDE_DIR))
 +      @$(call mkdir_def,$(KERN_INCLUDE_DIR)/$(kernel_DEST))
        @$(call mkdir_def,$(USER_LIB_DIR))
        @$(call mkdir_def,$(KERN_LIB_DIR))
        @$(call mkdir_def,$(USER_BIN_DIR))
@@@ -787,14 -727,13 +788,14 @@@
        @$(call mkdir_def,$(USER_TESTS_DIR))
        @$(call mkdir_def,$(KERN_MODULES_DIR))
        @$(call mkdir_def,$(KERN_MODPOST_DIR))
 +      @$(call mkdir_def,$(USER_DOC_DIR))
  
  install-local:                        # TODO
  
 -$(eval $(call include-pass-template,$(USER_INCLUDE_DIR),include))
 -$(eval $(call include-pass-template,$(KERN_INCLUDE_DIR),kernel))
 +$(eval $(call include-pass-template,$(USER_INCLUDE_DIR)/$(include_DEST),include))
 +$(eval $(call include-pass-template,$(KERN_INCLUDE_DIR)/$(kernel_DEST),kernel))
  ifeq ($(CONFIG_RTLINUX),y)
 -$(eval $(call include-pass-template,$(KERN_INCLUDE_DIR),rtlinux))
 +$(eval $(call include-pass-template,$(KERN_INCLUDE_DIR)/$(rtlinux_DEST),rtlinux))
  endif
  
  
@@@ -808,6 -747,16 +809,6 @@@ USER_GEN_SOURCES := $(sort $(USER_GEN_S
  
  #$(warning USER_SOURCES = $(USER_SOURCES))
  
 -$(foreach src,$(filter %.c,$(USER_SOURCES)),$(eval $(call COMPILE_c_o_template,$(SOURCES_DIR)/$(src),$(src:%.c=%.o),)))
 -
 -$(foreach src,$(filter %.cc,$(USER_SOURCES)),$(eval $(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cc=%.o),)))
 -
 -$(foreach src,$(filter %.cxx,$(USER_SOURCES)),$(eval $(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cxx=%.o),)))
 -
 -$(foreach src,$(filter %.S,$(USER_SOURCES)),$(eval $(call COMPILE_S_o_template,$(SOURCES_DIR)/$(src),$(src:%.S=%.o),)))
 -
 -$(foreach src,$(filter %.c,$(USER_GEN_SOURCES)),$(eval $(call COMPILE_c_o_template,$(src),$(src:%.c=%.o),)))
 -
  # User-space shared libraries object files
  
  SOLIB_SOURCES := $(sort $(SOLIB_SOURCES))
@@@ -817,6 -766,16 +818,6 @@@ SOLIB_GEN_SOURCES := $(sort $(SOLIB_GEN
  #$(warning SOLIB_SOURCES = $(SOLIB_SOURCES))
  #$(warning SOLIB_GEN_SOURCES = $(SOLIB_GEN_SOURCES))
  
 -$(foreach src,$(filter %.c,$(SOLIB_SOURCES)),$(eval $(call COMPILE_c_o_template,$(SOURCES_DIR)/$(src),$(src:%.c=%.lo),$(SOLIB_PICFLAGS))))
 -
 -$(foreach src,$(filter %.cc,$(SOLIB_SOURCES)),$(eval $(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cc=%.lo),$(SOLIB_PICFLAGS))))
 -
 -$(foreach src,$(filter %.cxx,$(SOLIB_SOURCES)),$(eval $(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cxx=%.lo),$(SOLIB_PICFLAGS))))
 -
 -$(foreach src,$(filter %.S,$(SOLIB_SOURCES)),$(eval $(call COMPILE_S_o_template,$(SOURCES_DIR)/$(src),$(src:%.S=%.lo),$(SOLIB_PICFLAGS))))
 -
 -$(foreach src,$(filter %.c,$(SOLIB_GEN_SOURCES)),$(eval $(call COMPILE_c_o_template,$(src),$(src:%.c=%.lo),$(SOLIB_PICFLAGS))))
 -
  # IDL compilation
  
  USER_IDLS := $(sort $(USER_IDLS))
@@@ -831,6 -790,13 +832,6 @@@ KERN_SOURCES := $(sort $(KERN_SOURCES)
  
  #$(warning KERN_SOURCES = $(KERN_SOURCES))
  
 -$(foreach src,$(filter %.c,$(KERN_SOURCES)),$(eval $(call COMPILE_c_o_kern_template,$(SOURCES_DIR)/$(src),$(src:%.c=%.o),)))
 -
 -$(foreach src,$(filter %.cc,$(KERN_SOURCES)),$(eval $(call COMPILE_cc_o_kern_template,$(SOURCES_DIR)/$(src),$(src:%.cc=%.o),)))
 -
 -$(foreach src,$(filter %.cxx,$(KERN_SOURCES)),$(eval $(call COMPILE_cc_o_kern_template,$(SOURCES_DIR)/$(src),$(src:%.cxx=%.o),)))
 -
 -$(foreach src,$(filter %.S,$(USER_SOURCES)),$(eval $(call COMPILE_S_o_kern_template,$(SOURCES_DIR)/$(src),$(src:%.S=%.o),)))
  endif
  
  clean-local: clean-custom
@@@ -851,16 -817,9 +852,16 @@@ include-pass-submakes: extra-rules-subd
  # We must go to EXTRA_RULES_SUBDIRS before going to any other
  # directory, since the executables compiled in EXTRA_RULES_SUBDIRS
  # might be needed there.
 -include-pass-this-dir $(foreach subdir,$(SUBDIRS),include-pass-$(subdir)-subdir): extra-rules-subdirs
 +include-pass-this-dir $(foreach subdir,$(SUBDIRS) $(include_SUBDIRS),include-pass-$(subdir)-subdir): extra-rules-subdirs
 +
 +AC_GEN_FILES:=$(wildcard $(SOURCES_DIR)/*.in)
 +sourceclean-local:
 +      cd $(SOURCES_DIR) \
 +      && rm -f *~ .*~ .*.o.cmd .*.ko.cmd .*.o.d .*.o.tmp *.bak *.o *.ko *.mod.c config.omk-default .config semantic.cache $(AC_GEN_FILES:.in=) .\#* \
 +      && rm -rf .tmp_versions Modules.symvers \
 +      && rm -rf autom4te.cache config.status config.log
  
 -default: include-pass library-pass binary-pass
 +default: include-pass library-pass binary-pass docs-pass
  ifndef OMIT_KERNEL_PASSES
  # Also make kernel passes if not disabled
  default: kernel-lib-pass kernel-pass