williamp/osmocom-analog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move commonly used German tones (A/B/C-Netz) to separate lib.a

Browse Source
This commit is contained in:
Andreas Eversberg
2017-09-11 20:35:18 +02:00
parent 7017fd7b3c
commit b6326aa473
7 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/anetz/Makefile.am
View File

@@ -8,11 +8,10 @@ anetz_SOURCES = \
dsp.c \ dsp.c \
stations.c \ stations.c \
image.c \ image.c \
freiton.c \
besetztton.c \
main.c main.c
anetz_LDADD = \ anetz_LDADD = \
$(COMMON_LA) \ $(COMMON_LA) \
$(top_builddir)/src/common/libgermanton.a \
$(top_builddir)/src/common/libmobile.a \ $(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \ $(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \ $(ALSA_LIBS) \

4
src/anetz/main.c
View File

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

4
src/bnetz/Makefile.am
View File

@@ -1,4 +1,3 @@
AUTOMAKE_OPTIONS = subdir-objects
AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
bin_PROGRAMS = \ bin_PROGRAMS = \
@@ -10,12 +9,11 @@ bnetz_SOURCES = \
dsp.c \ dsp.c \
stations.c \ stations.c \
image.c \ image.c \
$(top_builddir)/src/anetz/freiton.c \
$(top_builddir)/src/anetz/besetztton.c \
ansage.c \ ansage.c \
main.c main.c
bnetz_LDADD = \ bnetz_LDADD = \
$(COMMON_LA) \ $(COMMON_LA) \
$(top_builddir)/src/common/libgermanton.a \
$(top_builddir)/src/common/libmobile.a \ $(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \ $(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \ $(ALSA_LIBS) \

4
src/bnetz/main.c
View File

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

4
src/cnetz/Makefile.am
View File

@@ -1,4 +1,3 @@
AUTOMAKE_OPTIONS = subdir-objects
AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
bin_PROGRAMS = \ bin_PROGRAMS = \
@@ -14,12 +13,11 @@ cnetz_SOURCES = \
fsk_demod.c \ fsk_demod.c \
scrambler.c \ scrambler.c \
image.c \ image.c \
$(top_builddir)/src/anetz/freiton.c \
$(top_builddir)/src/anetz/besetztton.c \
ansage.c \ ansage.c \
main.c main.c
cnetz_LDADD = \ cnetz_LDADD = \
$(COMMON_LA) \ $(COMMON_LA) \
$(top_builddir)/src/common/libgermanton.a \
$(top_builddir)/src/common/libmobile.a \ $(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \ $(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \ $(ALSA_LIBS) \

4
src/cnetz/main.c
View File

@@ -28,8 +28,8 @@
#include "../common/timer.h" #include "../common/timer.h"
#include "../common/call.h" #include "../common/call.h"
#include "../common/mncc_sock.h" #include "../common/mncc_sock.h"
#include "../anetz/freiton.h" #include "../common/freiton.h"
#include "../anetz/besetztton.h" #include "../common/besetztton.h"
#include "cnetz.h" #include "cnetz.h"
#include "database.h" #include "database.h"
#include "sysinfo.h" #include "sysinfo.h"

6
src/common/Makefile.am
View File

@@ -1,6 +1,6 @@
AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) $(GRAPHICSMAGICK_CFLAGS) $(IMAGEMAGICK_CFLAGS) $(UHD_CFLAGS) $(SOAPY_CFLAGS) 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 = \ libcommon_a_SOURCES = \
sample.c \ sample.c \
@@ -31,6 +31,10 @@ libmobile_a_SOURCES = \
display_status.c \ display_status.c \
main_mobile.c main_mobile.c
libgermanton_a_SOURCES = \
freiton.c\
besetztton.c
libimage_a_SOURCES = \ libimage_a_SOURCES = \
img.c img.c