shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-31 05:47:40 +03:00
Code Issues Projects Releases Wiki Activity

build: clean up ostree-remount if building without systemd

Browse Source 
This is necessary for "make distcheck" on Travis-CI.

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>

Closes: #600
Approved by: cgwalters
This commit is contained in:
Simon McVittie 2016-11-28 19:05:53 +00:00 committed by Atomic Bot
parent d57036f6a2
commit a73fef3eaa
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile-decls.am
View File

@ -46,6 +46,9 @@ gsettings_SCHEMAS =
ostree_bootdir = $(prefix)/lib/ostree ostree_bootdir = $(prefix)/lib/ostree
ostree_boot_PROGRAMS = ostree_boot_PROGRAMS =
# This initializes some more variables
include $(top_srcdir)/buildutil/glib-tap.mk
# This is a special facility to chain together hooks easily # This is a special facility to chain together hooks easily
INSTALL_DATA_HOOKS = INSTALL_DATA_HOOKS =
install-data-hook: $(INSTALL_DATA_HOOKS) install-data-hook: $(INSTALL_DATA_HOOKS)

4
Makefile-switchroot.am
View File

@ -17,6 +17,10 @@
if BUILDOPT_SYSTEMD if BUILDOPT_SYSTEMD
ostree_boot_PROGRAMS += ostree-remount ostree_boot_PROGRAMS += ostree-remount
else
# It is built anyway as a side-effect of having the symlink in tests/,
# and if we declare it here, it gets cleaned up properly
check_PROGRAMS += ostree-remount
endif endif
ostree_prepare_root_SOURCES = \ ostree_prepare_root_SOURCES = \

2
Makefile-tests.am
View File

@ -17,8 +17,6 @@
# Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA. # Boston, MA 02111-1307, USA.
include $(top_srcdir)/buildutil/glib-tap.mk
EXTRA_DIST += \ EXTRA_DIST += \
buildutil/tap-driver.sh \ buildutil/tap-driver.sh \
buildutil/tap-test \ buildutil/tap-test \