mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
makefiles: fix missing libs
Recent commit dc8837f079
became actually to strict - we always want to build lib.a files.
This commit is contained in:
parent
0bbbe08343
commit
b162475391
@ -318,12 +318,10 @@ SUBDIRS.cflow := $(SUBDIRS:=.cflow)
|
|||||||
SUBDIRS.clean := $(SUBDIRS:=.clean)
|
SUBDIRS.clean := $(SUBDIRS:=.clean)
|
||||||
SUBDIRS.distclean := $(SUBDIRS:=.distclean)
|
SUBDIRS.distclean := $(SUBDIRS:=.distclean)
|
||||||
|
|
||||||
|
TARGETS += $(LIB_STATIC)
|
||||||
ifeq ("@SHARED_LINK@", "yes")
|
ifeq ("@SHARED_LINK@", "yes")
|
||||||
TARGETS += $(LIB_SHARED)
|
TARGETS += $(LIB_SHARED)
|
||||||
endif
|
endif
|
||||||
ifeq ("@STATIC_LINK@", "yes")
|
|
||||||
TARGETS += $(LIB_STATIC)
|
|
||||||
endif
|
|
||||||
|
|
||||||
all: $(SUBDIRS) $(TARGETS)
|
all: $(SUBDIRS) $(TARGETS)
|
||||||
|
|
||||||
|
@ -373,12 +373,10 @@ SUBDIRS.cflow := $(SUBDIRS:=.cflow)
|
|||||||
SUBDIRS.clean := $(SUBDIRS:=.clean)
|
SUBDIRS.clean := $(SUBDIRS:=.clean)
|
||||||
SUBDIRS.distclean := $(SUBDIRS:=.distclean)
|
SUBDIRS.distclean := $(SUBDIRS:=.distclean)
|
||||||
|
|
||||||
|
TARGETS += $(LIB_STATIC)
|
||||||
ifeq ("@SHARED_LINK@", "yes")
|
ifeq ("@SHARED_LINK@", "yes")
|
||||||
TARGETS += $(LIB_SHARED)
|
TARGETS += $(LIB_SHARED)
|
||||||
endif
|
endif
|
||||||
ifeq ("@STATIC_LINK@", "yes")
|
|
||||||
TARGETS += $(LIB_STATIC)
|
|
||||||
endif
|
|
||||||
|
|
||||||
INTERNAL_LIBS = \
|
INTERNAL_LIBS = \
|
||||||
$(top_builddir)/libdaemon/client/libdaemonclient.a \
|
$(top_builddir)/libdaemon/client/libdaemonclient.a \
|
||||||
|
Loading…
Reference in New Issue
Block a user