aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2017-11-18 08:49:13 +0100
committerAndreas Eversberg <jolly@eversberg.eu>2017-12-03 08:45:55 +0100
commit016e72d6d70ea64dfb47a5a73727960cec4fc53a (patch)
tree4564f95f34535d29ae133377173b667ccf7e79c3
parentab59a26a519d4bfb88f9ca6f882da8baab90a95a (diff)
Restructure: Move display from common code to 'libdisplay'
-rw-r--r--.gitignore1
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/amps/Makefile.am1
-rw-r--r--src/anetz/Makefile.am1
-rw-r--r--src/bnetz/Makefile.am1
-rw-r--r--src/cnetz/Makefile.am1
-rw-r--r--src/common/Makefile.am8
-rw-r--r--src/common/debug.c2
-rw-r--r--src/jtacs/Makefile.am1
-rw-r--r--src/libdisplay/Makefile.am19
-rw-r--r--src/libdisplay/display.h (renamed from src/common/display.h)0
-rw-r--r--src/libdisplay/display_iq.c (renamed from src/libsdr/display_iq.c)0
-rw-r--r--src/libdisplay/display_measurements.c (renamed from src/common/display_measurements.c)0
-rw-r--r--src/libdisplay/display_spectrum.c (renamed from src/libsdr/display_spectrum.c)0
-rw-r--r--src/libdisplay/display_status.c (renamed from src/libmobile/display_status.c)2
-rw-r--r--src/libdisplay/display_wave.c (renamed from src/common/display_wave.c)0
-rw-r--r--src/libmobile/Makefile.am1
-rw-r--r--src/libmobile/sender.h2
-rw-r--r--src/libsdr/Makefile.am6
-rw-r--r--src/nmt/Makefile.am1
-rw-r--r--src/r2000/Makefile.am1
-rw-r--r--src/tacs/Makefile.am1
-rw-r--r--src/test/Makefile.am4
-rw-r--r--src/tv/Makefile.am1
25 files changed, 41 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore
index 13791ad..15b36a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/configure.ac b/configure.ac
index 5da06a3..95024e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/src/Makefile.am b/src/Makefile.am
index d96b041..698c3f5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS = foreign
SUBDIRS = \
libmobile \
+ libdisplay \
libsample \
libimage \
libcompandor \
diff --git a/src/amps/Makefile.am b/src/amps/Makefile.am
index 1dab22b..8f29c9e 100644
--- a/src/amps/Makefile.am
+++ b/src/amps/Makefile.am
@@ -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 \
diff --git a/src/anetz/Makefile.am b/src/anetz/Makefile.am
index d15024f..c28b29f 100644
--- a/src/anetz/Makefile.am
+++ b/src/anetz/Makefile.am
@@ -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 \
diff --git a/src/bnetz/Makefile.am b/src/bnetz/Makefile.am
index 5571b11..329607b 100644
--- a/src/bnetz/Makefile.am
+++ b/src/bnetz/Makefile.am
@@ -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 \
diff --git a/src/cnetz/Makefile.am b/src/cnetz/Makefile.am
index 2cb0b86..3aa530c 100644
--- a/src/cnetz/Makefile.am
+++ b/src/cnetz/Makefile.am
@@ -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 \
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 879307c..4d2daab 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -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
diff --git a/src/common/debug.c b/src/common/debug.c
index 4b41a3e..f64478e 100644
--- a/src/common/debug.c
+++ b/src/common/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[] = {
diff --git a/src/jtacs/Makefile.am b/src/jtacs/Makefile.am
index e13fd28..f95a0e6 100644
--- a/src/jtacs/Makefile.am
+++ b/src/jtacs/Makefile.am
@@ -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 \
diff --git a/src/libdisplay/Makefile.am b/src/libdisplay/Makefile.am
new file mode 100644
index 0000000..8f6097d
--- /dev/null
+++ b/src/libdisplay/Makefile.am
@@ -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
+
diff --git a/src/common/display.h b/src/libdisplay/display.h
index 386a2d7..386a2d7 100644
--- a/src/common/display.h
+++ b/src/libdisplay/display.h
diff --git a/src/libsdr/display_iq.c b/src/libdisplay/display_iq.c
index c6ab910..c6ab910 100644
--- a/src/libsdr/display_iq.c
+++ b/src/libdisplay/display_iq.c
diff --git a/src/common/display_measurements.c b/src/libdisplay/display_measurements.c
index eb8618e..eb8618e 100644
--- a/src/common/display_measurements.c
+++ b/src/libdisplay/display_measurements.c
diff --git a/src/libsdr/display_spectrum.c b/src/libdisplay/display_spectrum.c
index 3c885b7..3c885b7 100644
--- a/src/libsdr/display_spectrum.c
+++ b/src/libdisplay/display_spectrum.c
diff --git a/src/libmobile/display_status.c b/src/libdisplay/display_status.c
index 961f294..d49ddb6 100644
--- a/src/libmobile/display_status.c
+++ b/src/libdisplay/display_status.c
@@ -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;
diff --git a/src/common/display_wave.c b/src/libdisplay/display_wave.c
index b4005f9..b4005f9 100644
--- a/src/common/display_wave.c
+++ b/src/libdisplay/display_wave.c
diff --git a/src/libmobile/Makefile.am b/src/libmobile/Makefile.am
index 8b2a0e6..045d548 100644
--- a/src/libmobile/Makefile.am
+++ b/src/libmobile/Makefile.am
@@ -5,7 +5,6 @@ noinst_LIBRARIES = libmobile.a
libmobile_a_SOURCES = \
sender.c \
call.c \
- display_status.c \
main_mobile.c
if HAVE_SDR
diff --git a/src/libmobile/sender.h b/src/libmobile/sender.h
index 4be39d1..1bcb1c0 100644
--- a/src/libmobile/sender.h
+++ b/src/libmobile/sender.h
@@ -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
diff --git a/src/libsdr/Makefile.am b/src/libsdr/Makefile.am
index 5a00457..1d9f4fc 100644
--- a/src/libsdr/Makefile.am
+++ b/src/libsdr/Makefile.am
@@ -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
diff --git a/src/nmt/Makefile.am b/src/nmt/Makefile.am
index 9adf3ff..3bb3d4f 100644
--- a/src/nmt/Makefile.am
+++ b/src/nmt/Makefile.am
@@ -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 \
diff --git a/src/r2000/Makefile.am b/src/r2000/Makefile.am
index 414d532..6010546 100644
--- a/src/r2000/Makefile.am
+++ b/src/r2000/Makefile.am
@@ -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 \
diff --git a/src/tacs/Makefile.am b/src/tacs/Makefile.am
index 87e50fc..d856105 100644
--- a/src/tacs/Makefile.am
+++ b/src/tacs/Makefile.am
@@ -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 \
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index e55c62d..45852f0 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -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 \
diff --git a/src/tv/Makefile.am b/src/tv/Makefile.am
index 6327fb0..22d5e1e 100644
--- a/src/tv/Makefile.am
+++ b/src/tv/Makefile.am
@@ -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