diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-11-28 19:05:53 +0000 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2016-11-29 14:11:50 +0000 |
| commit | a73fef3eaacdf7fb902f096d60371cdbdc015181 (patch) | |
| tree | 506df167d673727b65c7880b994726d0c450980c | |
| parent | d57036f6a2da1adbc581a258d3e128c4b0623baf (diff) | |
| download | ostree-a73fef3eaacdf7fb902f096d60371cdbdc015181.tar.gz | |
build: clean up ostree-remount if building without systemd
This is necessary for "make distcheck" on Travis-CI.
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Closes: #600
Approved by: cgwalters
| -rw-r--r-- | Makefile-decls.am | 3 | ||||
| -rw-r--r-- | Makefile-switchroot.am | 4 | ||||
| -rw-r--r-- | Makefile-tests.am | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/Makefile-decls.am b/Makefile-decls.am index df635706..e41586d1 100644 --- a/Makefile-decls.am +++ b/Makefile-decls.am @@ -46,6 +46,9 @@ gsettings_SCHEMAS = ostree_bootdir = $(prefix)/lib/ostree 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 INSTALL_DATA_HOOKS = install-data-hook: $(INSTALL_DATA_HOOKS) diff --git a/Makefile-switchroot.am b/Makefile-switchroot.am index 0b30a965..6fd2f820 100644 --- a/Makefile-switchroot.am +++ b/Makefile-switchroot.am @@ -17,6 +17,10 @@ if BUILDOPT_SYSTEMD 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 ostree_prepare_root_SOURCES = \ diff --git a/Makefile-tests.am b/Makefile-tests.am index 2160cd55..03e50b9b 100644 --- a/Makefile-tests.am +++ b/Makefile-tests.am @@ -17,8 +17,6 @@ # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -include $(top_srcdir)/buildutil/glib-tap.mk - EXTRA_DIST += \ buildutil/tap-driver.sh \ buildutil/tap-test \ |