Restructure: Move display from common code to 'libdisplay'

This commit is contained in:
Andreas Eversberg 2017-11-18 08:49:13 +01:00
parent ab59a26a51
commit 016e72d6d7
25 changed files with 41 additions and 15 deletions

1
.gitignore vendored
View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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