Restructure: Move display from common code to 'libdisplay'

.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

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

src/Makefile.am

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

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 \

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 \

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 \

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 \

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
 

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[] = {

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 \

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
+

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;

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

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
 

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
 

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 \

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 \

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 \

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 \

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