Reflect new file locations, include file updates etc.

[lvm2.git] / make.tmpl.in

diff --git a/make.tmpl.in b/make.tmpl.in
index a4304e0dd9dfa79823f1f0465e773c24f8e84174..c729080ccce6cac0460bd1cef31858c3171ca234 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -39,7 +39,7 @@ ELDFLAGS += @ELDFLAGS@
 LDDEPS += @LDDEPS@
 LDFLAGS += @LDFLAGS@
 LIB_SUFFIX = @LIB_SUFFIX@
-LVMINTERNAL_LIBS = -llvm-internal -L$(top_builddir)/daemons/common -ldaemon $(UDEV_LIBS) $(DL_LIBS)
+LVMINTERNAL_LIBS = -llvm-internal $(DAEMON_LIBS) $(UDEV_LIBS) $(DL_LIBS)
 DL_LIBS = @DL_LIBS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 READLINE_LIBS = @READLINE_LIBS@
@@ -143,6 +143,12 @@ 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
+
 ifeq ("@DMEVENTD@", "yes")
   LDFLAGS += -L$(top_builddir)/daemons/dmeventd
   CLDFLAGS += -L$(top_builddir)/daemons/dmeventd