diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 14:28:23 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 14:28:23 +0000 |
commit | dc3064332cec5ca6edc9a44f5f6111e506eb037b (patch) | |
tree | 79686327822b075f3970aec7ef73372142760047 /extra-lib.mk | |
parent | 86af500777f45066aa6a6817d4b695cf4b626c38 (diff) | |
parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) |
Merge commit 'refs/top-bases/cvs/exc2signal-template' into cvs/exc2signal-template
Diffstat (limited to 'extra-lib.mk')
-rw-r--r-- | extra-lib.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/extra-lib.mk b/extra-lib.mk index b10748d185..72f8d2e1df 100644 --- a/extra-lib.mk +++ b/extra-lib.mk @@ -5,6 +5,9 @@ # The variable $($(lib)-routines) defines the list of modules # to be included in that library. A sysdep Makefile can add to # $(lib)-sysdep_routines to include additional modules. +# +# Libraries listed in $(extra-libs-noinstall) are built, but not +# installed. lib := $(firstword $(extra-libs-left)) extra-libs-left := $(filter-out $(lib),$(extra-libs-left)) @@ -28,7 +31,9 @@ extra-objs := $(extra-objs) all-$(lib)-routines := $($(lib)-routines) $($(lib)-sysdep_routines) # Add each flavor of library to the lists of things to build and install. +ifeq (,$(filter $(lib), $(extra-libs-noinstall))) install-lib += $(foreach o,$(object-suffixes-$(lib)),$(lib:lib%=$(libtype$o))) +endif extra-objs += $(foreach o,$(filter-out .os .oS,$(object-suffixes-$(lib))),\ $(patsubst %,%$o,$(filter-out \ $($(lib)-shared-only-routines),\ @@ -103,5 +108,5 @@ endif # This will define `libof-ROUTINE := LIB' for each of the routines. cpp-srcs-left := $($(lib)-routines) $($(lib)-sysdep_routines) ifneq (,$(cpp-srcs-left)) -include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) +include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) endif |