From 3c0bcce97b96b715e7e1d5ffff6f336989bac2c7 Mon Sep 17 00:00:00 2001
From: Andreas Eversberg <jolly@eversberg.eu>
Date: Sun, 20 Aug 2017 08:09:35 +0200
Subject: [PATCH] Move German tones from common code to individual
 implementation

---
 src/anetz/Makefile.am              | 2 ++
 src/anetz/anetz.c                  | 2 --
 src/{common => anetz}/besetztton.c | 0
 src/{common => anetz}/besetztton.h | 0
 src/{common => anetz}/freiton.c    | 0
 src/{common => anetz}/freiton.h    | 0
 src/anetz/main.c                   | 4 ++--
 src/bnetz/Makefile.am              | 3 +++
 src/bnetz/main.c                   | 4 ++--
 src/cnetz/Makefile.am              | 3 +++
 src/cnetz/main.c                   | 4 ++--
 src/common/Makefile.am             | 2 --
 12 files changed, 14 insertions(+), 10 deletions(-)
 rename src/{common => anetz}/besetztton.c (100%)
 rename src/{common => anetz}/besetztton.h (100%)
 rename src/{common => anetz}/freiton.c (100%)
 rename src/{common => anetz}/freiton.h (100%)

diff --git a/src/anetz/Makefile.am b/src/anetz/Makefile.am
index 4fa79b0..f78232d 100644
--- a/src/anetz/Makefile.am
+++ b/src/anetz/Makefile.am
@@ -8,6 +8,8 @@ anetz_SOURCES = \
 	dsp.c \
 	stations.c \
 	image.c \
+	freiton.c \
+	besetztton.c \
 	main.c
 anetz_LDADD = \
 	$(COMMON_LA) \
diff --git a/src/anetz/anetz.c b/src/anetz/anetz.c
index 8acd098..e19c47a 100644
--- a/src/anetz/anetz.c
+++ b/src/anetz/anetz.c
@@ -29,8 +29,6 @@
 #include "../common/timer.h"
 #include "../common/call.h"
 #include "../common/cause.h"
-#include "../common/freiton.h"
-#include "../common/besetztton.h"
 #include "anetz.h"
 #include "dsp.h"
 
diff --git a/src/common/besetztton.c b/src/anetz/besetztton.c
similarity index 100%
rename from src/common/besetztton.c
rename to src/anetz/besetztton.c
diff --git a/src/common/besetztton.h b/src/anetz/besetztton.h
similarity index 100%
rename from src/common/besetztton.h
rename to src/anetz/besetztton.h
diff --git a/src/common/freiton.c b/src/anetz/freiton.c
similarity index 100%
rename from src/common/freiton.c
rename to src/anetz/freiton.c
diff --git a/src/common/freiton.h b/src/anetz/freiton.h
similarity index 100%
rename from src/common/freiton.h
rename to src/anetz/freiton.h
diff --git a/src/anetz/main.c b/src/anetz/main.c
index 5ad3a1d..4e00fe9 100644
--- a/src/anetz/main.c
+++ b/src/anetz/main.c
@@ -29,8 +29,8 @@
 #include "../common/timer.h"
 #include "../common/call.h"
 #include "../common/mncc_sock.h"
-#include "../common/freiton.h"
-#include "../common/besetztton.h"
+#include "freiton.h"
+#include "besetztton.h"
 #include "anetz.h"
 #include "dsp.h"
 #include "stations.h"
diff --git a/src/bnetz/Makefile.am b/src/bnetz/Makefile.am
index b19e595..7043b20 100644
--- a/src/bnetz/Makefile.am
+++ b/src/bnetz/Makefile.am
@@ -1,3 +1,4 @@
+AUTOMAKE_OPTIONS = subdir-objects
 AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
 
 bin_PROGRAMS = \
@@ -9,6 +10,8 @@ bnetz_SOURCES = \
 	dsp.c \
 	stations.c \
 	image.c \
+	$(top_builddir)/src/anetz/freiton.c \
+	$(top_builddir)/src/anetz/besetztton.c \
 	ansage.c \
 	main.c
 bnetz_LDADD = \
diff --git a/src/bnetz/main.c b/src/bnetz/main.c
index 23d7cb9..fc8d0e7 100644
--- a/src/bnetz/main.c
+++ b/src/bnetz/main.c
@@ -28,8 +28,8 @@
 #include "../common/call.h"
 #include "../common/mncc_sock.h"
 #include "../common/main.h"
-#include "../common/freiton.h"
-#include "../common/besetztton.h"
+#include "../anetz/freiton.h"
+#include "../anetz/besetztton.h"
 #include "bnetz.h"
 #include "dsp.h"
 #include "stations.h"
diff --git a/src/cnetz/Makefile.am b/src/cnetz/Makefile.am
index 2177f1d..97988a5 100644
--- a/src/cnetz/Makefile.am
+++ b/src/cnetz/Makefile.am
@@ -1,3 +1,4 @@
+AUTOMAKE_OPTIONS = subdir-objects
 AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
 
 bin_PROGRAMS = \
@@ -13,6 +14,8 @@ cnetz_SOURCES = \
 	fsk_demod.c \
 	scrambler.c \
 	image.c \
+	$(top_builddir)/src/anetz/freiton.c \
+	$(top_builddir)/src/anetz/besetztton.c \
 	ansage.c \
 	main.c
 cnetz_LDADD = \
diff --git a/src/cnetz/main.c b/src/cnetz/main.c
index 699e6ba..f5b0c44 100644
--- a/src/cnetz/main.c
+++ b/src/cnetz/main.c
@@ -28,8 +28,8 @@
 #include "../common/timer.h"
 #include "../common/call.h"
 #include "../common/mncc_sock.h"
-#include "../common/freiton.h"
-#include "../common/besetztton.h"
+#include "../anetz/freiton.h"
+#include "../anetz/besetztton.h"
 #include "cnetz.h"
 #include "database.h"
 #include "sysinfo.h"
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 5b15507..8426f4c 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -15,8 +15,6 @@ libcommon_a_SOURCES = \
 	dtmf.c \
 	samplerate.c \
 	call.c \
-	freiton.c \
-	besetztton.c \
 	testton.c \
 	mncc_sock.c \
 	cause.c \