X-Git-Url: http://rtime.felk.cvut.cz/gitweb/omk.git/blobdiff_plain/ebe8d74fc83bbfd7f102dd060a5e685969da6f76..639651630cd8dbab7b757afdea845eb66b99c564:/snippets/linux.omk diff --git a/snippets/linux.omk b/snippets/linux.omk index a9635f5..4b6271e 100644 --- a/snippets/linux.omk +++ b/snippets/linux.omk @@ -12,14 +12,15 @@ # test_PROGRAMS .. list of the testing programs # bin_SCRIPTS .. list of scripts to be copied to _compiled/bin # xxx_SOURCES .. list of specific target sources +# xxx_GEN_SOURCES .. list of specific target sources that are generated in the build directory # 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 # -# AM_CFLAGS .. C compiler flags -# AM_CXXFLAGS .. C++ compiler flags -# AM_CPPFLAGS .. C preprocessor flags +# OMK_CFLAGS .. C compiler flags +# OMK_CXXFLAGS .. C++ compiler flags +# OMK_CPPFLAGS .. C preprocessor flags # LDFLAGS .. linker flags for programs linking BUILD_DIR_NAME = _build @@ -54,21 +55,18 @@ export BUILD_OS LOCAL_BUILD_DIR = $(USER_OBJS_DIR) -# Assign default values to CFLAGS variable. If the variable is defined +# Assign default values to OMK_CFLAGS variable. If the variable is defined # earlier (i.g. in config.omk), it is not overriden here. -CFLAGS ?= -O2 -Wall -CXXFLAGS ?= -O2 -Wall +OMK_CFLAGS ?= -O2 -Wall +OMK_CXXFLAGS ?= -O2 -Wall -CPPFLAGS += -I $(USER_INCLUDE_DIR) +INCLUDES += -I $(USER_INCLUDE_DIR) LOADLIBES += -L$(USER_LIB_DIR) LOADLIBES += $(lib_LOADLIBES:%=-l%) -LIB_CPPFLAGS += $(CPPFLAGS) -LIB_CFLAGS += $(CFLAGS) - ifeq ($(TARGET_OS),win32) EXE_SUFFIX = .exe SOLIB_EXT = dll @@ -102,21 +100,14 @@ endif ifdef USER_RULE_TEMPLATES -USER_SOURCES2OBJS = .o/.c .o/.cc .o/.cxx .o/.cpp .o/.S .o/.o - -USER_SOURCES2OBJSLO = .lo/.c .lo/.cc .lo/.cxx .lo/.cpp .lo/.S .lo/.lo - -#%.lo: %.c -# $(CC) -o $@ $(LCFLAGS) -c $< +c_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(OMK_CPPFLAGS) \ + $(CPPFLAGS) $(OMK_CFLAGS) $(CFLAGS) -DOMK_FOR_USER -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) $(OMK_CPPFLAGS) \ + $(CPPFLAGS) $(OMK_CFLAGS) $(CFLAGS) $(OMK_CXXFLAGS) $(CXXFLAGS) -DOMK_FOR_USER -cc_o_COMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -DOMK_FOR_USER - -S_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASFLAGS) -DOMK_FOR_USER +S_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(OMK_CPPFLAGS) \ + $(CPPFLAGS) $(OMK_CFLAGS) $(CFLAGS) $(ASFLAGS) -DOMK_FOR_USER idl_COMPILE = $(IDL_COMPILER) @@ -134,99 +125,117 @@ endif # Syntax: $(call COMPILE_c_o_template,,,) define COMPILE_c_o_template +ifeq ($$($(2)_C_TARGET),) +$(2)_C_TARGET=1 $(2): $(1) $$(GEN_HEADERS) @$(QUIET_CMD_ECHO) " CC $$@" $(Q) if $$(c_o_COMPILE) $$(CC_DEPFLAGS) $(3) -o $$@ -c $$< ; \ then mv -f "$$@.d.tmp" "$$@.d" ; \ else rm -f "$$@.d.tmp" ; exit 1; \ fi +endif endef # Syntax: $(call COMPILE_cc_o_template,,,) define COMPILE_cc_o_template +ifeq ($$($(2)_CC_TARGET),) +$(2)_CC_TARGET=1 $(2): $(1) $$(GEN_HEADERS) @$(QUIET_CMD_ECHO) " CXX $$@" $(Q) if $$(cc_o_COMPILE) $$(CC_DEPFLAGS) $(3) -o $$@ -c $$< ; \ then mv -f "$$@.d.tmp" "$$@.d" ; \ else rm -f "$$@.d.tmp" ; exit 1; \ fi +endif endef # Syntax: $(call COMPILE_S_o_template,,,) define COMPILE_S_o_template +ifeq ($$($(2)_S_TARGET),) +$(2)_S_TARGET=1 $(2): $(1) $$(GEN_HEADERS) @$(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 +endif endef -NM ?= nm - -# 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 >$$@.tmp '/* Automatically generated from $$< */' - $(Q)echo >>$$@.tmp '/* Conditionals to control compilation */' -# Bellow, the tricks with redirection are for shells without set -o pipefail -# (see http://www.mail-archive.com/dash@vger.kernel.org/msg00149.html) - $(Q)exec 3>&1; status=`exec 4>&1 >&3; { $(NM) $$<; echo $$$$? >&4; }\ - | $(SED4OMK) -n 's/^ *0*\(0[0-9A-Fa-f]*\) *A *_cmetric2cond_\([A-Za-z_0-9]*\) */#define \2 0x\1/p' \ - | sort >>$$@.tmp` && exit $$$$status - $(Q)echo >>$$@.tmp '/* Defines from the values defined to symbols in hexadecimal format */' - $(Q)exec 3>&1; status=`exec 4>&1 >&3; { $(NM) $$<; echo $$$$? >&4; }\ - | $(SED4OMK) -n 's/^ *0*\(0[0-9A-Fa-f]*\) *A *_cmetric2def_\([A-Za-z_0-9]*\) */#define \2 0x\1/p' \ - | sort >>$$@.tmp` && exit $$$$status - $(Q)echo >>$$@.tmp '/* Defines from the values defined to symbols in decimal format */' - $(Q)exec 3>&1; status=`exec 4>&1 >&3; { $(NM) -td $$<; echo $$$$? >&4; }\ - | $(SED4OMK) -n 's/^ *0*\(0\|[1-9][0-9]*\) *A *_cmetric2defdec_\([A-Za-z_0-9]*\) */#define \2 \1/p' \ - | sort >>$$@.tmp` && exit $$$$status - $(Q)mv $$@.tmp $$@ +# Syntax: $(call COMPILE_s_o_template,,,) +define COMPILE_s_o_template +ifeq ($$($(2)_s_TARGET),) +$(2)_s_TARGET=1 +$(2): $(1) $$(GEN_HEADERS) + @$(QUIET_CMD_ECHO) " AS $$@" + $(Q)$$(S_o_COMPILE) $(3) -o $$@ -c $$< +endif endef +# Syntax: $(call COMPILE_idl_template,,) +define COMPILE_idl_template +ifeq ($$($(2)_IDL_TARGET),) +$(2)_IDL_TARGET=1 +GEN_HEADERS+=$(filter %.h,$(notdir $(1:%.idl=%.h))) # Do we need this global variable? -define COMPILE_idl_template $(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) +endif endef +# GCC recognizes files matching this pattern as C++ +CXX_PATTERN = %.cc %.cp %.cxx %.cpp %.CPP %.c++ %.C + +# Syntax: $(call COMPILE_templates,,,) +# Note: The newlines after $(call ) are IMPORTANT!!! +define COMPILE_templates +$(foreach src,$(filter %.c,$(1)),$(call COMPILE_c_o_template,$(src),$(3)$(notdir $(src:%.c=%$(2))),) +) +$(foreach src,$(filter $(CXX_PATTERN),$(1)),$(call COMPILE_cc_o_template,$(src),$(3)$(notdir $(basename $(src))$(2)),) +) +$(foreach src,$(filter %.S,$(1)),$(call COMPILE_S_o_template,$(src),$(3)$(notdir $(basename $(src))$(2)),) +) +$(foreach src,$(filter %.s,$(1)),$(call COMPILE_s_o_template,$(src),$(3)$(notdir $(basename $(src))$(2)),) +) +endef + +TARGET_IDL_SOURCES = $(filter %.c,$($(1)_SERVER_IDL:%.idl=%-skels.c)) \ + $(filter %.c,$($(1)_SERVER_IDL:%.idl=%-common.c)) \ + $(filter %.c,$($(1)_CLIENT_IDL:%.idl=%-stubs.c)) \ + $(filter %.c,$($(1)_CLIENT_IDL:%.idl=%-common.c)) \ + $(filter %.c,$($(1)_IDL:%.idl=%.c)) +TARGET_SOURCES = $($(1)_SOURCES) $($(1)_GEN_SOURCES) $(TARGET_IDL_SOURCES) +TARGET_SOURCES_ABS = $($(1)_SOURCES:%=$(SOURCES_DIR)/%) $($(1)_GEN_SOURCES) $(TARGET_IDL_SOURCES) +TARGET_OBJ_PREFIX = $(if $($(1)_CFLAGS)$($(1)_CXXFLAGS)$($(1)_CPPFLAGS),$(1)-,) +TARGET_OBJS = $(sort $(addprefix $(TARGET_OBJ_PREFIX),$(addsuffix .o,$(basename $(notdir $(TARGET_SOURCES)))))) +TARGET_LOBJS = $(sort $(addprefix $(TARGET_OBJ_PREFIX),$(addsuffix .lo,$(basename $(notdir $(TARGET_SOURCES)))))) +TARGET_IDLS = $($(1)_SERVER_IDL) $($(1)_CLIENT_IDL) $($(1)_IDL) +TARGET_CFLAGS = $(if $($(1)_CFLAGS),$($(1)_CFLAGS),$(OMK_CFLAGS)) +TARGET_CXXFLAGS = $(if $($(1)_CXXFLAGS),$($(1)_CXXFLAGS),$(OMK_CXXFLAGS)) +TARGET_CPPFLAGS = $(if $($(1)_CPPFLAGS),$($(1)_CPPFLAGS),$(OMK_CPPFLAGS)) # Syntax: $(call PROGRAM_template,,,,) define PROGRAM_template +$(foreach idl,$(TARGET_IDLS),$(call COMPILE_idl_template,$(SOURCES_DIR)/$(idl),$(idl:%.idl=%))) -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) +$(call COMPILE_templates,$(TARGET_SOURCES_ABS),.o,$(TARGET_OBJ_PREFIX)) -$(2)/$(1)$(3): $$($(1)_OBJS) +$(2)/$(1)$(3): OMK_CFLAGS=$(TARGET_CFLAGS) +$(2)/$(1)$(3): OMK_CXXFLAGS=$(TARGET_CXXFLAGS) +$(2)/$(1)$(3): OMK_CPPFLAGS=$(TARGET_CPPFLAGS) +$(2)/$(1)$(3): $(TARGET_OBJS) @$(QUIET_CMD_ECHO) " LINK $$@" - $(Q) $$(if $$(filter %.cc,$$($(1)_SOURCES))$$(filter %.cxx,$$($(1)_SOURCES))$$(filter %.cpp,$$($(1)_SOURCES)),$$(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 $$@ + $(Q) $(if $(filter $(CXX_PATTERN),$(TARGET_SOURCES)),$$(CXX),$$(CC)) \ + $(TARGET_OBJS) $$($(1)_LIBS:%=-l%) $$(LOADLIBES) $$(OMK_LDFLAGS) $$(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 @$(SED4OMK) -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 + +binary-pass-local: $(2)/$(1)$(3) endef # Usage: $(call SCRIPT_template,,) @@ -234,84 +243,52 @@ define SCRIPT_template $(2)/$(1): $$(SOURCES_DIR)/$(1) @$(QUIET_CMD_ECHO) " CP $$@" $(Q)cp $$^ $$@ + +binary-pass-local: $(2)/$(1) endef # Syntax: $(call LIBRARY_template,) define LIBRARY_template -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:%/=%)) +$(foreach idl,$(TARGET_IDLS),$(call COMPILE_idl_template,$(SOURCES_DIR)/$(idl),$(idl:%.idl=%))) -USER_OBJS += $$($(1)_OBJS) -USER_SOURCES += $$($(1)_SOURCES) +$(call COMPILE_templates,$(TARGET_SOURCES_ABS),.o,$(TARGET_OBJ_PREFIX)) -$(USER_LIB_DIR)/lib$(1).a: $$($(1)_OBJS) +$(USER_LIB_DIR)/lib$(1).a: OMK_CFLAGS=$(TARGET_CFLAGS) +$(USER_LIB_DIR)/lib$(1).a: OMK_CXXFLAGS=$(TARGET_CXXFLAGS) +$(USER_LIB_DIR)/lib$(1).a: OMK_CPPFLAGS=$(TARGET_CPPFLAGS) +$(USER_LIB_DIR)/lib$(1).a: $(TARGET_OBJS) @$(QUIET_CMD_ECHO) " AR $$@" $(Q) $(AR) rcs $$@ $$^ + +library-pass-local: $(USER_LIB_DIR)/lib$(1).a endef -.PHONY: FORCE # Syntax: $(call SOLIB_template,) define SOLIB_template -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:%/=%)) +$(foreach idl,$(TARGET_IDLS),$(call COMPILE_idl_template,$(SOURCES_DIR)/$(idl),$(idl:%.idl=%))) -SOLIB_OBJS += $$($(1)_OBJSLO) -SOLIB_SOURCES += $$($(1)_SOURCES) +$(call COMPILE_templates,$(TARGET_SOURCES_ABS),.lo,$(TARGET_OBJ_PREFIX)) -$(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar: $$($(1)_OBJSLO) FORCE - $(Q)echo '$(1)_objslo += $$$$(addprefix $(USER_OBJS_DIR)/,$$($(1)_OBJSLO))' > $$@.tmp; \ +.PHONY: $(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar +$(2)/$(1)$(3): OMK_CFLAGS=$(TARGET_CFLAGS) +$(2)/$(1)$(3): OMK_CXXFLAGS=$(TARGET_CXXFLAGS) +$(2)/$(1)$(3): OMK_CPPFLAGS=$(TARGET_CPPFLAGS) +$(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar: OMK_CFLAGS = $(TARGET_CFLAGS) $(SOLIB_PICFLAGS) +$(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar: OMK_CXXFLAGS = $(TARGET_CXXFLAGS) $(SOLIB_PICFLAGS) +$(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar: OMK_CPPFLAGS = $(TARGET_CPPFLAGS) +$(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar: $(TARGET_LOBJS) + $(Q)echo '$(1)_objslo += $$$$(addprefix $(USER_OBJS_DIR)/,$$^)' > $$@.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 - -library-pass-local: $(addprefix $(USER_INCLUDE_DIR)/,$(cmetric_include_HEADERS)) \ - $(lib_LIBRARIES:%=$(USER_LIB_DIR)/lib%.a) $(shared_LIBRARIES:%=$(OMK_WORK_DIR)/lib%.$(SOLIB_EXT).omkvar) - -binary-pass-local: $(bin_PROGRAMS:%=$(USER_BIN_DIR)/%$(EXE_SUFFIX)) \ - $(utils_PROGRAMS:%=$(USER_UTILS_DIR)/%$(EXE_SUFFIX)) \ - $(test_PROGRAMS:%=$(USER_TESTS_DIR)/%$(EXE_SUFFIX)) \ - $(bin_SCRIPTS:%=$(USER_BIN_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)) +library-pass-local: $(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar +endef # Generate rules for compilation of programs and libraries @@ -324,6 +301,7 @@ $(foreach prog,$(bin_PROGRAMS),$(eval $(call PROGRAM_template,$(prog),$(USER_BIN $(foreach script,$(bin_SCRIPTS),$(eval $(call SCRIPT_template,$(script),$(USER_BIN_DIR)))) +# $(foreach lib,$(lib_LIBRARIES),$(info $(call LIBRARY_template,$(lib)))) $(foreach lib,$(lib_LIBRARIES),$(eval $(call LIBRARY_template,$(lib)))) $(foreach lib,$(shared_LIBRARIES),$(eval $(call SOLIB_template,$(lib)))) @@ -341,6 +319,8 @@ link-pseudo-pass: ifeq ($(MAKECMDGOALS),link-shared-libs) + + # Syntax: $(call solib_link_template,) define solib_link_template $(1)_shared_libs = $$(patsubst %,$(USER_LIB_DIR)/lib%.$(SOLIB_EXT),$$(filter $$(shared_libs),$$($(1)_libs))) @@ -358,7 +338,7 @@ $(foreach lib,$(shared_libs),$(eval $(call solib_link_template,$(lib)))) link-shared-libs: $(shared_libs:%=$(USER_LIB_DIR)/lib%.$(SOLIB_EXT)) endif # link-shared-libs -$(eval $(call omk_pass_template, library-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(lib_LIBRARIES)$(shared_LIBRARIES))) +$(eval $(call omk_pass_template, library-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(lib_LIBRARIES)$(shared_LIBRARIES)$(cmetric_include_HEADERS))) $(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(bin_PROGRAMS)$(utils_PROGRAMS)$(test_PROGRAMS)$(bin_SCRIPTS))) $(eval $(call omk_pass_template,clean,$(USER_OBJS_DIR),,always)) @@ -377,63 +357,6 @@ install-local: # TODO $(eval $(call include-pass-template,$(USER_INCLUDE_DIR),include)) -ifdef USER_RULE_TEMPLATES - -# User-space static libraries and applications object files - -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),))) - -$(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 %.cpp,$(USER_SOURCES)),$(eval $(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cpp=%.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)) - -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)))) - -$(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 %.cpp,$(SOLIB_SOURCES)),$(eval $(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cpp=%.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)))) - -# Create _build directories for sources in subdirectories i.e. *_SOURCES=dir/file.c -_dirs_to_create=$(filter-out ./,$(sort $(dir $(USER_SOURCES) $(SOLIB_SOURCES)))) -ifneq ($(_dirs_to_create),) -$(shell mkdir -p $(addprefix $(LOCAL_BUILD_DIR)/,$(_dirs_to_create))) -endif - -# IDL compilation - -USER_IDLS := $(sort $(USER_IDLS)) - -$(foreach src,$(filter %.idl,$(USER_IDLS)),$(eval $(call COMPILE_idl_template,$(SOURCES_DIR)/$(src),$(src:%.idl=%)))) - -endif - clean-local:: @echo Cleaning in $(USER_OBJS_DIR) @rm -f $(USER_OBJS_DIR)/*.[och] \