Restructure: Move 'libgermantone' to a-netz code

pull/1/head
Andreas Eversberg 5 years ago
parent cb30c96bc6
commit 7af9b752a0
  1. 3
      .gitignore
  2. 2
      configure.ac
  3. 2
      src/Makefile.am
  4. 1
      src/amps/Makefile.am
  5. 9
      src/anetz/Makefile.am
  6. 0
      src/anetz/besetztton.c
  7. 0
      src/anetz/besetztton.h
  8. 0
      src/anetz/freiton.c
  9. 0
      src/anetz/freiton.h
  10. 4
      src/anetz/main.c
  11. 3
      src/bnetz/Makefile.am
  12. 4
      src/bnetz/main.c
  13. 3
      src/cnetz/Makefile.am
  14. 4
      src/cnetz/main.c
  15. 1
      src/common/Makefile.am
  16. 2
      src/common/display_spectrum.c
  17. 1
      src/jtacs/Makefile.am
  18. 8
      src/libgermanton/Makefile.am
  19. 1
      src/nmt/Makefile.am
  20. 1
      src/r2000/Makefile.am
  21. 1
      src/tacs/Makefile.am
  22. 4
      src/test/Makefile.am
  23. 1
      src/tv/Makefile.am

3
.gitignore vendored

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

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

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

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

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

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

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

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

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

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

@ -7,7 +7,6 @@ libcommon_a_SOURCES = \
debug.c \
sound_alsa.c \
compandor.c \
fft.c \
fm_modulation.c \
fsk.c \
display_wave.c \

@ -24,7 +24,7 @@
#include <math.h>
#include "sample.h"
#include "sender.h"
#include "fft.h"
#include "../libfft/fft.h"
#define HEIGHT 20

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

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

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

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

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

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

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

Loading…
Cancel
Save