aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2017-09-11 20:35:18 +0200
committerAndreas Eversberg <jolly@eversberg.eu>2017-09-11 20:35:18 +0200
commitb6326aa473ce9327ba3eb7ba2cb66eecb2572258 (patch)
tree9eb3a210a2f696f9531b0c8c626c61c4b6505f5a
parent7017fd7b3c88a0704992ac51ab97c91d56a9407b (diff)
Move commonly used German tones (A/B/C-Netz) to separate lib.a
-rw-r--r--src/anetz/Makefile.am3
-rw-r--r--src/anetz/main.c4
-rw-r--r--src/bnetz/Makefile.am4
-rw-r--r--src/bnetz/main.c4
-rw-r--r--src/cnetz/Makefile.am4
-rw-r--r--src/cnetz/main.c4
-rw-r--r--src/common/Makefile.am6
7 files changed, 14 insertions, 15 deletions
diff --git a/src/anetz/Makefile.am b/src/anetz/Makefile.am
index 29307e5..48e7489 100644
--- a/src/anetz/Makefile.am
+++ b/src/anetz/Makefile.am
@@ -8,11 +8,10 @@ anetz_SOURCES = \
dsp.c \
stations.c \
image.c \
- freiton.c \
- besetztton.c \
main.c
anetz_LDADD = \
$(COMMON_LA) \
+ $(top_builddir)/src/common/libgermanton.a \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \
diff --git a/src/anetz/main.c b/src/anetz/main.c
index 2a5b333..ac20232 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 "freiton.h"
-#include "besetztton.h"
+#include "../common/freiton.h"
+#include "../common/besetztton.h"
#include "anetz.h"
#include "dsp.h"
#include "stations.h"
diff --git a/src/bnetz/Makefile.am b/src/bnetz/Makefile.am
index f8bcfaf..059f455 100644
--- a/src/bnetz/Makefile.am
+++ b/src/bnetz/Makefile.am
@@ -1,4 +1,3 @@
-AUTOMAKE_OPTIONS = subdir-objects
AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
bin_PROGRAMS = \
@@ -10,12 +9,11 @@ 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 = \
$(COMMON_LA) \
+ $(top_builddir)/src/common/libgermanton.a \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \
diff --git a/src/bnetz/main.c b/src/bnetz/main.c
index 96271bd..9b7cf44 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_mobile.h"
-#include "../anetz/freiton.h"
-#include "../anetz/besetztton.h"
+#include "../common/freiton.h"
+#include "../common/besetztton.h"
#include "bnetz.h"
#include "dsp.h"
#include "stations.h"
diff --git a/src/cnetz/Makefile.am b/src/cnetz/Makefile.am
index e975eff..9d5c86b 100644
--- a/src/cnetz/Makefile.am
+++ b/src/cnetz/Makefile.am
@@ -1,4 +1,3 @@
-AUTOMAKE_OPTIONS = subdir-objects
AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
bin_PROGRAMS = \
@@ -14,12 +13,11 @@ 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 = \
$(COMMON_LA) \
+ $(top_builddir)/src/common/libgermanton.a \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \
diff --git a/src/cnetz/main.c b/src/cnetz/main.c
index 7180df1..c62f9f0 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 "../anetz/freiton.h"
-#include "../anetz/besetztton.h"
+#include "../common/freiton.h"
+#include "../common/besetztton.h"
#include "cnetz.h"
#include "database.h"
#include "sysinfo.h"
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index e5afdc7..6cb64b6 100644
--- a/src/common/Makefile.am
+++ b/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 libimage.a
+noinst_LIBRARIES = libcommon.a libmobile.a libgermanton.a libimage.a
libcommon_a_SOURCES = \
sample.c \
@@ -31,6 +31,10 @@ libmobile_a_SOURCES = \
display_status.c \
main_mobile.c
+libgermanton_a_SOURCES = \
+ freiton.c\
+ besetztton.c
+
libimage_a_SOURCES = \
img.c