1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-24 14:50:34 +03:00

Makefiles: Build libdaemonclient unconditionally.

This commit is contained in:
Petr Rockai 2012-09-10 07:40:00 +02:00
parent ca0c8673b2
commit 0a87fed794
3 changed files with 7 additions and 11 deletions

View File

@ -26,16 +26,12 @@ ifeq ("@INTL@", "yes")
SUBDIRS += po
endif
SUBDIRS += lib tools daemons libdm
SUBDIRS += lib tools daemons libdm libdaemon
ifeq ("@APPLIB@", "yes")
SUBDIRS += liblvm
endif
ifeq ("@BUILD_LVMETAD@", "yes")
SUBDIRS += libdaemon
endif
SUBDIRS += scripts
# FIXME Should use intermediate Makefiles here!

View File

@ -17,8 +17,10 @@ top_builddir = @top_builddir@
.PHONY: client server
SUBDIRS += client
ifeq ("@BUILD_LVMETAD@", "yes")
SUBDIRS += client server
SUBDIRS += server
server: client
endif

View File

@ -144,11 +144,9 @@ endif
LDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib
CLDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib
ifeq ("@BUILD_LVMETAD@", "yes")
DAEMON_LIBS = -ldaemonclient
LDFLAGS += -L$(top_builddir)/libdaemon/client
CLDFLAGS += -L$(top_builddir)/libdaemon/client
endif
DAEMON_LIBS = -ldaemonclient
LDFLAGS += -L$(top_builddir)/libdaemon/client
CLDFLAGS += -L$(top_builddir)/libdaemon/client
ifeq ("@DMEVENTD@", "yes")
LDFLAGS += -L$(top_builddir)/daemons/dmeventd