|
 |
26e710 |
daemons/lvmlockd/Makefile.in | 21 ++++++++++++++-------
|
|
|
26e710 |
daemons/lvmlockd/lvmlockd-core.c | 2 +-
|
|
|
26e710 |
2 files changed, 15 insertions(+), 8 deletions(-)
|
|
|
26e710 |
|
|
|
26e710 |
diff --git a/daemons/lvmlockd/Makefile.in b/daemons/lvmlockd/Makefile.in
|
|
|
26e710 |
index dca05b8..9c03401 100644
|
|
|
26e710 |
--- a/daemons/lvmlockd/Makefile.in
|
|
|
26e710 |
+++ b/daemons/lvmlockd/Makefile.in
|
|
|
26e710 |
@@ -38,18 +38,25 @@ TARGETS = lvmlockd lvmlockctl
|
|
|
26e710 |
|
|
|
26e710 |
include $(top_builddir)/make.tmpl
|
|
|
26e710 |
|
|
|
26e710 |
-CFLAGS += $(EXTRA_EXEC_CFLAGS) $(SYSTEMD_CFLAGS)
|
|
|
26e710 |
+CFLAGS += $(EXTRA_EXEC_CFLAGS)
|
|
|
26e710 |
INCLUDES += -I$(top_srcdir)/libdaemon/server
|
|
|
26e710 |
-LDFLAGS += $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS)
|
|
|
26e710 |
-LIBS += $(PTHREAD_LIBS) $(SYSTEMD_LIBS)
|
|
|
26e710 |
+LDFLAGS += -L$(top_builddir)/libdaemon/server $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS)
|
|
|
26e710 |
+LIBS += $(RT_LIBS) $(DAEMON_LIBS) $(PTHREAD_LIBS)
|
|
|
26e710 |
|
|
|
26e710 |
-lvmlockd: $(OBJECTS) $(top_builddir)/libdaemon/server/libdaemonserver.a $(INTERNAL_LIBS)
|
|
|
26e710 |
+
|
|
|
26e710 |
+ifeq ($(USE_SD_NOTIFY),yes)
|
|
|
26e710 |
+ CFLAGS += $(shell pkg-config --cflags libsystemd) -DUSE_SD_NOTIFY
|
|
|
26e710 |
+ LIBS += $(shell pkg-config --libs libsystemd)
|
|
|
26e710 |
+endif
|
|
|
26e710 |
+
|
|
|
26e710 |
+lvmlockd: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \
|
|
|
26e710 |
+ $(top_builddir)/libdaemon/server/libdaemonserver.a
|
|
|
26e710 |
@echo " [CC] $@"
|
|
|
26e710 |
- $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ $(LOCK_LIBS) $(LIBS)
|
|
|
26e710 |
+ $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LOCK_LIBS) -ldaemonserver $(INTERNAL_LIBS) $(LIBS)
|
|
|
26e710 |
|
|
|
26e710 |
-lvmlockctl: lvmlockctl.o $(INTERNAL_LIBS)
|
|
|
26e710 |
+lvmlockctl: lvmlockctl.o $(top_builddir)/libdaemon/client/libdaemonclient.a
|
|
|
26e710 |
@echo " [CC] $@"
|
|
|
26e710 |
- $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS)
|
|
|
26e710 |
+ $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmlockctl.o $(INTERNAL_LIBS) $(LIBS)
|
|
|
26e710 |
|
|
|
26e710 |
install_lvmlockd: lvmlockd
|
|
|
26e710 |
@echo " [INSTALL] $<"
|
|
|
26e710 |
diff --git a/daemons/lvmlockd/lvmlockd-core.c b/daemons/lvmlockd/lvmlockd-core.c
|
|
|
26e710 |
index 5609ccc..39275fb 100644
|
|
|
26e710 |
--- a/daemons/lvmlockd/lvmlockd-core.c
|
|
|
26e710 |
+++ b/daemons/lvmlockd/lvmlockd-core.c
|
|
|
26e710 |
@@ -31,7 +31,7 @@
|
|
|
26e710 |
#include <sys/utsname.h>
|
|
|
26e710 |
#include <sys/un.h>
|
|
|
26e710 |
|
|
|
26e710 |
-#ifdef NOTIFYDBUS_SUPPORT
|
|
|
26e710 |
+#ifdef USE_SD_NOTIFY
|
|
|
26e710 |
#include <systemd/sd-daemon.h>
|
|
|
26e710 |
#endif
|
|
|
26e710 |
|