Fix `make distcheck`

`make distcheck` builds and then calls both tinc and tincd with two options:

	--version
	--help

tincd behavior was changed by 28b7a53b6 to print usage information to
stderr, but automake expects to see a non-empty output from stdout, and
fails distcheck if it's empty.

diff --git a/src/Makefile.am b/src/Makefile.am
index 0d79c906aca41f2aca261452004b9fe323b64cd4..7d6a31dd3dec14ea154e025e3705ad22397a525f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -244,22 +244,22 @@ sptps_speed_SOURCES += \
 else
 if GCRYPT
 tincd_SOURCES += \
-       gcrypt/cipher.c \
+       gcrypt/cipher.c gcrypt/cipher.h \
        gcrypt/crypto.c \
        gcrypt/digest.c gcrypt/digest.h \
        gcrypt/pem.c gcrypt/pem.h \
        gcrypt/prf.c \
-       gcrypt/rsa.c
+       gcrypt/rsa.c gcrypt/rsa.h
 tinc_SOURCES += \
-       gcrypt/cipher.c \
+       gcrypt/cipher.c gcrypt/cipher.h \
        gcrypt/crypto.c \
        gcrypt/digest.c gcrypt/digest.h \
        gcrypt/pem.c gcrypt/pem.h \
        gcrypt/prf.c \
-       gcrypt/rsa.c \
+       gcrypt/rsa.c gcrypt/rsa.h \
        gcrypt/rsagen.c
 sptps_test_SOURCES += \
-       gcrypt/cipher.c \
+       gcrypt/cipher.c gcrypt/cipher.h \
        gcrypt/crypto.c \
        gcrypt/digest.c gcrypt/digest.h \
        gcrypt/prf.c

diff --git a/src/bsd/device.c b/src/bsd/device.c
index 0c1a62f4b569f1ef372d3ac405d67e09ddf4b8b2..badd77d7a4b07787329e4ba8279e0d4d133b2ddc 100644 (file)
--- a/src/bsd/device.c
+++ b/src/bsd/device.c
@@ -28,7 +28,7 @@
 #include "../xalloc.h"
 
 #ifdef ENABLE_TUNEMU
-#include "bsd/tunemu.h"
+#include "tunemu.h"
 #endif
 
 #ifdef HAVE_NET_IF_UTUN_H

diff --git a/src/openssl/rsagen.c b/src/openssl/rsagen.c
index ce0bd0bf42b4b7578c7cc3ce1db3bdd7e14bcb03..3674057c5da9af495e17c15285ff40d71b3039d7 100644 (file)
--- a/src/openssl/rsagen.c
+++ b/src/openssl/rsagen.c
@@ -17,7 +17,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "system.h"
+#include "../system.h"
 
 #include <openssl/pem.h>
 #include <openssl/err.h>

diff --git a/src/tincd.c b/src/tincd.c
index 022fb536dea5dca42e3cc276cae8b6ed32077742..da3f03b1e56b6b6caf4602115155857244315e76 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -143,7 +143,7 @@ static void usage(bool status) {
                        "\n"
                        "Report bugs to tinc@tinc-vpn.org.\n";
 
-               fprintf(stderr, message, program_name);
+               printf(message, program_name);
        }
 }