From 9f96db71252fc66b72c433e2ca0d49e031c6a5fd Mon Sep 17 00:00:00 2001
From: Nikolaus Rath <Nikolaus@rath.org>
Date: Thu, 5 Jan 2017 09:37:00 -0800
Subject: Added experimental support for building with Meson+Ninja

---
 Makefile.am | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 4e95a71..b2ba4b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,26 +8,11 @@ EXTRA_DIST = \
 	fuse3.pc.in \
 	README* \
 	test/*.py \
-	test/pytest.ini
+	test/pytest.ini \
+        meson.build \
+        meson_options.txt
 
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = fuse3.pc
 
 $(pkgconfig_DATA): config.status
-
-.PHONY: setuid_fusermount
-setuid_fusermount:
-	@echo "Attempting to use sudo to make util/fusermount3 setuid root"
-	@echo "If this fails, set permissions manually and re-run make test"
-	test $$(ls -n util/fusermount3 | awk 'NR==1 {print $$3}') -eq 0 || \
-	    sudo chown root util/fusermount3
-	test -u util/fusermount3 || \
-	    sudo chmod u+s util/fusermount3
-
-# If we are not root, util/fusermount3 needs to be setuid root
-# for tests to work.
-
-test_deps = $(shell [ "$${UID}" -eq 0 ] || echo setuid_fusermount)
-.PHONY: test
-test: all $(test_deps)
-	python3 -m pytest test/
-- 
cgit v1.2.3