Merge pull request #4534 from martin-frbg/issue4528
Omit redundant prefixes or suffixes in library naming
This commit is contained in:
commit
5fbe25954b
|
@ -1520,10 +1520,18 @@ ifndef LIBNAMEPREFIX
|
||||||
LIBNAMEPREFIX =
|
LIBNAMEPREFIX =
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
SYMPREFIX=$(SYMBOLPREFIX)
|
||||||
|
ifeq ($(SYMBOLPREFIX),$(LIBNAMEPREFIX))
|
||||||
|
SYMPREFIX=
|
||||||
|
endif
|
||||||
|
SYMSUFFIX=$(SYMBOLSUFFIX)
|
||||||
|
ifeq ($(SYMBOLSUFFIX),$(LIBNAMESUFFIX))
|
||||||
|
SYMSUFFIX=
|
||||||
|
endif
|
||||||
ifndef LIBNAMESUFFIX
|
ifndef LIBNAMESUFFIX
|
||||||
LIBNAMEBASE = $(SYMBOLPREFIX)$(LIBSONAMEBASE)$(SYMBOLSUFFIX)
|
LIBNAMEBASE = $(SYMPREFIX)$(LIBSONAMEBASE)$(SYMSUFFIX)
|
||||||
else
|
else
|
||||||
LIBNAMEBASE = $(SYMBOLPREFIX)$(LIBSONAMEBASE)$(SYMBOLSUFFIX)$(LIBNAMESUFFIX)
|
LIBNAMEBASE = $(SYMPREFIX)$(LIBSONAMEBASE)$(SYMSUFFIX)$(LIBNAMESUFFIX)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OSNAME), CYGWIN_NT)
|
ifeq ($(OSNAME), CYGWIN_NT)
|
||||||
|
|
Loading…
Reference in New Issue