From 7af9b752a03675ee1f219c0bf14162c5c628870b Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Thu, 16 Nov 2017 18:37:25 +0100 Subject: [PATCH] Restructure: Move 'libgermantone' to a-netz code --- .gitignore | 3 ++- configure.ac | 2 +- src/Makefile.am | 2 +- src/amps/Makefile.am | 1 + src/anetz/Makefile.am | 9 ++++++++- src/{libgermanton => anetz}/besetztton.c | 0 src/{libgermanton => anetz}/besetztton.h | 0 src/{libgermanton => anetz}/freiton.c | 0 src/{libgermanton => anetz}/freiton.h | 0 src/anetz/main.c | 4 ++-- src/bnetz/Makefile.am | 3 ++- src/bnetz/main.c | 4 ++-- src/cnetz/Makefile.am | 3 ++- src/cnetz/main.c | 4 ++-- src/common/Makefile.am | 1 - src/common/display_spectrum.c | 2 +- src/jtacs/Makefile.am | 1 + src/libgermanton/Makefile.am | 8 -------- src/nmt/Makefile.am | 1 + src/r2000/Makefile.am | 1 + src/tacs/Makefile.am | 1 + src/test/Makefile.am | 4 ++++ src/tv/Makefile.am | 1 + 23 files changed, 33 insertions(+), 22 deletions(-) rename src/{libgermanton => anetz}/besetztton.c (100%) rename src/{libgermanton => anetz}/besetztton.h (100%) rename src/{libgermanton => anetz}/freiton.c (100%) rename src/{libgermanton => anetz}/freiton.h (100%) delete mode 100644 src/libgermanton/Makefile.am diff --git a/.gitignore b/.gitignore index 3e174b7..94039ad 100644 --- a/.gitignore +++ b/.gitignore @@ -25,16 +25,17 @@ src/libjitter/libjitter.a src/libsquelch/libsquelch.a src/libhagelbarger/libhagelbarger.a src/libdtmf/libdtmf.a -src/libgermanton/libgermanton.a src/libtimer/libtimer.a src/libsamplerate/libsamplerate.a src/libscrambler/libscrambler.a src/libemphasis/libemphasis.a src/libfilter/libfilter.a src/libwave/libwave.a +src/libfft/libfft.a src/common/libcommon.a src/common/libmobile.a src/common/libimage.a +src/anetz/libgermanton.a src/anetz/anetz src/bnetz/bnetz src/cnetz/cnetz diff --git a/configure.ac b/configure.ac index ddaaa7d..82f5eae 100644 --- a/configure.ac +++ b/configure.ac @@ -80,13 +80,13 @@ AC_OUTPUT( src/libsquelch/Makefile src/libhagelbarger/Makefile src/libdtmf/Makefile - src/libgermanton/Makefile src/libtimer/Makefile src/libsamplerate/Makefile src/libscrambler/Makefile src/libemphasis/Makefile src/libfilter/Makefile src/libwave/Makefile + src/libfft/Makefile src/common/Makefile src/anetz/Makefile src/bnetz/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index faac7c8..5edcabe 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,3 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = libgoertzel libjitter libsquelch libhagelbarger libdtmf libgermanton libtimer libsamplerate libscrambler libemphasis libfilter libwave common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test +SUBDIRS = libgoertzel libjitter libsquelch libhagelbarger libdtmf libtimer libsamplerate libscrambler libemphasis libfilter libwave libfft common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test diff --git a/src/amps/Makefile.am b/src/amps/Makefile.am index 756cea9..3e96124 100644 --- a/src/amps/Makefile.am +++ b/src/amps/Makefile.am @@ -35,6 +35,7 @@ amps_LDADD = \ $(top_builddir)/src/libemphasis/libemphasis.a \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libwave/libwave.a \ + $(top_builddir)/src/libfft/libfft.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ diff --git a/src/anetz/Makefile.am b/src/anetz/Makefile.am index a2f2857..6864631 100644 --- a/src/anetz/Makefile.am +++ b/src/anetz/Makefile.am @@ -3,6 +3,12 @@ AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) bin_PROGRAMS = \ anetz +noinst_LIBRARIES = libgermanton.a + +libgermanton_a_SOURCES = \ + freiton.c\ + besetztton.c + anetz_SOURCES = \ anetz.c \ dsp.c \ @@ -11,10 +17,10 @@ anetz_SOURCES = \ main.c anetz_LDADD = \ $(COMMON_LA) \ + libgermanton.a \ $(top_builddir)/src/libgoertzel/libgoertzel.a \ $(top_builddir)/src/libjitter/libjitter.a \ $(top_builddir)/src/libsquelch/libsquelch.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 \ @@ -22,6 +28,7 @@ anetz_LDADD = \ $(top_builddir)/src/libemphasis/libemphasis.a \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libwave/libwave.a \ + $(top_builddir)/src/libfft/libfft.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ diff --git a/src/libgermanton/besetztton.c b/src/anetz/besetztton.c similarity index 100% rename from src/libgermanton/besetztton.c rename to src/anetz/besetztton.c diff --git a/src/libgermanton/besetztton.h b/src/anetz/besetztton.h similarity index 100% rename from src/libgermanton/besetztton.h rename to src/anetz/besetztton.h diff --git a/src/libgermanton/freiton.c b/src/anetz/freiton.c similarity index 100% rename from src/libgermanton/freiton.c rename to src/anetz/freiton.c diff --git a/src/libgermanton/freiton.h b/src/anetz/freiton.h similarity index 100% rename from src/libgermanton/freiton.h rename to src/anetz/freiton.h diff --git a/src/anetz/main.c b/src/anetz/main.c index 14aa1f4..9e235a7 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 "../libgermanton/freiton.h" -#include "../libgermanton/besetztton.h" +#include "freiton.h" +#include "besetztton.h" #include "anetz.h" #include "dsp.h" #include "stations.h" diff --git a/src/bnetz/Makefile.am b/src/bnetz/Makefile.am index 5230529..009ec07 100644 --- a/src/bnetz/Makefile.am +++ b/src/bnetz/Makefile.am @@ -13,9 +13,9 @@ bnetz_SOURCES = \ main.c bnetz_LDADD = \ $(COMMON_LA) \ + ../anetz/libgermanton.a \ $(top_builddir)/src/libjitter/libjitter.a \ $(top_builddir)/src/libsquelch/libsquelch.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 \ @@ -23,6 +23,7 @@ bnetz_LDADD = \ $(top_builddir)/src/libemphasis/libemphasis.a \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libwave/libwave.a \ + $(top_builddir)/src/libfft/libfft.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ diff --git a/src/bnetz/main.c b/src/bnetz/main.c index cb4162e..64ae93f 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 "../libgermanton/freiton.h" -#include "../libgermanton/besetztton.h" +#include "../anetz/freiton.h" +#include "../anetz/besetztton.h" #include "bnetz.h" #include "dsp.h" #include "stations.h" diff --git a/src/cnetz/Makefile.am b/src/cnetz/Makefile.am index d1a3b20..e4df7ef 100644 --- a/src/cnetz/Makefile.am +++ b/src/cnetz/Makefile.am @@ -16,8 +16,8 @@ cnetz_SOURCES = \ main.c cnetz_LDADD = \ $(COMMON_LA) \ + ../anetz/libgermanton.a \ $(top_builddir)/src/libjitter/libjitter.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 \ @@ -26,6 +26,7 @@ cnetz_LDADD = \ $(top_builddir)/src/libemphasis/libemphasis.a \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libwave/libwave.a \ + $(top_builddir)/src/libfft/libfft.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ diff --git a/src/cnetz/main.c b/src/cnetz/main.c index d837130..e54490d 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 "../libgermanton/freiton.h" -#include "../libgermanton/besetztton.h" +#include "../anetz/freiton.h" +#include "../anetz/besetztton.h" #include "cnetz.h" #include "database.h" #include "sysinfo.h" diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 56b4c84..52ee381 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -7,7 +7,6 @@ libcommon_a_SOURCES = \ debug.c \ sound_alsa.c \ compandor.c \ - fft.c \ fm_modulation.c \ fsk.c \ display_wave.c \ diff --git a/src/common/display_spectrum.c b/src/common/display_spectrum.c index 54c0fc0..80af735 100644 --- a/src/common/display_spectrum.c +++ b/src/common/display_spectrum.c @@ -24,7 +24,7 @@ #include #include "sample.h" #include "sender.h" -#include "fft.h" +#include "../libfft/fft.h" #define HEIGHT 20 diff --git a/src/jtacs/Makefile.am b/src/jtacs/Makefile.am index c53ac0c..3c01af1 100644 --- a/src/jtacs/Makefile.am +++ b/src/jtacs/Makefile.am @@ -21,6 +21,7 @@ jtacs_LDADD = \ $(top_builddir)/src/libemphasis/libemphasis.a \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libwave/libwave.a \ + $(top_builddir)/src/libfft/libfft.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ diff --git a/src/libgermanton/Makefile.am b/src/libgermanton/Makefile.am deleted file mode 100644 index 4e548af..0000000 --- a/src/libgermanton/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) - -noinst_LIBRARIES = libgermanton.a - -libgermanton_a_SOURCES = \ - freiton.c\ - besetztton.c - diff --git a/src/nmt/Makefile.am b/src/nmt/Makefile.am index 6f61e79..a32875a 100644 --- a/src/nmt/Makefile.am +++ b/src/nmt/Makefile.am @@ -33,6 +33,7 @@ nmt_LDADD = \ $(top_builddir)/src/libemphasis/libemphasis.a \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libwave/libwave.a \ + $(top_builddir)/src/libfft/libfft.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ diff --git a/src/r2000/Makefile.am b/src/r2000/Makefile.am index fe0c2f9..e6d9bc4 100644 --- a/src/r2000/Makefile.am +++ b/src/r2000/Makefile.am @@ -21,6 +21,7 @@ radiocom2000_LDADD = \ $(top_builddir)/src/libemphasis/libemphasis.a \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libwave/libwave.a \ + $(top_builddir)/src/libfft/libfft.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ diff --git a/src/tacs/Makefile.am b/src/tacs/Makefile.am index f36371b..d0ae341 100644 --- a/src/tacs/Makefile.am +++ b/src/tacs/Makefile.am @@ -22,6 +22,7 @@ tacs_LDADD = \ $(top_builddir)/src/libemphasis/libemphasis.a \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libwave/libwave.a \ + $(top_builddir)/src/libfft/libfft.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ diff --git a/src/test/Makefile.am b/src/test/Makefile.am index c2c445e..62ca801 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -21,6 +21,7 @@ test_filter_LDADD = \ $(top_builddir)/src/libemphasis/libemphasis.a \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libwave/libwave.a \ + $(top_builddir)/src/libfft/libfft.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ @@ -49,6 +50,7 @@ test_emphasis_LDADD = \ $(top_builddir)/src/libemphasis/libemphasis.a \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libwave/libwave.a \ + $(top_builddir)/src/libfft/libfft.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ @@ -67,6 +69,7 @@ test_dms_LDADD = \ $(top_builddir)/src/libemphasis/libemphasis.a \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libwave/libwave.a \ + $(top_builddir)/src/libfft/libfft.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ @@ -85,6 +88,7 @@ test_sms_LDADD = \ $(top_builddir)/src/libemphasis/libemphasis.a \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libwave/libwave.a \ + $(top_builddir)/src/libfft/libfft.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ diff --git a/src/tv/Makefile.am b/src/tv/Makefile.am index b4c068d..3277ed4 100644 --- a/src/tv/Makefile.am +++ b/src/tv/Makefile.am @@ -19,6 +19,7 @@ osmotv_LDADD = \ $(top_builddir)/src/libtimer/libtimer.a \ $(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libwave/libwave.a \ + $(top_builddir)/src/libfft/libfft.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \