diff options
| author | Joe Thornber <ejt@redhat.com> | 2018-06-07 16:15:04 +0100 |
|---|---|---|
| committer | Joe Thornber <ejt@redhat.com> | 2018-06-07 16:15:04 +0100 |
| commit | bd8c6cf8628e5898ea89ebbcccfe423dba83a840 (patch) | |
| tree | cd07658d028f605b8b12694300f17c28315a746a /scripts/Makefile.in | |
| parent | 74460cd009267564be032a373e78ec5eba67b4ce (diff) | |
| download | lvm2-bd8c6cf8628e5898ea89ebbcccfe423dba83a840.tar.gz | |
scripts/lvm2_activation_generator_systemd_red_hat: rewrite to use lvmconfig
Unit tested the new code, but not run functional tests (assuming they exist).
Diffstat (limited to 'scripts/Makefile.in')
| -rw-r--r-- | scripts/Makefile.in | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/scripts/Makefile.in b/scripts/Makefile.in index ee39306c5..208aebf8b 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -15,21 +15,14 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ -ifeq ("@APPLIB@", "yes") - SOURCES = lvm2_activation_generator_systemd_red_hat.c - TARGETS = lvm2_activation_generator_systemd_red_hat -endif +SOURCES = lvm2_activation_generator_systemd_red_hat.c +TARGETS = lvm2_activation_generator_systemd_red_hat include $(top_builddir)/make.tmpl -ifeq ("@APPLIB@", "yes") - DEPLIBS += $(top_builddir)/liblvm/liblvm2app.so - LDFLAGS += -L$(top_builddir)/liblvm ifeq ("@BUILD_DMEVENTD@", "yes") LDFLAGS += -Wl,-rpath-link,$(top_builddir)/daemons/dmeventd endif - LVMLIBS = @LVM2APP_LIB@ -laio -endif LVM_SCRIPTS = lvmdump.sh lvmconf.sh DM_SCRIPTS = @@ -93,12 +86,7 @@ lvm2_activation_generator_systemd_red_hat: $(OBJECTS) $(DEPLIBS) $(INTERNAL_LIBS install_systemd_generators: $(INSTALL_DIR) $(systemd_generator_dir) -ifeq ("@APPLIB@", "yes") $(INSTALL_PROGRAM) lvm2_activation_generator_systemd_red_hat $(systemd_generator_dir)/lvm2-activation-generator -else - @echo "WARNING: LVM2 activation systemd generator not installed." \ - "It requires the LVM2 application library to be built as well." -endif install_systemd_units: install_dbus_service $(INSTALL_DIR) $(systemd_unit_dir) |