X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=Makefile.am;h=0956cbeda8b4bc294b2d12efa6603502a3ca770f;hb=a85198d20f24cd4e20ec5c57e402611fef8b137a;hp=a09ee4dad8a383aa5df51ea8c3cdd45714109ba2;hpb=75271559a9dc2536b9da1c655a012eb837c58761;p=tinc

diff --git a/Makefile.am b/Makefile.am
index a09ee4da..0956cbed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,21 +2,35 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  src doc test systemd
+SUBDIRS =  src doc test systemd bash_completion.d
 
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = COPYING.README README.android
+EXTRA_DIST = COPYING.README README.md README.android SECURITY.md
 
 @CODE_COVERAGE_RULES@
 
+.PHONY: extra
+extra:
+	$(MAKE) -C $(srcdir)/src extra
+	$(MAKE) -C $(srcdir)/test extra
+
 # If git describe works, force autoconf to run in order to make sure we have the
 # current version number from git in the resulting configure script.
 configure-version:
 	-cd $(srcdir) && git describe && autoconf --force
 
 # Triggering the README target means we are building a distribution (make dist).
-README: configure-version
+README: configure-version README.md
+	ln -sf README.md README
+
+CLEANFILES = README
+
+# If we're running on a CI server, we may not be able to remove some test
+# artifacts without using sudo because they are created by tincd running
+# with root privileges.
+clean-local:
+	if test -n "${CI}"; then sudo rm -rf test/*.test.*/; fi
 
 ChangeLog:
 	(cd $(srcdir) && git log) > ChangeLog
@@ -37,4 +51,4 @@ release:
 	$(MAKE) dist
 
 astyle:
-	astyle --options=.astylerc -nQ src/*.[ch] src/*/*.[ch] test/*.[ch]
+	astyle --options=.astylerc -nQ src/*.[ch] src/*/*.[ch]