Simplify libraries compilation

This commit does the similar changes as a previous commit for program
compilation.

diff --git a/snippets/linux.omk b/snippets/linux.omk
index a7a3b70879d4d4400d96bc1ddffa206aee11e135..f5cd74436c25e4ab3ef542d48c49ae23f896182c 100644 (file)
--- a/snippets/linux.omk
+++ b/snippets/linux.omk
@@ -102,11 +102,6 @@ endif
 
 ifdef USER_RULE_TEMPLATES
 
-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) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -DOMK_FOR_USER
 
@@ -136,6 +131,7 @@ ifeq ($$($(2)_C_TARGET),)
 $(2)_C_TARGET=1
 $(2): $(1) $$(GEN_HEADERS)
        @$(QUIET_CMD_ECHO) "  CC      $$@"
+       $(Q)mkdir -p $$(dir $$@)
        $(Q) if $$(c_o_COMPILE) $$(CC_DEPFLAGS) $(3) -o $$@ -c $$< ; \
        then mv -f "$$@.d.tmp" "$$@.d" ; \
        else rm -f "$$@.d.tmp" ; exit 1; \
@@ -150,6 +146,7 @@ ifeq ($$($(2)_CC_TARGET),)
 $(2)_CC_TARGET=1
 $(2): $(1) $$(GEN_HEADERS)
        @$(QUIET_CMD_ECHO) "  CXX     $$@"
+       $(Q)mkdir -p $$(dir $$@)
        $(Q) if $$(cc_o_COMPILE) $$(CC_DEPFLAGS) $(3) -o $$@ -c $$< ; \
        then mv -f "$$@.d.tmp" "$$@.d" ; \
        else rm -f "$$@.d.tmp" ; exit 1; \
@@ -164,6 +161,7 @@ ifeq ($$($(2)_S_TARGET),)
 $(2)_S_TARGET=1
 $(2): $(1) $$(GEN_HEADERS)
        @$(QUIET_CMD_ECHO) "  AS      $$@"
+       $(Q)mkdir -p $$(dir $$@)
        $(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; \
@@ -208,18 +206,18 @@ $(2).c $(2)-stubs.c $(2)-skels.c $(2)-common.c $(2).h: $(1) $$(wildcard $$(first
        $(Q) $$(idl_COMPILE) $$($(2)_IDLFLAGS) $(1)
 endef
 
-# Syntax: $(call COMPILE_templates,<sources>)
+# Syntax: $(call COMPILE_templates,<sources>,<suffix>)
 # Note: The newlines after $(call ) are IMPORTANT!!!
 define COMPILE_templates
-$(foreach src,$(filter %.c,$(1)),$(call COMPILE_c_o_template,$(SOURCES_DIR)/$(src),$(src:%.c=%.o),)
+$(foreach src,$(filter %.c,$(1)),$(call COMPILE_c_o_template,$(SOURCES_DIR)/$(src),$(src:%.c=%$(2)),)
 )
-$(foreach src,$(filter %.cc,$(1)),$(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cc=%.o),)
+$(foreach src,$(filter %.cc,$(1)),$(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cc=%$(2)),)
 )
-$(foreach src,$(filter %.cxx,$(1)),$(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cxx=%.o),)
+$(foreach src,$(filter %.cxx,$(1)),$(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cxx=%$(2)),)
 )
-$(foreach src,$(filter %.cpp,$(1)),$(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cpp=%.o),)
+$(foreach src,$(filter %.cpp,$(1)),$(call COMPILE_cc_o_template,$(SOURCES_DIR)/$(src),$(src:%.cpp=%$(2)),)
 )
-$(foreach src,$(filter %.S,$(1)),$(call COMPILE_S_o_template,$(SOURCES_DIR)/$(src),$(src:%.S=%.o),)
+$(foreach src,$(filter %.S,$(1)),$(call COMPILE_S_o_template,$(SOURCES_DIR)/$(src),$(src:%.S=%$(2)),)
 )
 endef
 
@@ -229,6 +227,8 @@ TARGET_GEN_SOURCES =  $(filter %.c,$($(1)_SERVER_IDL:%.idl=%-skels.c)) \
                       $(filter %.c,$($(1)_CLIENT_IDL:%.idl=%-common.c)) \
                       $(filter %.c,$($(1)_IDL:%.idl=%.c))
 TARGET_SOURCES = $($(1)_SOURCES) $(TARGET_GEN_SOURCES)
+TARGET_OBJS  = $(sort $(addsuffix .o,$(basename $(TARGET_SOURCES))))
+TARGET_LOBJS = $(sort $(addsuffix .lo,$(basename $(TARGET_SOURCES))))
 TARGET_IDLS = $($(1)_SERVER_IDL) $($(1)_CLIENT_IDL) $($(1)_IDL)
 LINK_WITH_CXX = $(filter %.cc,$(TARGET_SOURCES))$(filter %.cxx,$(TARGET_SOURCES))$$(filter %.cpp,$(TARGET_SOURCES))
 
@@ -236,15 +236,17 @@ LINK_WITH_CXX = $(filter %.cc,$(TARGET_SOURCES))$(filter %.cxx,$(TARGET_SOURCES)
 define PROGRAM_template
 $(foreach idl,$(TARGET_IDLS),$(call COMPILE_idl_template,$(SOURCES_DIR)/$(idl),$(idl:%.idl=%)))
 
-$(call COMPILE_templates,$(TARGET_SOURCES))
+$(call COMPILE_templates,$(TARGET_SOURCES),.o)
 
-$(2)/$(1)$(3): $(sort $(addsuffix .o,$(basename $(TARGET_SOURCES))))
+$(2)/$(1)$(3): $(TARGET_OBJS)
        @$(QUIET_CMD_ECHO) "  LINK    $$@"
        $(Q) $(if $(LINK_WITH_CXX),$$(CXX),$$(CC)) \
          $$^ $$($(1)_LIBS:%=-l%) $$(LOADLIBES) $$(AM_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,<target-directory>,<script-name>)
@@ -252,70 +254,47 @@ define SCRIPT_template
 $(2)/$(1): $$(SOURCES_DIR)/$(1)
        @$(QUIET_CMD_ECHO) "  CP      $$@"
        $(Q)cp $$^ $$@
+
+binary-pass-local: $(2)/$(1)
 endef
 
 
 # Syntax: $(call LIBRARY_template,<library-name>)
 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=%)))
+
+$(call COMPILE_templates,$(TARGET_SOURCES),.o)
 
-$(USER_LIB_DIR)/lib$(1).a: $$($(1)_OBJS)
+$(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,<library-name>)
 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 += $
-
-$(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 += $
+$(foreach idl,$(TARGET_IDLS),$(call COMPILE_idl_template,$(SOURCES_DIR)/$(idl),$(idl:%.idl=%)))
 
-$(call COMPILE_templates,$($(1)_SOURCES) $($(1)_GEN_SOURCES))
+$(call COMPILE_templates,$(TARGET_SOURCES),.lo)
 
-$(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
+$(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar: AM_CFLAGS += $(SOLIB_PICFLAGS)
+$(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar: AM_CXXFLAGS += $(SOLIB_PICFLAGS)
+$(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
+
+library-pass-local: $(OMK_WORK_DIR)/lib$(1).$(SOLIB_EXT).omkvar
 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
 
@@ -356,6 +335,8 @@ link-pseudo-pass:
 
 ifeq ($(MAKECMDGOALS),link-shared-libs)
 
+
+
 # Syntax: $(call solib_link_template,<library-name>)
 define solib_link_template
 $(1)_shared_libs = $$(patsubst %,$(USER_LIB_DIR)/lib%.$(SOLIB_EXT),$$(filter $$(shared_libs),$$($(1)_libs)))
@@ -392,28 +373,6 @@ install-local:                     # TODO
 
 $(eval $(call include-pass-template,$(USER_INCLUDE_DIR),include))
 
-ifdef USER_RULE_TEMPLATES
-
-$(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
-
-endif
-
 clean-local::
        @echo Cleaning in $(USER_OBJS_DIR)
        @rm -f $(USER_OBJS_DIR)/*.[och] \