Restructure: Move display from common code to 'libdisplay'

pull/1/head
Andreas Eversberg 5 years ago
parent ab59a26a51
commit 016e72d6d7
  1. 1
      .gitignore
  2. 1
      configure.ac
  3. 1
      src/Makefile.am
  4. 1
      src/amps/Makefile.am
  5. 1
      src/anetz/Makefile.am
  6. 1
      src/bnetz/Makefile.am
  7. 1
      src/cnetz/Makefile.am
  8. 8
      src/common/Makefile.am
  9. 2
      src/common/debug.c
  10. 1
      src/jtacs/Makefile.am
  11. 19
      src/libdisplay/Makefile.am
  12. 0
      src/libdisplay/display.h
  13. 0
      src/libdisplay/display_iq.c
  14. 0
      src/libdisplay/display_measurements.c
  15. 0
      src/libdisplay/display_spectrum.c
  16. 2
      src/libdisplay/display_status.c
  17. 0
      src/libdisplay/display_wave.c
  18. 1
      src/libmobile/Makefile.am
  19. 2
      src/libmobile/sender.h
  20. 6
      src/libsdr/Makefile.am
  21. 1
      src/nmt/Makefile.am
  22. 1
      src/r2000/Makefile.am
  23. 1
      src/tacs/Makefile.am
  24. 4
      src/test/Makefile.am
  25. 1
      src/tv/Makefile.am

1
.gitignore vendored

@ -21,6 +21,7 @@ compile
.dirstamp
m4
src/libmobile/libmobile.a
src/libdisplay/libdisplay.a
src/libimage/libimage.a
src/libcompandor/libcompandor.a
src/libgoertzel/libgoertzel.a

@ -76,6 +76,7 @@ AS_IF([test "x$somethingmagick" == "xyes"],[AC_MSG_NOTICE( Compiling with ImageM
AC_OUTPUT(
src/libmobile/Makefile
src/libdisplay/Makefile
src/libimage/Makefile
src/libcompandor/Makefile
src/libgoertzel/Makefile

@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS = foreign
SUBDIRS = \
libmobile \
libdisplay \
libsample \
libimage \
libcompandor \

@ -27,6 +27,7 @@ amps_LDADD = \
$(COMMON_LA) \
libamps.a \
$(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libdisplay/libdisplay.a \
$(top_builddir)/src/libcompandor/libcompandor.a \
$(top_builddir)/src/libgoertzel/libgoertzel.a \
$(top_builddir)/src/libjitter/libjitter.a \

@ -19,6 +19,7 @@ anetz_LDADD = \
$(COMMON_LA) \
libgermanton.a \
$(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libdisplay/libdisplay.a \
$(top_builddir)/src/libgoertzel/libgoertzel.a \
$(top_builddir)/src/libjitter/libjitter.a \
$(top_builddir)/src/libsquelch/libsquelch.a \

@ -15,6 +15,7 @@ bnetz_LDADD = \
$(COMMON_LA) \
../anetz/libgermanton.a \
$(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libdisplay/libdisplay.a \
$(top_builddir)/src/libjitter/libjitter.a \
$(top_builddir)/src/libsquelch/libsquelch.a \
$(top_builddir)/src/common/libcommon.a \

@ -18,6 +18,7 @@ cnetz_LDADD = \
$(COMMON_LA) \
../anetz/libgermanton.a \
$(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libdisplay/libdisplay.a \
$(top_builddir)/src/libcompandor/libcompandor.a \
$(top_builddir)/src/libjitter/libjitter.a \
$(top_builddir)/src/common/libcommon.a \

@ -3,11 +3,5 @@ AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
noinst_LIBRARIES = libcommon.a
libcommon_a_SOURCES = \
debug.c \
display_wave.c \
display_measurements.c
if HAVE_SDR
AM_CPPFLAGS += -DHAVE_SDR
endif
debug.c

@ -26,7 +26,7 @@
#include <math.h>
#include "../libsample/sample.h"
#include "debug.h"
#include "display.h"
#include "../libdisplay/display.h"
#include "../libmncc/mncc_console.h"
const char *debug_level[] = {

@ -13,6 +13,7 @@ jtacs_LDADD = \
$(COMMON_LA) \
../amps/libamps.a \
$(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libdisplay/libdisplay.a \
$(top_builddir)/src/libcompandor/libcompandor.a \
$(top_builddir)/src/libgoertzel/libgoertzel.a \
$(top_builddir)/src/libjitter/libjitter.a \

@ -0,0 +1,19 @@
AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
noinst_LIBRARIES = libdisplay.a
libdisplay_a_SOURCES = \
display_status.c \
display_wave.c \
display_measurements.c
if HAVE_SDR
libdisplay_a_SOURCES += \
display_iq.c \
display_spectrum.c
endif
if HAVE_SDR
AM_CPPFLAGS += -DHAVE_SDR
endif

@ -23,7 +23,7 @@
#include <pthread.h>
#include <sys/ioctl.h>
#include "../libsample/sample.h"
#include "sender.h"
#include "../libmobile/sender.h"
static int status_on = 0;
static int line_count = 0;

@ -5,7 +5,6 @@ noinst_LIBRARIES = libmobile.a
libmobile_a_SOURCES = \
sender.c \
call.c \
display_status.c \
main_mobile.c
if HAVE_SDR

@ -6,7 +6,7 @@
#include "../libsamplerate/samplerate.h"
#include "../libjitter/jitter.h"
#include "../libemphasis/emphasis.h"
#include "../common/display.h"
#include "../libdisplay/display.h"
#define MAX_SENDER 16

@ -3,10 +3,8 @@ AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
noinst_LIBRARIES = libsdr.a
libsdr_a_SOURCES = \
dd sdr_config.c \
sdr.c \
display_iq.c \
display_spectrum.c
sdr_config.c \
sdr.c
AM_CPPFLAGS += -DHAVE_SDR

@ -23,6 +23,7 @@ nmt_LDADD = \
$(COMMON_LA) \
libdmssms.a \
$(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libdisplay/libdisplay.a \
$(top_builddir)/src/libcompandor/libcompandor.a \
$(top_builddir)/src/libgoertzel/libgoertzel.a \
$(top_builddir)/src/libjitter/libjitter.a \

@ -13,6 +13,7 @@ radiocom2000_SOURCES = \
radiocom2000_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libdisplay/libdisplay.a \
$(top_builddir)/src/libcompandor/libcompandor.a \
$(top_builddir)/src/libjitter/libjitter.a \
$(top_builddir)/src/libhagelbarger/libhagelbarger.a \

@ -14,6 +14,7 @@ tacs_LDADD = \
$(COMMON_LA) \
../amps/libamps.a \
$(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libdisplay/libdisplay.a \
$(top_builddir)/src/libcompandor/libcompandor.a \
$(top_builddir)/src/libgoertzel/libgoertzel.a \
$(top_builddir)/src/libjitter/libjitter.a \

@ -14,6 +14,7 @@ test_filter_SOURCES = test_filter.c dummy.c
test_filter_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libdisplay/libdisplay.a \
$(top_builddir)/src/common/libcommon.a \
$(top_builddir)/src/libjitter/libjitter.a \
$(top_builddir)/src/libtimer/libtimer.a \
@ -53,6 +54,7 @@ test_emphasis_SOURCES = test_emphasis.c dummy.c
test_emphasis_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libdisplay/libdisplay.a \
$(top_builddir)/src/common/libcommon.a \
$(top_builddir)/src/libjitter/libjitter.a \
$(top_builddir)/src/libtimer/libtimer.a \
@ -80,6 +82,7 @@ test_dms_SOURCES = test_dms.c dummy.c
test_dms_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libdisplay/libdisplay.a \
$(top_builddir)/src/nmt/libdmssms.a \
$(top_builddir)/src/common/libcommon.a \
$(top_builddir)/src/libjitter/libjitter.a \
@ -108,6 +111,7 @@ test_sms_SOURCES = dummy.c test_sms.c
test_sms_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libdisplay/libdisplay.a \
$(top_builddir)/src/nmt/libdmssms.a \
$(top_builddir)/src/common/libcommon.a \
$(top_builddir)/src/libjitter/libjitter.a \

@ -29,6 +29,7 @@ osmotv_LDADD = \
if HAVE_SDR
osmotv_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libdisplay/libdisplay.a \
$(top_builddir)/src/libfft/libfft.a
endif

Loading…
Cancel
Save