Skip to content
Snippets Groups Projects
Commit 8ca3e35a authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge !97: use SOVERSION when compiling to unfail the tests

parents 9e52b5ca b7a00a2d
Branches
Tags
1 merge request!97Use SOVERSION when compiling to unfail the tests
......@@ -73,7 +73,7 @@ $(1): $(1:.o=.c)
$$(call quiet,CC,$$<) $(2) -MMD -MP -c $$< -o $$@
endef
# Make target (name,path,ext,ldflags,dst,amalgable)
# Make target (name,path,ext,ldflags, 5:dst,amalgable,abiver)
define make_target
ifeq ($(AMALG)|$(6), yes|yes)
$(1).amalg.c: $$($(1)_SOURCES)
......@@ -92,9 +92,14 @@ $(1) := $(2)/$(1)$(3)
$(2)/$(1)$(3): $$($(1)_OBJ) $$($(1)_DEPEND)
ifeq ($(4),-$(ARTYPE))
$(call quiet,AR,$$@) rcs $$@ $$($(1)_OBJ)
else
ifneq ($(strip $(7)),)
$(call quiet,CCLD,$$@) $$($(1)_CFLAGS) $(BUILD_CFLAGS) $$($(1)_OBJ) $(call SOVER,$(7),$(7),$(1)) -o $(2)/$(1)$(call SOVER_EXT,$(7)) $(4) $$($(1)_LIBS) $(BUILD_LDFLAGS) $$($(1)_LDFLAGS)
$(LN) -f $(1)$(call SOVER_EXT,$(7)) $$@
else
$(call quiet,CCLD,$$@) $$($(1)_CFLAGS) $(BUILD_CFLAGS) $$($(1)_OBJ) $(call SOVER,$(7),$(7),$(1)) -o $$@ $(4) $$($(1)_LIBS) $(BUILD_LDFLAGS) $$($(1)_LDFLAGS)
endif
endif
# Additional rules
$(1)-clean:
$(RM) $$($(1)_OBJ) $$($(1)_DEP) $(2)/$(1)$(3)
......@@ -108,7 +113,7 @@ ifneq ($(5),$(MODULEDIR))
endif
# Versioned library install
ifneq ($(strip $(7)),)
$(INSTALL) $(2)/$(1)$(3) $(DESTDIR)$(5)/$(1)$(call SOVER_EXT,$(7))
$(INSTALL) $(2)/$(1)$(call SOVER_EXT,$(7)) $(DESTDIR)$(5)/
$(LN) -f $(1)$(call SOVER_EXT,$(7)) $(DESTDIR)$(5)/$(1)$(3)
else
$(INSTALL) $(2)/$(1)$(3) $(DESTDIR)$(5)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment