xxx_IDLFLAGS variable can be used to specify custom IDL flags for different files

[omk.git] / snippets / linux

diff --git a/snippets/linux b/snippets/linux
index f507b091e25364fda8f9870ccb417e9905e109ab..57f43b87037c56b2df4f304caf3586e4744f3dd7 100644 (file)
--- a/snippets/linux
+++ b/snippets/linux
@@ -17,6 +17,7 @@
 # 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
 # INCLUDES         .. additional include directories and defines for user-space
 # kernel_INCLUDES  .. additional include directories and defines for kernel-space
 # rtlinux_INCLUDES .. additional include directories and defines for RT-Linux
@@ -26,14 +27,16 @@
 # RTL_DIR          .. location of RT-Linux sources
 # CFLAGS           .. C compiler flags
 # CXXFLAGS         .. C++ compiler flags
+# CPPFLAGS        .. C preprocessor flags
+# LDFLAGS         .. linker flags for programs linking
 
 # Hack to check RT-Linux rules
 #LINUX_DIR := /home/cvs/ocera/ocera-build/kernel/linux
 #RTL_DIR := /home/cvs/ocera/ocera-build/kernel/rtlinux
 #CONFIG_RTLINUX = y
-#OCERA_DIR := $(shell ( cd -L $(MAKERULES_DIR)/../../.. ; pwd -L ) )
+#OCERA_DIR := $(shell ( cd -L $(OUTPUT_DIR)/../../.. ; pwd -L ) )
 
--include $(MAKERULES_DIR)/OCERA_TOP_DIR
+-include $(OUTPUT_DIR)/OCERA_TOP_DIR
 
 BUILD_DIR_NAME = _build
 COMPILED_DIR_NAME = _compiled
@@ -66,17 +69,17 @@ ifneq ($(wildcard $(CONFIG_FILE)),)
 CONFIG_FILE_OK = y
 endif
 else # OCERA_DIR
-KERN_INCLUDE_DIR := $(MAKERULES_DIR)/$(COMPILED_DIR_NAME)/include-kern
-KERN_LIB_DIR     := $(MAKERULES_DIR)/$(COMPILED_DIR_NAME)/lib-kern
-KERN_MODULES_DIR := $(MAKERULES_DIR)/$(COMPILED_DIR_NAME)/modules
-KERN_BUILD_DIR   := $(MAKERULES_DIR)/$(BUILD_DIR_NAME)/kern
-KERN_MODPOST_DIR := $(MAKERULES_DIR)/$(BUILD_DIR_NAME)/kern-modpost
-USER_INCLUDE_DIR := $(MAKERULES_DIR)/$(COMPILED_DIR_NAME)/include
-USER_LIB_DIR     := $(MAKERULES_DIR)/$(COMPILED_DIR_NAME)/lib
-USER_UTILS_DIR   := $(MAKERULES_DIR)/$(COMPILED_DIR_NAME)/bin-utils
-USER_TESTS_DIR   := $(MAKERULES_DIR)/$(COMPILED_DIR_NAME)/bin-tests
-USER_BIN_DIR     := $(MAKERULES_DIR)/$(COMPILED_DIR_NAME)/bin
-USER_BUILD_DIR   := $(MAKERULES_DIR)/$(BUILD_DIR_NAME)/user
+KERN_INCLUDE_DIR := $(OUTPUT_DIR)/$(COMPILED_DIR_NAME)/include-kern
+KERN_LIB_DIR     := $(OUTPUT_DIR)/$(COMPILED_DIR_NAME)/lib-kern
+KERN_MODULES_DIR := $(OUTPUT_DIR)/$(COMPILED_DIR_NAME)/modules
+KERN_BUILD_DIR   := $(OUTPUT_DIR)/$(BUILD_DIR_NAME)/kern
+KERN_MODPOST_DIR := $(OUTPUT_DIR)/$(BUILD_DIR_NAME)/kern-modpost
+USER_INCLUDE_DIR := $(OUTPUT_DIR)/$(COMPILED_DIR_NAME)/include
+USER_LIB_DIR     := $(OUTPUT_DIR)/$(COMPILED_DIR_NAME)/lib
+USER_UTILS_DIR   := $(OUTPUT_DIR)/$(COMPILED_DIR_NAME)/bin-utils
+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
 
 ifndef LINUX_VERSION
 LINUX_VERSION=$(shell uname -r)
@@ -100,6 +103,9 @@ ifeq ($(TARGET_OS),)
   TARGET_OS := $(BUILD_OS)
 endif
 
+export TARGET_OS
+export BUILD_OS
+
 LOCAL_BUILD_DIR  = $(USER_OBJS_DIR)
 
 # Assign default values to CFLAGS variable. If the variable is defined
@@ -245,7 +251,7 @@ endef
 define COMPILE_idl_template
 $(2).c $(2)-stubs.c $(2)-skels.c $(2)-common.c $(2).h: $(1)
        @$(QUIET_CMD_ECHO) "  IDL     $$@"
-       $(Q) $$(idl_COMPILE) $(1)
+       $(Q) $$(idl_COMPILE) $$($(2)_IDLFLAGS) $(1)
 endef
 
 
@@ -328,7 +334,7 @@ SOLIB_SOURCES += $$($(1)_SOURCES)
 
 $(USER_LIB_DIR)/lib$(1).$(SOLIB_EXT): $$($(1)_OBJSLO)
        @$(QUIET_CMD_ECHO) "  LINK    $$@"
-       $(Q) $(LD) --shared --soname=lib$(1).$(SOLIB_EXT) -o $$@ $$^ $$(LOADLIBES) $$($(1)_LIBS:%=-l%)
+       $(Q) $(CC) --shared -Xlinker -soname=lib$(1).$(SOLIB_EXT) -o $$@ $$^ $$(LOADLIBES) $$($(1)_LIBS:%=-l%)
 endef
 
 
@@ -427,7 +433,7 @@ KERN_AR = $(AR)
 endif
 ifeq ($(LINUX_QUOTE_MODNAME),y)
 KERN_MQ=\"
-KERN_KBUILD_MODNAME=-D"KBUILD_MODNAME=((THIS_MODULE)?(THIS_MODULE)->name:NULL)"
+KERN_KBUILD_MODNAME=-D"KBUILD_MODNAME=((THIS_MODULE)!=NULL?(THIS_MODULE)->name:NULL)"
 endif
 endif # CONFIG_RTLINUX
 
@@ -462,6 +468,34 @@ KERN_MODULES_LINK_DIR = $(KERN_MODULES_DIR)
 KERN_LINK_SUFFIX = $(KERN_EXE_SUFFIX)
 endif
 
+ifeq ($(LINUX_CONFIG_MODVERSIONS),y)
+MODPOST_OPTS += -m
+MODPOST_OPTS += -i $(LINUX_DIR)/Module.symvers
+ifneq ($(LINUX_BUILDHOST),) # this is not correct point, it should look for 2.6.17 kernel
+MODPOST_OPTS += -I $(KERN_LIB_DIR)/Module.symvers
+endif
+MODPOST_OPTS += -o $(KERN_LIB_DIR)/Module.symvers
+endif
+
+ifeq ($(LINUX_CONFIG_DEBUG_SECTION_MISMATCH),y)
+MODPOST_OPTS += -S
+endif
+
+ifeq ($(LINUX_CONFIG_MARKERS),y)
+MODPOST_OPTS += -K $(LINUX_DIR)/Module.markers
+MODPOST_OPTS += -M $(KERN_LIB_DIR)/Module.markers
+endif
+
+ifeq ($(LINUX_KBUILD_MODPOST_WARN),y)
+MODPOST_OPTS += -w
+endif
+
+ifneq ($(LINUX_BUILDHOST),)
+ifneq ($(LINUX_BUILDHOST),$(LINUX_ARCH))
+MODPOST_OPTS += -c
+endif
+endif
+
 define COMPILE_c_o_kern_template
 
 $(2): $(1)
@@ -549,7 +583,7 @@ $(2)/$(1)$(KERN_LINK_SUFFIX): $$($(1)_OBJS)
        @echo >>$(KERN_OBJS_DIR)/$(1).mod.d
        @if [ "$(KERN_EXE_SUFFIX)" = ".ko" ] ; then \
          echo $(1) >>$(KERN_MODPOST_DIR)/module-changes ; \
-         echo $(1) >>$(KERN_MODPOST_DIR)/$(1).mod.stamp ; \
+         echo $(1) >$(KERN_MODPOST_DIR)/$(1).mod.stamp ; \
        fi
 
 endef
@@ -614,7 +648,7 @@ kernel-modpost-versions: $(wildcard $(LINUX_DIR)/Module.symvers)
        @$(QUIET_CMD_ECHO) "  MODPOST    $(KERN_MODPOST_DIR)"
        @echo  >$(KERN_MODPOST_DIR)/modpost-running
        @rm -f $(KERN_MODPOST_DIR)/module-changes
-       $(Q) $(KERN_MODPOST) $(MODULES_LIST:%=%$(KERN_LINK_SUFFIX)) $(^:%=-i %)
+       $(Q) $(KERN_MODPOST) $(MODPOST_OPTS) $(MODULES_LIST:%=%$(KERN_LINK_SUFFIX))
 
 $(MODULES_LIST:%=%.mod.c) : kernel-modpost-versions
 
@@ -651,7 +685,7 @@ $(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLAT
 
 $(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),,always))
+$(eval $(call omk_pass_template,include-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,always))
 
 check-dir:
        @$(call mkdir_def,$(USER_BUILD_DIR))
@@ -668,13 +702,13 @@ check-dir:
 
 install-local:                 # TODO
 
-include-pass-local:
-       $(call include-pass-template,$(USER_INCLUDE_DIR),include)
-       $(call include-pass-template,$(KERN_INCLUDE_DIR),kernel)
+$(eval $(call include-pass-template,$(USER_INCLUDE_DIR),include))
+$(eval $(call include-pass-template,$(KERN_INCLUDE_DIR),kernel))
 ifeq ($(CONFIG_RTLINUX),y)
-       $(call include-pass-template,$(KERN_INCLUDE_DIR),rtlinux)
+$(eval $(call include-pass-template,$(KERN_INCLUDE_DIR),rtlinux))
 endif
 
+
 ifdef USER_RULE_TEMPLATES
 
 # User-space static libraries and applications object files
@@ -739,7 +773,7 @@ endif
 
 clean-local: clean-custom
        @echo Cleaning in $(KERN_OBJS_DIR) and $(USER_OBJS_DIR)
-       @rm -f $(KERN_OBJS_DIR)/*.o $(USER_OBJS_DIR)/*.o $(USER_OBJS_DIR)/*.lo \
+       @rm -f $(KERN_OBJS_DIR)/*.o $(USER_OBJS_DIR)/*.[och] $(USER_OBJS_DIR)/*.lo\
               $(KERN_OBJS_DIR)/*.d $(USER_OBJS_DIR)/*.d \
               $(KERN_OBJS_DIR)/*.map $(USER_OBJS_DIR)/*.map \
               $(KERN_OBJS_DIR)/*.mod.c \
@@ -750,6 +784,13 @@ clean-local: clean-custom
            touch -t 200001010101 $(KERN_LIB_DIR)/kernel.mk ; \
        fi
 
+include-pass-submakes: extra-rules-subdirs
+
+# We must go to EXTRA_RULES_SUBDIRS beofre 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
+
 default: include-pass library-pass binary-pass
 ifndef OMIT_KERNEL_PASSES
 # Also make kernel passes if not disabled