Extract common logic in OpenSSL-specific code

[tinc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2b21abb..0956cbe 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,21 +2,35 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  src doc gui 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]