From: Michal Sojka Date: Thu, 22 Jun 2006 15:56:00 +0000 (+0000) Subject: Both sysless and linux rules should work now. X-Git-Tag: v0.1~214 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/omk.git/commitdiff_plain/1febffa1c9c81978d8a394285327603971a435d2 Both sysless and linux rules should work now. The linux rules were not tested with Ocera. darcs-hash:20060622155650-f2ef6-1108af24f994e13c5149f656c4025ec5981ef5eb.gz --- diff --git a/Makefile.dollar-test b/Makefile.dollar-test index ea4a9ad..9297ec0 100644 --- a/Makefile.dollar-test +++ b/Makefile.dollar-test @@ -33,5 +33,5 @@ VAR = fourth # Local Variables: # mode: makefile -# compile-c ommand: "make -f Makefile.dollar-test" +# compile-command: "make -f Makefile.dollar-test" # End: \ No newline at end of file diff --git a/rulesdef.py b/rulesdef.py index 5f9d0fe..f2f4ae3 100755 --- a/rulesdef.py +++ b/rulesdef.py @@ -2,5 +2,5 @@ rules = { 'sysless': [ 'base', 'gcc', 'localconfig', 'sysless', 'localeval' ], - 'linux': [ 'base', 'localconfig', 'linux' ], + 'linux': [ 'linux-setup', 'base', 'localconfig', 'linux' ], } diff --git a/snippets/base b/snippets/base index a8ed268..71031ca 100644 --- a/snippets/base +++ b/snippets/base @@ -6,7 +6,6 @@ # V .. if set to 1, full command text is shown else short form is used # SUBDIRS .. list of subdirectories intended for make from actual directory # default_CONFIG .. list of default config assignments CONFIG_XXX=y/n ... -# PREFIX_DIR .. Prefix to directories in _compiled and _build. Used in config.omk. # We need to ensure definition of sources directory first ifndef SOURCES_DIR @@ -20,6 +19,7 @@ all: check-make-ver default #========================= # Include the config file +ifneq ($(READ_CONFIG_FILE),no) ifndef CONFIG_FILE CONFIG_FILE := $(MAKERULES_DIR)/config.omk endif @@ -33,20 +33,7 @@ ifneq ($(wildcard $(CONFIG_FILE)),) include $(CONFIG_FILE) CONFIG_FILE_OK = y endif - -ifeq ($(wildcard $(MAKERULES_DIR)/config.target),$(MAKERULES_DIR)/config.target) -$(error Please, rename $(MAKERULES_DIR)/config.target to config.omk!) -endif - -BUILD_DIR_NAME = _build$(addprefix /,$(PREFIX_DIR)) -COMPILED_DIR_NAME = _compiled$(addprefix /,$(PREFIX_DIR)) - -# FIXME: Is GROUP_DIR_NAME useful for non-linux rules? If not, move it -# to linux snippet. -ifndef GROUP_DIR_NAME -GROUP_DIR_NAME = nogroup -endif - +endif #$(READ_CONFIG_FILE) export SOURCES_DIR MAKERULES_DIR RELATIVE_DIR export CONFIG_FILE OMK_SERIALIZE_INCLUDED OMK_VERBOSE OMK_SILENT @@ -65,9 +52,6 @@ override BACK2TOP_DIR := $(shell echo $(RELATIVE_DIR)/ | sed -e 's_//_/_g' -e 's #$(warning MAKERULES_DIR = $(MAKERULES_DIR)) #$(warning RELATIVE_DIR = $(RELATIVE_DIR)) -LOCAL_BUILD_DIR=$(MAKERULES_DIR)/$(BUILD_DIR_NAME)/$(RELATIVE_DIR) -#$(warning LOCAL_BUILD_DIR = $(LOCAL_BUILD_DIR)) - #vpath %.c $(SOURCES_DIR) #vpath %.cc $(SOURCES_DIR) #vpath %.cxx $(SOURCES_DIR) @@ -117,15 +101,6 @@ distclean dist-clean: @$(QUIET_CMD_ECHO) " RM $(COMPILED_DIR_NAME) $(BUILD_DIR_NAME)" @rm -fr $(MAKERULES_DIR)/$(COMPILED_DIR_NAME) $(MAKERULES_DIR)/$(BUILD_DIR_NAME) -default-config: - @echo "# Start of OMK config file" > "$(CONFIG_FILE)-default" - @echo "# This file should not be altered manually" >> "$(CONFIG_FILE)-default" - @echo "# Overrides should be stored in file $(notdir $(CONFIG_FILE))" >> "$(CONFIG_FILE)-default" - @echo >> "$(CONFIG_FILE)-default" - @$(MAKE) --no-print-directory -C $(MAKERULES_DIR) \ - RELATIVE_DIR="" SOURCES_DIR=$(MAKERULES_DIR) \ - -f $(MAKERULES_DIR)/Makefile default-config-pass - # Common OMK templates # ==================== @@ -134,32 +109,20 @@ define mkdir_def [ -d $(1) ] || mkdir -p $(1) || exit 1 endef -# Syntax: $(call omk_pass_template,,[],[],[],[]) +# Syntax: $(call omk_pass_template,,,[],[],[]) define omk_pass_template .PHNOY: $(1) $(1)-local - -ifeq ($(3),) -$(1): cond := true -else -$(1): cond := $(3) -endif - -ifeq ($(4),) -$(1): build_dir := $(LOCAL_BUILD_DIR) -else -$(1): build_dir := $(4) -endif - $(1): - +@$(foreach dir,$(SUBDIRS),$(call mkdir_def,$$(build_dir)/$(dir)) ; \ - $(MAKE) SOURCES_DIR=$(SOURCES_DIR)/$(dir) \ - RELATIVE_DIR=$(RELATIVE_DIR)/$(dir) -C $$(build_dir)/$(dir) \ + +@$(foreach dir,$(SUBDIRS),$(call mkdir_def,$(2)/$(dir)) ; \ + $(MAKE) SOURCES_DIR=$(SOURCES_DIR)/$(dir) --no-print-directory \ + RELATIVE_DIR=$(RELATIVE_DIR)/$(dir) -C $(2)/$(dir) \ -f $(SOURCES_DIR)/$(dir)/Makefile $$@ || exit 1 ;) $(5) - +@$(call mkdir_def,$$(build_dir)) - +@if [ $$(cond) ]; then \ - $(MAKE) --no-print-directory -C $$(build_dir) \ - -f $(SOURCES_DIR)/Makefile $(2) $$(@:%=%-local); \ + @echo " MAKE $$@ in $(RELATIVE_DIR)" + +@if [ $(4) ] || [ -z "$(subst ",\",$(4))" ]; then \ + $(call mkdir_def,$(2)); \ + $(MAKE) --no-print-directory -C $(2) \ + -f $(SOURCES_DIR)/Makefile $(3) $$(@:%=%-local); \ fi endef @@ -167,7 +130,17 @@ endef # ======================= # DEFAULT CONFIG PASS +default-config: + @echo "# Start of OMK config file" > "$(CONFIG_FILE)-default" + @echo "# This file should not be altered manually" >> "$(CONFIG_FILE)-default" + @echo "# Overrides should be stored in file $(notdir $(CONFIG_FILE))" >> "$(CONFIG_FILE)-default" + @echo >> "$(CONFIG_FILE)-default" + @$(MAKE) --no-print-directory -C $(MAKERULES_DIR) \ + RELATIVE_DIR="" SOURCES_DIR=$(MAKERULES_DIR) \ + -f $(MAKERULES_DIR)/Makefile default-config-pass + $(eval $(call omk_pass_template,default-config-pass)) + default-config-pass-local: @echo Default config for $(RELATIVE_DIR) @echo "# Config for $(RELATIVE_DIR)" >> "$(CONFIG_FILE)-default" diff --git a/snippets/linux b/snippets/linux index 58c3053..e8698ff 100644 --- a/snippets/linux +++ b/snippets/linux @@ -27,51 +27,6 @@ #RTL_DIR := /home/cvs/ocera/ocera-build/kernel/rtlinux #CONFIG_RTLINUX = y #OCERA_DIR := $(shell ( cd -L $(MAKERULES_DIR)/../../.. ; pwd -L ) ) --include $(MAKERULES_DIR)/OCERA_TOP_DIR - -ifdef OCERA_DIR -ifeq ($(wildcard $(OCERA_DIR)/ocera.mk),) -$(warning "ocera.mk" file does not exist. Adapt Makefile.rules for standalone compilation) -$(warning (comment out definition of OCERA_DIR line and optionally select RTL_DIR) ) -$(error or go to the ocera/ directory and do 'make' to generate the "ocera.mk" file first, please) -endif -include $(OCERA_DIR)/ocera.mk -KERN_INCLUDE_DIR := $(OCERA_KERNEL_INCLUDES_DIR) -KERN_LIB_DIR := $(OCERA_KERNEL_LIBRARIES_DIR) -KERN_MODULES_DIR := $(OCERA_MODULES_DIR) -KERN_BUILD_DIR := $(BUILD_DIR)/kern/$(GROUP_DIR_NAME) -KERN_MODPOST_DIR := $(BUILD_DIR)/kern-modpost -USER_INCLUDE_DIR := $(OCERA_USER_INCLUDES_DIR) -USER_LIB_DIR := $(OCERA_USER_LIBRARIES_DIR) -USER_UTILS_DIR := $(TARGET_DIR)/usr/bin -USER_BIN_DIR := $(TARGET_DIR)/usr/bin -USER_BUILD_DIR := $(BUILD_DIR)/user/$(GROUP_DIR_NAME) -#LINUX_DIR := $(OCERA_DIR)/kernel/linux -#RTL_DIR := $(OCERA_DIR)/kernel/rtlinux -#CONFIG_FILE := $(OCERA_DIR)/emdebsys/.config -ifneq ($(wildcard $(CONFIG_FILE)),) # FIXME: What's this??? -#include $(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_BIN_DIR := $(MAKERULES_DIR)/$(COMPILED_DIR_NAME)/bin -USER_BUILD_DIR := $(MAKERULES_DIR)/$(BUILD_DIR_NAME)/user - -ifndef LINUX_VERSION -LINUX_VERSION=$(shell uname -r) -endif -ifndef LINUX_DIR -LINUX_DIR=/lib/modules/$(LINUX_VERSION)/build -endif -endif # OCERA_DIR # # Check and include real OCERA style Makefile.omk now # ifndef OMK_INCLUDED @@ -97,7 +52,12 @@ LOADLIBES += $(lib_LOADLIBES:%=-l%) LIB_CPPFLAGS += $(CPPFLAGS) LIB_CFLAGS += $(CFLAGS) -SOLIB_PICFLAGS += -shared -fpic +ifeq ($(TARGET_OS),win32) + SOLIB_EXT = dll +else + SOLIB_EXT = so + SOLIB_PICFLAGS += -fpic +endif ifndef RELATIVE_DIR RELATIVE_DIR := $(SOURCES_DIR:$(MAKERULES_DIR)%=%) @@ -112,6 +72,9 @@ override BACK2TOP_DIR := $(shell echo $(RELATIVE_DIR)/ | sed -e 's_//_/_g' -e 's #$(warning MAKERULES_DIR = $(MAKERULES_DIR)) #$(warning RELATIVE_DIR = $(RELATIVE_DIR)) +override RELATIVE_PREFIX := $(RELATIVE_DIR)/ +override RELATIVE_PREFIX := $(RELATIVE_PREFIX:/%=%) + #vpath %.c $(SOURCES_DIR) #vpath %.cc $(SOURCES_DIR) #vpath %.cxx $(SOURCES_DIR) @@ -122,16 +85,11 @@ srcdir = $(SOURCES_DIR) USER_OBJS_DIR = $(USER_BUILD_DIR)/$(RELATIVE_DIR) KERN_OBJS_DIR = $(KERN_BUILD_DIR)/$(RELATIVE_DIR) -.PHONY: dep subdirs clean clean-custom cleandepend default-config -.PHONY: check-make-ver check-dir include-pass library-pass binary-pass utils-pass -.PHONY: kernel-lib-pass kernel-pass kernel-mod-pass kernel-modpost-pass default-config-pass -.PHONY: check-dir-local include-pass-local library-pass-local binary-pass-local -.PHONY: utils-pass-local kernel-lib-pass-local kernel-mod-pass-local kernel-modpost-pass-local -.PHONY: default-config-pass-local +.PHONY: dep subdirs clean clean-custom cleandepend # Some support to serialize some targets for parallel make ifneq ($(OMK_SERIALIZE_INCLUDED),y) -include-pass: check-dir +include-pass: $(check-dir) library-pass: include-pass binary-pass utils-pass: library-pass kernel-lib-pass: include-pass @@ -142,13 +100,14 @@ kernel-pass: kernel-mod-pass kernel-modpost-pass OMK_SERIALIZE_INCLUDED = y endif -default: check-dir include-pass library-pass binary-pass utils-pass kernel-lib-pass kernel-pass - #===================================================================== # User-space rules and templates to compile programs, libraries etc. ifdef USER_RULE_TEMPLATES +USER_SOURCES2OBJS = .o/.c .o/.cc .o/.cxx .o/.o + +USER_SOURCES2OBJSLO = .lo/.c .lo/.cc .lo/.cxx .lo/.lo #%.lo: %.c # $(CC) -o $@ $(LCFLAGS) -c $< @@ -159,6 +118,7 @@ c_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ cc_o_COMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -DOMK_FOR_USER +idl_COMPILE = $(IDL_COMPILER) # Check GCC version for user build ifndef CC_MAJOR_VERSION @@ -172,10 +132,9 @@ CC_DEPFLAGS = -MT $@ -MD -MP -MF "$@.d.tmp" endif - - +# Syntax: $(call COMPILE_c_o_template,,,) define COMPILE_c_o_template -$(2): $(1) $(LOCAL_CONFIG_H) +$(2): $(1) $(LOCAL_CONFIG_H) $$(GEN_HEADERS) @$(QUIET_CMD_ECHO) " CC $$@" $(Q) if $$(c_o_COMPILE) $$(CC_DEPFLAGS) $(3) -o $$@ -c $$< ; \ then mv -f "$$@.d.tmp" "$$@.d" ; \ @@ -184,9 +143,9 @@ $(2): $(1) $(LOCAL_CONFIG_H) endef - +# Syntax: $(call COMPILE_cc_o_template,,,) define COMPILE_cc_o_template -$(2): $(1) $(LOCAL_CONFIG_H) +$(2): $(1) $(LOCAL_CONFIG_H) $$(GEN_HEADERS) @$(QUIET_CMD_ECHO) " CXX $$@" $(Q) if $$(cc_o_COMPILE) $$(CC_DEPFLAGS) $(3) -o $$@ -c $$< ; \ then mv -f "$$@.d.tmp" "$$@.d" ; \ @@ -195,12 +154,60 @@ $(2): $(1) $(LOCAL_CONFIG_H) endef +# Syntax: $(call COMPILE_S_o_template,,,) +define COMPILE_S_o_template +$(2): $(1) $(LOCAL_CONFIG_H) $$(GEN_HEADERS) + @$(QUIET_CMD_ECHO) " AS $$@" + $(Q) if $$(S_o_COMPILE) -D__ASSEMBLY__ $$(CC_DEPFLAGS) $(3) -o $$@ -c $$< ; \ + then if [ -e "$$@.d.tmp" ] ; then mv -f "$$@.d.tmp" "$$@.d" ; fi ; \ + else rm -f "$$@.d.tmp" ; exit 1; \ + fi +endef + + +# Syntax: $(call CMETRIC_o_h_template,,) +define CMETRIC_o_h_template +$(2): $(1) + @$(QUIET_CMD_ECHO) " CMETRIC $$@" + $(Q)if [ -n `dirname $$@` ] ; then \ + if [ ! -e `dirname $$@` ] ; then \ + mkdir -p `dirname $$@` ; fi ; fi + $(Q)echo >$$@ '/* Automatically generated from $$< */' + $(Q)echo >>$$@ '/* Conditionals to control compilation */' + $(Q)set -o pipefail ; $(NM) $$< \ + | sed -n 's/^ *0*\(0[0-9A-Fa-f]*\) *A *_cmetric2cond_\([A-Za-z_0-9]*\) */#define \2 0x\1/p' \ + | sort >>$$@ + $(Q)echo >>$$@ '/* Defines from the values defined to symbols */' + $(Q)set -o pipefail ; $(NM) $$< \ + | sed -n 's/^ *0*\(0[0-9A-Fa-f]*\) *A *_cmetric2def_\([A-Za-z_0-9]*\) */#define \2 0x\1/p' \ + | sort >>$$@ +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) +endef + +# Syntax: $(call PROGRAM_template,,,,) define PROGRAM_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 := $$(sort $$($(1)_OBJS)) + +USER_IDLS += $$($(1)_SERVER_IDL) $$($(1)_CLIENT_IDL) $$($(1)_IDL) +$(1)_GEN_SOURCES += $$(filter %.c,$$($(1)_SERVER_IDL:%.idl=%-skels.c)) +$(1)_GEN_SOURCES += $$(filter %.c,$$($(1)_SERVER_IDL:%.idl=%-common.c)) +$(1)_GEN_SOURCES += $$(filter %.c,$$($(1)_CLIENT_IDL:%.idl=%-stubs.c)) +$(1)_GEN_SOURCES += $$(filter %.c,$$($(1)_CLIENT_IDL:%.idl=%-common.c)) +$(1)_GEN_SOURCES += $$(filter %.c,$$($(1)_IDL:%.idl=%.c)) +USER_GEN_SOURCES += $$($(1)_GEN_SOURCES) + +$(foreach x, $(USER_SOURCES2OBJS), +$(1)_OBJS += $$(patsubst %$(notdir $(x)),%$(dir $(x)),$$(filter %$(notdir $(x)),\ + $$($(1)_SOURCES) $$($(1)_GEN_SOURCES))) +) +$(1)_OBJS := $$(sort $$($(1)_OBJS:%/=%)) USER_OBJS += $$($(1)_OBJS) USER_SOURCES += $$($(1)_SOURCES) @@ -215,12 +222,22 @@ $(2)/$(1): $$($(1)_OBJS) endef - +# Syntax: $(call LIBRARY_template,) define LIBRARY_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 := $$(sort $$($(1)_OBJS)) + +USER_IDLS += $$($(1)_SERVER_IDL) $$($(1)_CLIENT_IDL) $$($(1)_IDL) +$(1)_GEN_SOURCES += $$(filter %.c,$$($(1)_SERVER_IDL:%.idl=%-skels.c)) +$(1)_GEN_SOURCES += $$(filter %.c,$$($(1)_SERVER_IDL:%.idl=%-common.c)) +$(1)_GEN_SOURCES += $$(filter %.c,$$($(1)_CLIENT_IDL:%.idl=%-stubs.c)) +$(1)_GEN_SOURCES += $$(filter %.c,$$($(1)_CLIENT_IDL:%.idl=%-common.c)) +$(1)_GEN_SOURCES += $$(filter %.c,$$($(1)_IDL:%.idl=%.c)) +USER_GEN_SOURCES += $$($(1)_GEN_SOURCES) + +$(foreach x, $(USER_SOURCES2OBJS), +$(1)_OBJS += $$(patsubst %$(notdir $(x)),%$(dir $(x)),$$(filter %$(notdir $(x)),\ + $$($(1)_SOURCES) $$($(1)_GEN_SOURCES))) +) +$(1)_OBJS := $$(sort $$($(1)_OBJS:%/=%)) USER_OBJS += $$($(1)_OBJS) USER_SOURCES += $$($(1)_SOURCES) @@ -231,29 +248,55 @@ $(USER_LIB_DIR)/lib$(1).a: $$($(1)_OBJS) endef - +# Syntax: $(call SOLIB_template,) define SOLIB_template -$(1)_OBJSLO += $$(filter %.lo,$$($(1)_SOURCES:%.c=%.lo)) -$(1)_OBJSLO += $$(filter %.lo,$$($(1)_SOURCES:%.cc=%.lo)) -$(1)_OBJSLO += $$(filter %.lo,$$($(1)_SOURCES:%.cxx=%.lo)) -$(1)_OBJSLO := $$(sort $$($(1)_OBJSLO)) + +USER_IDLS += $$($(1)_SERVER_IDL) $$($(1)_CLIENT_IDL) $$($(1)_IDL) +$(1)_GEN_SOURCES += $$(filter %.c,$$($(1)_SERVER_IDL:%.idl=%-skels.c)) +$(1)_GEN_SOURCES += $$(filter %.c,$$($(1)_SERVER_IDL:%.idl=%-common.c)) +$(1)_GEN_SOURCES += $$(filter %.c,$$($(1)_CLIENT_IDL:%.idl=%-stubs.c)) +$(1)_GEN_SOURCES += $$(filter %.c,$$($(1)_CLIENT_IDL:%.idl=%-common.c)) +$(1)_GEN_SOURCES += $$(filter %.c,$$($(1)_IDL:%.idl=%.c)) +SOLIB_GEN_SOURCES += $$($(1)_GEN_SOURCES) + +$(foreach x, $(USER_SOURCES2OBJSLO), +$(1)_OBJSLO += $$(patsubst %$(notdir $(x)),%$(dir $(x)),$$(filter %$(notdir $(x)),\ + $$($(1)_SOURCES) $$($(1)_GEN_SOURCES))) +) +$(1)_OBJSLO := $$(sort $$($(1)_OBJSLO:%/=%)) SOLIB_OBJS += $$($(1)_OBJSLO) SOLIB_SOURCES += $$($(1)_SOURCES) -$(USER_LIB_DIR)/lib$(1).so: $$($(1)_OBJSLO) +$(USER_LIB_DIR)/lib$(1).$(SOLIB_EXT): $$($(1)_OBJSLO) @$(QUIET_CMD_ECHO) " LINK $$@" - $(Q) $(LD) --shared --soname=lib$(1).so -o $$@ $$^ + $(Q) $(LD) --shared --soname=lib$(1).$(SOLIB_EXT) -o $$@ $$^ endef -library-pass-local: $(lib_LIBRARIES:%=$(USER_LIB_DIR)/lib%.a) $(shared_LIBRARIES:%=$(USER_LIB_DIR)/lib%.so) +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)) binary-pass-local: $(bin_PROGRAMS:%=$(USER_BIN_DIR)/%) utils-pass-local: $(utils_PROGRAMS:%=$(USER_UTILS_DIR)/%) +# Special rules for CMETRIC generated headers + +$(foreach cmetrh,$(cmetric_include_HEADERS),$(eval $(call COMPILE_c_o_template,\ + $(SOURCES_DIR)/$($(basename $(notdir $(cmetrh)))_CMETRIC_SOURCES),\ + $($(basename $(notdir $(cmetrh)))_CMETRIC_SOURCES:%.c=%.o),))) +$(foreach cmetrh,$(cmetric_include_HEADERS),$(eval $(call CMETRIC_o_h_template,\ + $($(basename $(notdir $(cmetrh)))_CMETRIC_SOURCES:%.c=%.o),\ + $(addprefix $(USER_INCLUDE_DIR)/,$(cmetrh))))) + +GEN_HEADERS+=$(cmetric_include_HEADERS:%=$(USER_INCLUDE_DIR)/%) + +GEN_HEADERS+=$(filter %.h,$(USER_IDLS:%.idl=%.h)) + +# Generate rules for compilation of programs and libraries + $(foreach prog,$(utils_PROGRAMS),$(eval $(call PROGRAM_template,$(prog),$(USER_UTILS_DIR)))) $(foreach prog,$(bin_PROGRAMS),$(eval $(call PROGRAM_template,$(prog),$(USER_BIN_DIR)))) @@ -323,6 +366,9 @@ KERN_AR = $(LINUX_AR) else KERN_AR = $(AR) endif +ifeq ($(LINUX_QUOTE_MODNAME),y) +KERN_MQ=\" +endif endif # CONFIG_RTLINUX KERN_LOADLIBES += -L$(KERN_LIB_DIR) @@ -360,7 +406,7 @@ define COMPILE_c_o_kern_template $(2): $(1) $(LOCAL_CONFIG_H) @$(QUIET_CMD_ECHO) " CC [K] $$@" - $(Q) if $$(c_o_kern_COMPILE) $$(kern_CC_DEPFLAGS) $(3) -DKBUILD_BASENAME=$(notdir $(basename $(1))) \ + $(Q) if $$(c_o_kern_COMPILE) $$(kern_CC_DEPFLAGS) $(3) -D"KBUILD_BASENAME=$(KERN_MQ)$(notdir $(basename $(1)))$(KERN_MQ)" \ -o $$@ -c $$< ; \ then mv -f "$$@.d.tmp" "$$@.d" ; \ else rm -f "$$@.d.tmp" ; exit 1; \ @@ -373,7 +419,7 @@ define COMPILE_cc_o_kern_template $(2): $(1) $(LOCAL_CONFIG_H) @$(QUIET_CMD_ECHO) " CXX [K] $$@" - $(Q) if $$(cc_o_kern_COMPILE) $$(kern_CC_DEPFLAGS) $(3) -DKBUILD_BASENAME=$(notdir $(basename $(1))) \ + $(Q) if $$(cc_o_kern_COMPILE) $$(kern_CC_DEPFLAGS) $(3) -D"KBUILD_BASENAME=$(KERN_MQ)$(notdir $(basename $(1)))$(KERN_MQ)" \ -o $$@ -c $$< ; \ then mv -f "$$@.d.tmp" "$$@.d" ; \ else rm -f "$$@.d.tmp" ; exit 1; \ @@ -482,7 +528,9 @@ 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) -DKBUILD_BASENAME=$(1) -DKBUILD_MODNAME=$(1) -o $(1).mod.o -c $(1).mod.c + $(Q) $$(cc_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 $$@ endef @@ -507,8 +555,8 @@ endif #===================================================================== -$(eval $(call omk_pass_template, kernel-lib-pass,KERN_RULE_TEMPLATES=y,-n "$(kernel_LIBRARIES)$(rtlinux_LIBRARIES)",$(KERN_OBJS_DIR))) -$(eval $(call omk_pass_template, kernel-mod-pass,KERN_RULE_TEMPLATES=y,-n "$(kernel_MODULES)$(rtlinux_MODULES)",$(KERN_OBJS_DIR))) +$(eval $(call omk_pass_template, kernel-lib-pass,$(KERN_OBJS_DIR),KERN_RULE_TEMPLATES=y,-n "$(kernel_LIBRARIES)$(rtlinux_LIBRARIES)")) +$(eval $(call omk_pass_template, kernel-mod-pass,$(KERN_OBJS_DIR),KERN_RULE_TEMPLATES=y,-n "$(kernel_MODULES)$(rtlinux_MODULES)")) kernel-modpost-pass: +@if [ -e "$(KERN_MODPOST_DIR)/module-changes" -o -e "$(KERN_MODPOST_DIR)/modpost-running" ] ; \ @@ -522,27 +570,34 @@ define qt_subpass if [ "$@" != "binary-pass" ] ; then exit 0 ; fi ; \ if [ ! -e $(SOURCES_DIR)/$(dir)/Makefile ] ; then \ ( cd $(SOURCES_DIR)/$(dir) ; $$QTDIR/bin/qmake TOP_DIR=$(MAKERULES_DIR) \ - RELATIVE_DIR=$(RELATIVE_DIR)/$(dir) QTDIR=$(QTDIR) CC=$(CC) \ + RELATIVE_DIR=$(RELATIVE_PREFIX)$(dir) QTDIR=$(QTDIR) CC=$(CC) \ CXX=$(CXX) || exit 1 ;) ; fi ; \ $(MAKE) SOURCES_DIR=$(SOURCES_DIR)/$(dir) \ - RELATIVE_DIR=$(RELATIVE_DIR)/$(dir) -C $(SOURCES_DIR)/$(dir) \ + RELATIVE_DIR=$(RELATIVE_PREFIX)$(dir) -C $(SOURCES_DIR)/$(dir) \ -f $(SOURCES_DIR)/$(dir)/Makefile || exit 1 ;) endef -$(eval $(call omk_pass_template, library-pass,USER_RULE_TEMPLATES=y,-n "$(lib_LIBRARIES)$(shared_LIBRARIES)",$(USER_OBJS_DIR))) -$(eval $(call omk_pass_template, utils-pass,USER_RULE_TEMPLATES=y,-n "$(utils_PROGRAMS)",$(USER_OBJS_DIR))) -$(eval $(call omk_pass_template, binary-pass,USER_RULE_TEMPLATES=y,\ - -n "$(bin_PROGRAMS)$(QT_SUBDIRS)",$(USER_OBJS_DIR),$(qt_subpass)) +$(eval $(call omk_pass_template, library-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,-n "$(lib_LIBRARIES)$(shared_LIBRARIES)")) +$(eval $(call omk_pass_template, utils-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,-n "$(utils_PROGRAMS)")) +$(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,-n "$(bin_PROGRAMS)$(QT_SUBDIRS)",$(qt_subpass))) -OTHER_PASSES = dep clean install check-dir default-config-pass -$(eval $(call omk_pass_template,$(OTHER_PASSES))) +OTHER_PASSES = dep clean install include-pass +$(eval $(call omk_pass_template,$(OTHER_PASSES), $(USER_OBJS_DIR))) # FIXME: Are the 'dep' and 'install' passes usefull? dep-local: -check-dir-local: - @$(call mkdir_def,$(USER_OBJS_DIR)) - @$(call mkdir_def,$(KERN_OBJS_DIR)) +# Create directories only for the first time +ifndef CHECK_DIR_DONE +check-dir = check-dir +CHECK_DIR_DONE = y +endif +export CHECK_DIR_DONE + +check-dir: + echo aaaaaaaaaaaaaa + @$(call mkdir_def,$(USER_BUILD_DIR)) + @$(call mkdir_def,$(KERN_BUILD_DIR)) @$(call mkdir_def,$(USER_INCLUDE_DIR)) @$(call mkdir_def,$(KERN_INCLUDE_DIR)) @$(call mkdir_def,$(USER_LIB_DIR)) @@ -581,6 +636,8 @@ ifdef USER_RULE_TEMPLATES USER_SOURCES := $(sort $(USER_SOURCES)) +USER_GEN_SOURCES := $(sort $(USER_GEN_SOURCES)) + #$(warning USER_SOURCES = $(USER_SOURCES)) $(foreach src,$(filter %.c,$(USER_SOURCES)),$(eval $(call COMPILE_c_o_template,$(SOURCES_DIR)/$(src),$(src:%.c=%.o),))) @@ -589,11 +646,16 @@ $(foreach src,$(filter %.cc,$(USER_SOURCES)),$(eval $(call COMPILE_cc_o_template $(foreach src,$(filter %.cxx,$(USER_SOURCES)),$(eval $(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cxx=%.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)) +SOLIB_GEN_SOURCES := $(sort $(SOLIB_GEN_SOURCES)) + #$(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)))) @@ -601,6 +663,14 @@ $(foreach src,$(filter %.cc,$(SOLIB_SOURCES)),$(eval $(call COMPILE_cc_o_templat $(foreach src,$(filter %.cxx,$(SOLIB_SOURCES)),$(eval $(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cxx=%.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)) + +$(foreach src,$(filter %.idl,$(USER_IDLS)),$(eval $(call COMPILE_idl_template,$(SOURCES_DIR)/$(src),$(src:%.idl=%)))) + endif ifdef KERN_RULE_TEMPLATES @@ -617,6 +687,12 @@ $(foreach src,$(filter %.cxx,$(KERN_SOURCES)),$(eval $(call COMPILE_cc_o_kern_te endif +# Special rules for configuration exported headers + +$(foreach confh,$(config_include_HEADERS),$(eval $(call BUILD_CONFIG_H_template,$(addprefix $(USER_INCLUDE_DIR)/,$(confh)),$(basename $(notdir $(confh)))_DEFINES,\ +_$(basename $(notdir $(confh)))_H \ +))) + clean-local: clean-custom @echo Cleaning in $(KERN_OBJS_DIR) and $(USER_OBJS_DIR) @@ -630,7 +706,11 @@ clean-local: clean-custom @if [ -e $(KERN_LIB_DIR)/kernel.mk ] ; then \ touch -t 200001010101 $(KERN_LIB_DIR)/kernel.mk ; \ fi + @$(foreach confh,$(addprefix $(USER_INCLUDE_DIR)/,$(config_include_HEADERS)),\ + if [ -e $(confh) ] ; then touch -t 200001010101 $(confh) ; fi ; \ + ) +default: $(check-dir) include-pass library-pass binary-pass utils-pass kernel-lib-pass kernel-pass # Local Variables: # mode:makefile diff --git a/snippets/linux-setup b/snippets/linux-setup new file mode 100644 index 0000000..8bfa6be --- /dev/null +++ b/snippets/linux-setup @@ -0,0 +1,55 @@ +-include $(MAKERULES_DIR)/OCERA_TOP_DIR + +BUILD_DIR_NAME = _build +COMPILED_DIR_NAME = _compiled +ifndef GROUP_DIR_NAME +GROUP_DIR_NAME = nogroup +endif + +ifdef OCERA_DIR +ifeq ($(wildcard $(OCERA_DIR)/ocera.mk),) +$(warning "ocera.mk" file does not exist. Adapt Makefile.rules for standalone compilation) +$(warning (comment out definition of OCERA_DIR line and optionally select RTL_DIR) ) +$(error or go to the ocera/ directory and do 'make' to generate the "ocera.mk" file first, please) +endif +include $(OCERA_DIR)/ocera.mk +KERN_INCLUDE_DIR := $(OCERA_KERNEL_INCLUDES_DIR) +KERN_LIB_DIR := $(OCERA_KERNEL_LIBRARIES_DIR) +KERN_MODULES_DIR := $(OCERA_MODULES_DIR) +KERN_BUILD_DIR := $(BUILD_DIR)/kern/$(GROUP_DIR_NAME) +KERN_MODPOST_DIR := $(BUILD_DIR)/kern-modpost +USER_INCLUDE_DIR := $(OCERA_USER_INCLUDES_DIR) +USER_LIB_DIR := $(OCERA_USER_LIBRARIES_DIR) +USER_UTILS_DIR := $(TARGET_DIR)/usr/bin +USER_BIN_DIR := $(TARGET_DIR)/usr/bin +USER_BUILD_DIR := $(BUILD_DIR)/user/$(GROUP_DIR_NAME) +#LINUX_DIR := $(OCERA_DIR)/kernel/linux +#RTL_DIR := $(OCERA_DIR)/kernel/rtlinux +#CONFIG_FILE := $(OCERA_DIR)/emdebsys/.config +ifneq ($(wildcard $(CONFIG_FILE)),) # FIXME: What's this??? +#include $(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_BIN_DIR := $(MAKERULES_DIR)/$(COMPILED_DIR_NAME)/bin +USER_BUILD_DIR := $(MAKERULES_DIR)/$(BUILD_DIR_NAME)/user + +ifndef LINUX_VERSION +LINUX_VERSION=$(shell uname -r) +endif +ifndef LINUX_DIR +LINUX_DIR=/lib/modules/$(LINUX_VERSION)/build +endif +endif # OCERA_DIR + +# Local Variables: +# mode:makefile +# End: diff --git a/snippets/sysless b/snippets/sysless index 808556b..f0e03fe 100644 --- a/snippets/sysless +++ b/snippets/sysless @@ -15,16 +15,27 @@ # link_VARIANTS .. list of ld script suffixes (after hypen `-') that # should be used for linking (e.g. ram flash). If this is not # specified, then the value of DEFAULT_LD_SCRIPT_VARIANT from config.target is used. +# PREFIX_DIR .. Prefix to directories in _compiled and _build. Used in config.omk. # Some support to serialize some targets for parallel make ifneq ($(OMK_SERIALIZE_INCLUDED),y) -include-pass: check-dir +include-pass: $(check-dir) library-pass: include-pass binary-pass utils-pass: library-pass OMK_SERIALIZE_INCLUDED = y endif +ifeq ($(wildcard $(MAKERULES_DIR)/config.target),$(MAKERULES_DIR)/config.target) +$(error Please, rename $(MAKERULES_DIR)/config.target to config.omk!) +endif + +BUILD_DIR_NAME = _build$(addprefix /,$(PREFIX_DIR)) +COMPILED_DIR_NAME = _compiled$(addprefix /,$(PREFIX_DIR)) + +LOCAL_BUILD_DIR=$(MAKERULES_DIR)/$(BUILD_DIR_NAME)/$(RELATIVE_DIR) +#$(warning LOCAL_BUILD_DIR = $(LOCAL_BUILD_DIR)) + #===================================================================== # Common utility rules @@ -101,8 +112,6 @@ $(foreach src,$(filter %.cc,$(SOLIB_SOURCES)),$(eval $(call COMPILE_cc_o_templat $(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)))) -$(warning $(lib_LIBRARIES)) - library-pass-local: $(addprefix $(USER_INCLUDE_DIR)/,$(cmetric_include_HEADERS)) \ $(lib_LIBRARIES:%=$(LIB_DIR)/lib%.a) $(shared_LIBRARIES:%=$(LIB_DIR)/lib%.so) \ $(addprefix $(LIB_DIR)/,$(lib_OBJS)) @@ -197,32 +206,25 @@ run: run-$(firstword $(link_VARIANTS)) #===================================================================== # Generate pass rules from generic templates -OTHER_PASSES = dep clean install check-dir +OTHER_PASSES = dep clean install -$(eval $(call omk_pass_template, include-pass,,-n "$(include_HEADERS)$(nobase_include_HEADERS)$(renamed_include_HEADERS)$(lib_LDSCRIPTS)")) -$(eval $(call omk_pass_template,library-pass,TARGET_RULE_TEMPLATES=y, -n "$(lib_LIBRARIES)$(shared_LIBRARIES)$(lib_OBJS)")) -$(eval $(call omk_pass_template,binary-pass,TARGET_RULE_TEMPLATES=y, -n "$(bin_PROGRAMS)")) -$(eval $(call omk_pass_template, utils-pass,HOST_RULE_TEMPLATES=y,-n "$(utils_PROGRAMS)")) +$(eval $(call omk_pass_template, include-pass, $(LOCAL_BUILD_DIR),,-n "$(include_HEADERS)$(nobase_include_HEADERS)$(renamed_include_HEADERS)$(lib_LDSCRIPTS)")) +$(eval $(call omk_pass_template, library-pass, $(LOCAL_BUILD_DIR),TARGET_RULE_TEMPLATES=y, -n "$(lib_LIBRARIES)$(shared_LIBRARIES)$(lib_OBJS)")) +$(eval $(call omk_pass_template, binary-pass, $(LOCAL_BUILD_DIR),TARGET_RULE_TEMPLATES=y, -n "$(bin_PROGRAMS)")) +$(eval $(call omk_pass_template, utils-pass, $(LOCAL_BUILD_DIR),HOST_RULE_TEMPLATES=y,-n "$(utils_PROGRAMS)")) -$(eval $(call omk_pass_template,$(OTHER_PASSES),)) +$(eval $(call omk_pass_template,$(OTHER_PASSES),$(LOCAL_BUILD_DIR))) dep-local: -check-dir-local: - @$(call mkdir_def,$(USER_OBJS_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)) - install-local: # TODO: Check modification date of changed header files. If it is # newer that in source dir, show a warning. include-pass-local: - @$(call mkdir_def,$(USER_INCLUDE_DIR)) +# @$(call mkdir_def,$(USER_INCLUDE_DIR)) @$(foreach f, $(include_HEADERS), cmp --quiet $(SOURCES_DIR)/$(f) $(USER_INCLUDE_DIR)/$(notdir $(f)) \ || cp $(CP_FLAGS) $(SOURCES_DIR)/$(f) $(USER_INCLUDE_DIR)/$(notdir $(f)) || exit 1 ; ) @$(foreach f, $(nobase_include_HEADERS), cmp --quiet $(SOURCES_DIR)/$(f) $(USER_INCLUDE_DIR)/$(f) \ @@ -243,8 +245,21 @@ clean-local: clean-custom $(USER_OBJS_DIR)/*.map \ $(LOCAL_CONFIG_H:%=$(USER_OBJS_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)) + +# Create directories only for the first time +ifndef CHECK_DIR_DONE +check-dir = check-dir +CHECK_DIR_DONE = y +endif +export CHECK_DIR_DONE + # Which passes to pass -default: check-dir include-pass library-pass binary-pass utils-pass +default: $(check-dir) include-pass library-pass binary-pass utils-pass ETAGS = etags -R -f $(MAKERULES_DIR)/TAGS .PHONY: TAGS