Skip to content

Commit

Permalink
- added conditional compilation of installation-helper (gh##202)
Browse files Browse the repository at this point in the history
  • Loading branch information
aschnell committed Oct 14, 2015
1 parent 5fd6cfe commit 36b161c
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 17 deletions.
40 changes: 23 additions & 17 deletions client/Makefile.am
Expand Up @@ -18,34 +18,40 @@ snapper_SOURCES = \

snapper_LDADD = ../snapper/libsnapper.la utils/libutils.la ../dbus/libdbus.la

if ENABLE_ROLLBACK
libexecdir = /usr/lib/snapper

sbin_PROGRAMS = mksubvolume
libexec_PROGRAMS = systemd-helper

mksubvolume_SOURCES = \
mksubvolume.cc

mksubvolume_LDADD = ../snapper/libsnapper.la utils/libutils.la
systemd_helper_SOURCES = \
systemd-helper.cc \
types.cc types.h \
commands.cc commands.h \
cleanup.cc cleanup.h \
misc.cc misc.h \
errors.cc errors.h

endif
systemd_helper_LDADD = ../snapper/libsnapper.la utils/libutils.la ../dbus/libdbus.la

libexecdir = /usr/lib/snapper
if ENABLE_BTRFS

libexec_PROGRAMS = installation-helper systemd-helper
libexec_PROGRAMS += installation-helper

installation_helper_SOURCES = \
installation-helper.cc \
misc.cc misc.h

installation_helper_LDADD = ../snapper/libsnapper.la utils/libutils.la

systemd_helper_SOURCES = \
systemd-helper.cc \
types.cc types.h \
commands.cc commands.h \
cleanup.cc cleanup.h \
misc.cc misc.h \
errors.cc errors.h
if ENABLE_ROLLBACK

systemd_helper_LDADD = ../snapper/libsnapper.la utils/libutils.la ../dbus/libdbus.la
sbin_PROGRAMS = mksubvolume

mksubvolume_SOURCES = \
mksubvolume.cc

mksubvolume_LDADD = ../snapper/libsnapper.la utils/libutils.la

endif

endif

6 changes: 6 additions & 0 deletions package/snapper.changes
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 14 13:52:10 CEST 2015 - aschnell@suse.com

- added conditional compilation of installation-helper
(gh#openSUSE/snapper#202)

-------------------------------------------------------------------
Tue Sep 22 16:51:23 CEST 2015 - aschnell@suse.com

Expand Down

0 comments on commit 36b161c

Please sign in to comment.