From 185a8731839551fc9df7059ac374be5f5e35c086 Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@meshlink.io>
Date: Mon, 14 Aug 2017 22:30:14 +0200
Subject: [PATCH] Remove unused/duplicate autoconf/automake definitions.

---
 configure.ac     |  1 -
 src/Makefile.am  | 30 ------------------------------
 test/Makefile.am |  3 ---
 3 files changed, 34 deletions(-)

diff --git a/configure.ac b/configure.ac
index ec530b24..614b10db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
 AC_INIT([MeshLink], [0.1])
-AC_GNU_SOURCE
 AM_INIT_AUTOMAKE([std-options subdir-objects nostdinc silent-rules -Wall])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/src/Makefile.am b/src/Makefile.am
index 07f0bb77..6340a1a2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,32 +25,6 @@ chacha_poly1305_SOURCES = \
 utcp_SOURCES = \
 	utcp/utcp.c utcp/utcp.h
 
-sptps_test_SOURCES = \
-	crypto.c crypto.h \
-	logger.c logger.h \
-	prf.c prf.h \
-	sptps.c sptps.h \
-	sptps_test.c \
-	utils.c utils.h \
-	$(ed25519_SOURCES) \
-	$(chacha_poly1305_SOURCES)
-
-sptps_keypair_SOURCES = \
-	crypto.c crypto.h \
-	sptps_keypair.c \
-	utils.c utils.h \
-	$(ed25519_SOURCES)
-
-sptps_speed_SOURCES = \
-	crypto.c crypto.h \
-	logger.c logger.h \
-	prf.c prf.h \
-	sptps.c sptps.h \
-	sptps_speed.c \
-	utils.c utils.h \
-	$(ed25519_SOURCES) \
-	$(chacha_poly1305_SOURCES)
-
 lib_LTLIBRARIES = libmeshlink.la
 
 pkginclude_HEADERS = meshlink++.h meshlink.h
@@ -115,7 +89,3 @@ libmeshlink_la_SOURCES += \
 	ed25519/ecdh.c \
 	ed25519/ecdsa.c \
 	ed25519/ecdsagen.c
-
-LIBS = @LIBS@
-
-AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
diff --git a/test/Makefile.am b/test/Makefile.am
index c9a66024..fac85e03 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -54,6 +54,3 @@ invite_join_LDADD = ../src/libmeshlink.la
 
 sign_verify_SOURCES = sign-verify.c
 sign_verify_LDADD = ../src/libmeshlink.la
-
-channels_SOURCES = channels.c
-channels_LDADD = ../src/libmeshlink.la
-- 
2.39.2