shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

lvmlockd: use commonly used define NOTIFYDBUS_SUPPORT

Browse Source 
Build with configured NOTIFYDBUS_SUPPORT, SYSTEMD_LIBS, SYSTEMD_CFLAGS.
Also add proper build dependencies on internal libraries.
This commit is contained in:
Zdenek Kabelac 2018-12-21 11:17:43 +01:00
parent 7832d35668
commit 71af650760
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
daemons/lvmlockd/Makefile.in
View File

@ -37,25 +37,18 @@ TARGETS = lvmlockd lvmlockctl
include $(top_builddir)/make.tmpl include $(top_builddir)/make.tmpl
CFLAGS += $(EXTRA_EXEC_CFLAGS) CFLAGS += $(EXTRA_EXEC_CFLAGS) $(SYSTEMD_CFLAGS)
INCLUDES += -I$(top_srcdir)/libdaemon/server INCLUDES += -I$(top_srcdir)/libdaemon/server
LDFLAGS += -L$(top_builddir)/libdaemon/server $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) LDFLAGS += $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS)
LIBS += $(RT_LIBS) $(DAEMON_LIBS) $(PTHREAD_LIBS) LIBS += $(PTHREAD_LIBS) $(SYSTEMD_LIBS)
lvmlockd: $(OBJECTS) $(top_builddir)/libdaemon/server/libdaemonserver.a $(INTERNAL_LIBS)
ifeq ($(USE_SD_NOTIFY),yes)
CFLAGS += $(shell pkg-config --cflags libsystemd) -DUSE_SD_NOTIFY
LIBS += $(shell pkg-config --libs libsystemd)
endif
lvmlockd: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \
$(top_builddir)/libdaemon/server/libdaemonserver.a
@echo " [CC] $@" @echo " [CC] $@"
$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LOCK_LIBS) -ldaemonserver $(INTERNAL_LIBS) $(LIBS) $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ $(LOCK_LIBS) $(LIBS)
lvmlockctl: lvmlockctl.o $(top_builddir)/libdaemon/client/libdaemonclient.a lvmlockctl: lvmlockctl.o $(INTERNAL_LIBS)
@echo " [CC] $@" @echo " [CC] $@"
$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmlockctl.o $(INTERNAL_LIBS) $(LIBS) $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ $(LIBS)
install_lvmlockd: lvmlockd install_lvmlockd: lvmlockd
@echo " [INSTALL] $<" @echo " [INSTALL] $<"

2
daemons/lvmlockd/lvmlockd-core.c
View File

@ -34,7 +34,7 @@
#include <sys/utsname.h> #include <sys/utsname.h>
#include <sys/un.h> #include <sys/un.h>
#ifdef USE_SD_NOTIFY #ifdef NOTIFYDBUS_SUPPORT
#include <systemd/sd-daemon.h> #include <systemd/sd-daemon.h>
#endif #endif