From ffd934709ff9ad2c208735e39b4b1cdf71976d51 Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Mon, 13 Nov 2017 20:14:03 +0100 Subject: [PATCH] Restructure: Move classic German tones from common code to 'libgermanton' --- .gitignore | 2 +- configure.ac | 1 + src/Makefile.am | 2 +- src/anetz/Makefile.am | 2 +- src/anetz/main.c | 4 ++-- src/bnetz/Makefile.am | 2 +- src/bnetz/main.c | 4 ++-- src/cnetz/Makefile.am | 2 +- src/cnetz/main.c | 4 ++-- src/common/Makefile.am | 6 +----- src/libgermanton/Makefile.am | 8 ++++++++ src/{common => libgermanton}/besetztton.c | 0 src/{common => libgermanton}/besetztton.h | 0 src/{common => libgermanton}/freiton.c | 0 src/{common => libgermanton}/freiton.h | 0 15 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 src/libgermanton/Makefile.am rename src/{common => libgermanton}/besetztton.c (100%) rename src/{common => libgermanton}/besetztton.h (100%) rename src/{common => libgermanton}/freiton.c (100%) rename src/{common => libgermanton}/freiton.h (100%) diff --git a/.gitignore b/.gitignore index c2bf2a3..30c29ca 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/configure.ac b/configure.ac index 40ce417..109ae00 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/Makefile.am b/src/Makefile.am index 29743ae..39668e0 100644 --- a/src/Makefile.am +++ b/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 diff --git a/src/anetz/Makefile.am b/src/anetz/Makefile.am index 94b3f3c..fcec1fc 100644 --- a/src/anetz/Makefile.am +++ b/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 \ diff --git a/src/anetz/main.c b/src/anetz/main.c index ebd47fd..14aa1f4 100644 --- a/src/anetz/main.c +++ b/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" diff --git a/src/bnetz/Makefile.am b/src/bnetz/Makefile.am index 6c1e478..505a915 100644 --- a/src/bnetz/Makefile.am +++ b/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 \ diff --git a/src/bnetz/main.c b/src/bnetz/main.c index 9d7e7d6..cb4162e 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 "../common/freiton.h" -#include "../common/besetztton.h" +#include "../libgermanton/freiton.h" +#include "../libgermanton/besetztton.h" #include "bnetz.h" #include "dsp.h" #include "stations.h" diff --git a/src/cnetz/Makefile.am b/src/cnetz/Makefile.am index c0f6c90..b3791e1 100644 --- a/src/cnetz/Makefile.am +++ b/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 \ diff --git a/src/cnetz/main.c b/src/cnetz/main.c index 7f01f13..d837130 100644 --- a/src/cnetz/main.c +++ b/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" diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 50ee36a..fa686ef 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 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 diff --git a/src/libgermanton/Makefile.am b/src/libgermanton/Makefile.am new file mode 100644 index 0000000..4e548af --- /dev/null +++ b/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 + diff --git a/src/common/besetztton.c b/src/libgermanton/besetztton.c similarity index 100% rename from src/common/besetztton.c rename to src/libgermanton/besetztton.c diff --git a/src/common/besetztton.h b/src/libgermanton/besetztton.h similarity index 100% rename from src/common/besetztton.h rename to src/libgermanton/besetztton.h diff --git a/src/common/freiton.c b/src/libgermanton/freiton.c similarity index 100% rename from src/common/freiton.c rename to src/libgermanton/freiton.c diff --git a/src/common/freiton.h b/src/libgermanton/freiton.h similarity index 100% rename from src/common/freiton.h rename to src/libgermanton/freiton.h