Restructure: Move classic German tones from common code to 'libgermanton'

src/Makefile.am

@@ -1,3 +1,3 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = libtimer libsamplerate libfilter common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
+SUBDIRS = libgermanton libtimer libsamplerate libfilter common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
 

src/anetz/Makefile.am

@@ -11,7 +11,7 @@ anetz_SOURCES = \
 	main.c
 anetz_LDADD = \
 	$(COMMON_LA) \
-	$(top_builddir)/src/common/libgermanton.a \
+	$(top_builddir)/src/libgermanton/libgermanton.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libtimer/libtimer.a \

src/anetz/main.c

@@ -29,8 +29,8 @@
 #include "../libtimer/timer.h"
 #include "../common/call.h"
 #include "../common/mncc_sock.h"
-#include "../common/freiton.h"
-#include "../common/besetztton.h"
+#include "../libgermanton/freiton.h"
+#include "../libgermanton/besetztton.h"
 #include "anetz.h"
 #include "dsp.h"
 #include "stations.h"

src/bnetz/Makefile.am

@@ -13,7 +13,7 @@ bnetz_SOURCES = \
 	main.c
 bnetz_LDADD = \
 	$(COMMON_LA) \
-	$(top_builddir)/src/common/libgermanton.a \
+	$(top_builddir)/src/libgermanton/libgermanton.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libtimer/libtimer.a \

src/bnetz/main.c

@@ -28,8 +28,8 @@
 #include "../common/call.h"
 #include "../common/mncc_sock.h"
 #include "../common/main_mobile.h"
-#include "../common/freiton.h"
-#include "../common/besetztton.h"
+#include "../libgermanton/freiton.h"
+#include "../libgermanton/besetztton.h"
 #include "bnetz.h"
 #include "dsp.h"
 #include "stations.h"

src/cnetz/Makefile.am

@@ -17,7 +17,7 @@ cnetz_SOURCES = \
 	main.c
 cnetz_LDADD = \
 	$(COMMON_LA) \
-	$(top_builddir)/src/common/libgermanton.a \
+	$(top_builddir)/src/libgermanton/libgermanton.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libtimer/libtimer.a \

src/cnetz/main.c

@@ -27,8 +27,8 @@
 #include "../common/debug.h"
 #include "../common/call.h"
 #include "../common/mncc_sock.h"
-#include "../common/freiton.h"
-#include "../common/besetztton.h"
+#include "../libgermanton/freiton.h"
+#include "../libgermanton/besetztton.h"
 #include "cnetz.h"
 #include "database.h"
 #include "sysinfo.h"

src/common/Makefile.am

@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) $(GRAPHICSMAGICK_CFLAGS) $(IMAGEMAGICK_CFLAGS) $(UHD_CFLAGS) $(SOAPY_CFLAGS)
 
-noinst_LIBRARIES = libcommon.a libmobile.a libgermanton.a libimage.a
+noinst_LIBRARIES = libcommon.a libmobile.a libimage.a
 
 libcommon_a_SOURCES = \
 	sample.c \
@@ -31,10 +31,6 @@ libmobile_a_SOURCES = \
 	display_status.c \
 	main_mobile.c
 
-libgermanton_a_SOURCES = \
-	freiton.c\
-	besetztton.c
-
 libimage_a_SOURCES = \
 	img.c
 

src/libgermanton/Makefile.am

@@ -0,0 +1,8 @@
+AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+
+noinst_LIBRARIES = libgermanton.a
+
+libgermanton_a_SOURCES = \
+	freiton.c\
+	besetztton.c
+