From b29bafee9c88d4bc487516fffd44396aaa04ba64 Mon Sep 17 00:00:00 2001 From: ppisa Date: Fri, 7 Aug 2009 17:54:20 +0200 Subject: [PATCH] The Linux Makefile.rules updated from OMK main repository. Signed-off-by: ppisa --- omk/Makefile | 2 +- omk/rules/linux/Makefile.rules | 33 +++++++++++++++++++-------------- omk/rules/linux/kernelcfg2mk | 2 +- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/omk/Makefile b/omk/Makefile index b22a357..76b56fd 100644 --- a/omk/Makefile +++ b/omk/Makefile @@ -7,7 +7,7 @@ endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: - @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" + @echo -e "\nThe Makefile.rules has not been found in this or parent directory\n" else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/omk/rules/linux/Makefile.rules b/omk/rules/linux/Makefile.rules index 25507fa..406e45d 100644 --- a/omk/rules/linux/Makefile.rules +++ b/omk/rules/linux/Makefile.rules @@ -4,7 +4,7 @@ # (C) Copyright 2006 by Michal Sojka - Czech Technical University, FEE, DCE # # Homepage: http://rtime.felk.cvut.cz/omk/ -# Version: 0.1-71-g6698de2 +# Version: 0.1-88-g324e3bf # # The OMK build system is distributed under the GNU General Public # License. See file COPYING for details. @@ -35,7 +35,9 @@ # 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 +# xxx_LIBS .. list of specific target libraries (-l prefix is automatically added) +# xxx_LDFLAGS .. list of specific target 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 # rtlinux_INCLUDES .. additional include directories and defines for RT-Linux @@ -252,7 +254,7 @@ $(pass)-$(3)-subdir: RELATIVE_DIR=$(RELATIVE_PREFIX)$(3) -C $(2)/$(3) \ -f $(SUBDIR_MAKEFILE) $(pass)-submakes # In subdirectories we can call submakes directly since passes are -# already searialized on the toplevel make. +# already serialized on the toplevel make. endef ifdef OMK_TESTSROOT @@ -481,7 +483,8 @@ OMK_WORK_DIR = $(USER_OBJS_DIR) ifneq ($(OMK_SERIALIZE_INCLUDED),y) include-pass: check-dir library-pass: include-pass -binary-pass: library-pass link-pseudo-pass +link-pseudo-pass: library-pass +binary-pass: link-pseudo-pass kernel-lib-pass: include-pass kernel-mod-pass: kernel-lib-pass kernel-modpost-pass: kernel-mod-pass @@ -587,7 +590,7 @@ endef 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 @@ -617,7 +620,7 @@ USER_SOURCES += $$($(1)_SOURCES) $(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) -Wl,-rpath-link,$(USER_LIB_DIR) -Wl,-Map,$(USER_OBJS_DIR)/$(1).exe.map -o $$@ + $$($(1)_OBJS) $$($(1)_LIBS:%=-l%) $$(LOADLIBES) $$(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 @@ -674,6 +677,7 @@ SOLIB_SOURCES += $$($(1)_SOURCES) $(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar: $$($(1)_OBJSLO) FORCE $(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 @@ -724,7 +728,7 @@ $(1)_shared_libs = $$(patsubst %,$(USER_LIB_DIR)/lib%.$(SOLIB_EXT),$$(filter $$( #$$(warning $(1)_shared_libs = $$($(1)_shared_libs)) $(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 @@ -741,7 +745,7 @@ endif # link-shared-libs ifdef KERN_RULE_TEMPLATES $(KERN_LIB_DIR)/kernel.mk: $(LINUX_DIR)/.config $(MAKERULES_DIR)/kernelcfg2mk - @$(QUIET_CMD_ECHO) " KCFG2MK $$@" + @$(QUIET_CMD_ECHO) " KCFG2MK $@" $(Q) $(MAKERULES_DIR)/kernelcfg2mk $(LINUX_DIR) $(KERN_LIB_DIR) ifeq ($(CONFIG_RTLINUX),y) @@ -765,7 +769,7 @@ include $(KERN_LIB_DIR)/kernel.mk ifeq ($(LINUX_SRC),) LINUX_SRC = $(LINUX_DIR) endif -kernel_INCLUDES += -I $(LINUX_DIR) -idirafter $(LINUX_SRC)/include/linux +kernel_INCLUDES += -I $(KERN_INCLUDE_DIR) -I $(LINUX_DIR) -idirafter $(LINUX_SRC)/include/linux ifdef LINUX_CC KERN_CC = $(LINUX_CC) @@ -775,7 +779,7 @@ KERN_CC = echo KERN_CC not defined - compilation skipped 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 +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 KERN_EXE_SUFFIX := $(LINUX_MODULE_EXT) KERN_LDFLAGS = $(LINUX_LDFLAGS) ifdef LINUX_ARCH @@ -1000,7 +1004,7 @@ MODULES_LIST := $(MODULES_LIST:%.mod.stamp=%) define MODPOST_kern_template $(2) : $(1)$(KERN_LINK_SUFFIX) $(1).mod.c @$(QUIET_CMD_ECHO) " LD [M] $$@" - $(Q) $$(cc_o_kern_COMPILE) -D"KBUILD_BASENAME=$(KERN_MQ)$(1)$(KERN_MQ)" \ + $(Q) $$(c_o_kern_COMPILE) -D"KBUILD_BASENAME=$(KERN_MQ)$(1)$(KERN_MQ)" \ -D"KBUILD_MODNAME=$(KERN_MQ)$(1)$(KERN_MQ)" \ -o $(1).mod.o -c $(1).mod.c $(Q) $$(KERN_LD) $$(KERN_LDFLAGS) $(1)$(KERN_LINK_SUFFIX) $(1).mod.o -r -o $$@ @@ -1148,7 +1152,7 @@ clean-local: clean-custom include-pass-submakes: extra-rules-subdirs -# We must go to EXTRA_RULES_SUBDIRS beofre going to any other +# 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 @@ -1163,7 +1167,7 @@ endif define BUILD_CONFIG_H_template $(addprefix $(1)/,$(notdir $(addsuffix .stamp,$(2)))) : $(CONFIG_FILES) - @$(QUIET_CMD_ECHO) " CONFGEN $$(@:%.stamp=%)" + @$(QUIET_CMD_ECHO) " CONFGEN $(notdir $(2))" @if [ ! -d `dirname $(2).tmp` ] ; then \ mkdir -p `dirname $(2).tmp` ; fi @echo "/* Automatically generated from */" > "$(2).tmp" @@ -1351,5 +1355,6 @@ endif cscope: $(SOURCES_LIST) @$(QUIET_CMD_ECHO) " CSCOPE < $(SOURCES_LIST_FN)" - $(Q)sed -e '/^#/d' $(SOURCES_LIST)|cscope -b -i- + $(Q)sed -e '/^#/d' $(SOURCES_LIST) > cscope.files + $(Q)cscope -b -icscope.files #FIXME: see doc to -i in cscope(1) diff --git a/omk/rules/linux/kernelcfg2mk b/omk/rules/linux/kernelcfg2mk index 8459118..be7d1f5 100755 --- a/omk/rules/linux/kernelcfg2mk +++ b/omk/rules/linux/kernelcfg2mk @@ -151,7 +151,7 @@ flags: @echo LINUX_CROSS_COMPILE="\$(CROSS_COMPILE)" >>\$(obj)/flags @echo LINUX_KERNELRELEASE="\$(KERNELRELEASE)" >>\$(obj)/flags ifdef KBUILD_CFLAGS - @echo LINUX_CPPFLAGS="\$(KBUILD_CPPFLAGS)" | sed 's#-I\(include\|arch\)#-I"\$(LINUXDIR)/\1"#g'>>\$(obj)/flags + @echo LINUX_CPPFLAGS="\$(KBUILD_CPPFLAGS)\$(if \$(filter -I,\$(KBUILD_CPPFLAGS)),, \$(LINUXINCLUDE))" | sed 's#-I\(include\|arch\)#-I"\$(LINUXDIR)/\1"#g'>>\$(obj)/flags @echo LINUX_AFLAGS="\$(KBUILD_AFLAGS)" | sed 's#-I\(include\|arch\)#-I"\$(OMK_LINUX_SRC)/\1"#g'>>\$(obj)/flags @echo LINUX_CFLAGS="\$(KBUILD_CFLAGS)" | sed 's#-I\(include\|arch\)#-I"\$(OMK_LINUX_SRC)/\1"#g'>>\$(obj)/flags else -- 2.39.2