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

pull/1/head
Andreas Eversberg 5 years ago
parent b605da1aff
commit ffd934709f

2
.gitignore vendored

@ -20,13 +20,13 @@ compile
.libs
.dirstamp
m4
src/libgermanton/libgermanton.a
src/libtimer/libtimer.a
src/libsamplerate/libsamplerate.a
src/libfilter/libfilter.a
src/common/libcommon.a
src/common/libmobile.a
src/common/libimage.a
src/common/libgermanton.a
src/anetz/anetz
src/bnetz/bnetz
src/cnetz/cnetz

@ -75,6 +75,7 @@ AS_IF([test "x$with_soapy" == "xyes"],[AC_MSG_NOTICE( Compiling with SoapySDR su
AS_IF([test "x$somethingmagick" == "xyes"],[AC_MSG_NOTICE( Compiling with ImageMagick )],[AC_MSG_NOTICE( ImageMagick not supported )])
AC_OUTPUT(
src/libgermanton/Makefile
src/libtimer/Makefile
src/libsamplerate/Makefile
src/libfilter/Makefile

@ -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

@ -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 \

@ -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"

@ -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 \

@ -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"

@ -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 \

@ -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"

@ -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

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