Restructure: Move fm_modulation from common code to 'libfm'
This commit is contained in:
parent
7af9b752a0
commit
f4754dcb37
|
@ -29,6 +29,7 @@ src/libtimer/libtimer.a
|
|||
src/libsamplerate/libsamplerate.a
|
||||
src/libscrambler/libscrambler.a
|
||||
src/libemphasis/libemphasis.a
|
||||
src/libfm/libfm.a
|
||||
src/libfilter/libfilter.a
|
||||
src/libwave/libwave.a
|
||||
src/libfft/libfft.a
|
||||
|
|
|
@ -84,6 +84,7 @@ AC_OUTPUT(
|
|||
src/libsamplerate/Makefile
|
||||
src/libscrambler/Makefile
|
||||
src/libemphasis/Makefile
|
||||
src/libfm/Makefile
|
||||
src/libfilter/Makefile
|
||||
src/libwave/Makefile
|
||||
src/libfft/Makefile
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
AUTOMAKE_OPTIONS = foreign
|
||||
SUBDIRS = libgoertzel libjitter libsquelch libhagelbarger libdtmf libtimer libsamplerate libscrambler libemphasis libfilter libwave libfft common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
|
||||
SUBDIRS = libgoertzel libjitter libsquelch libhagelbarger libdtmf libtimer libsamplerate libscrambler libemphasis libfm libfilter libwave libfft common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
|
||||
|
||||
|
|
|
@ -33,6 +33,7 @@ amps_LDADD = \
|
|||
$(top_builddir)/src/libtimer/libtimer.a \
|
||||
$(top_builddir)/src/libsamplerate/libsamplerate.a \
|
||||
$(top_builddir)/src/libemphasis/libemphasis.a \
|
||||
$(top_builddir)/src/libfm/libfm.a \
|
||||
$(top_builddir)/src/libfilter/libfilter.a \
|
||||
$(top_builddir)/src/libwave/libwave.a \
|
||||
$(top_builddir)/src/libfft/libfft.a \
|
||||
|
|
|
@ -26,6 +26,7 @@ anetz_LDADD = \
|
|||
$(top_builddir)/src/libtimer/libtimer.a \
|
||||
$(top_builddir)/src/libsamplerate/libsamplerate.a \
|
||||
$(top_builddir)/src/libemphasis/libemphasis.a \
|
||||
$(top_builddir)/src/libfm/libfm.a \
|
||||
$(top_builddir)/src/libfilter/libfilter.a \
|
||||
$(top_builddir)/src/libwave/libwave.a \
|
||||
$(top_builddir)/src/libfft/libfft.a \
|
||||
|
|
|
@ -21,6 +21,7 @@ bnetz_LDADD = \
|
|||
$(top_builddir)/src/libtimer/libtimer.a \
|
||||
$(top_builddir)/src/libsamplerate/libsamplerate.a \
|
||||
$(top_builddir)/src/libemphasis/libemphasis.a \
|
||||
$(top_builddir)/src/libfm/libfm.a \
|
||||
$(top_builddir)/src/libfilter/libfilter.a \
|
||||
$(top_builddir)/src/libwave/libwave.a \
|
||||
$(top_builddir)/src/libfft/libfft.a \
|
||||
|
|
|
@ -24,6 +24,7 @@ cnetz_LDADD = \
|
|||
$(top_builddir)/src/libsamplerate/libsamplerate.a \
|
||||
$(top_builddir)/src/libscrambler/libscrambler.a \
|
||||
$(top_builddir)/src/libemphasis/libemphasis.a \
|
||||
$(top_builddir)/src/libfm/libfm.a \
|
||||
$(top_builddir)/src/libfilter/libfilter.a \
|
||||
$(top_builddir)/src/libwave/libwave.a \
|
||||
$(top_builddir)/src/libfft/libfft.a \
|
||||
|
|
|
@ -7,7 +7,6 @@ libcommon_a_SOURCES = \
|
|||
debug.c \
|
||||
sound_alsa.c \
|
||||
compandor.c \
|
||||
fm_modulation.c \
|
||||
fsk.c \
|
||||
display_wave.c \
|
||||
display_measurements.c
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "../common/fm_modulation.h"
|
||||
#include "../libfm/fm.h"
|
||||
|
||||
typedef struct ffsk {
|
||||
void *inst;
|
||||
|
|
|
@ -30,7 +30,7 @@ enum paging_signal;
|
|||
#include <pthread.h>
|
||||
#include <unistd.h>
|
||||
#include "sample.h"
|
||||
#include "fm_modulation.h"
|
||||
#include "../libfm/fm.h"
|
||||
#include "../libtimer/timer.h"
|
||||
#include "sender.h"
|
||||
#include "sdr_config.h"
|
||||
|
|
|
@ -19,6 +19,7 @@ jtacs_LDADD = \
|
|||
$(top_builddir)/src/libtimer/libtimer.a \
|
||||
$(top_builddir)/src/libsamplerate/libsamplerate.a \
|
||||
$(top_builddir)/src/libemphasis/libemphasis.a \
|
||||
$(top_builddir)/src/libfm/libfm.a \
|
||||
$(top_builddir)/src/libfilter/libfilter.a \
|
||||
$(top_builddir)/src/libwave/libwave.a \
|
||||
$(top_builddir)/src/libfft/libfft.a \
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
|
||||
|
||||
noinst_LIBRARIES = libfm.a
|
||||
|
||||
libfm_a_SOURCES = \
|
||||
fm.c
|
|
@ -23,8 +23,8 @@
|
|||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <math.h>
|
||||
#include "sample.h"
|
||||
#include "fm_modulation.h"
|
||||
#include "../common/sample.h"
|
||||
#include "fm.h"
|
||||
|
||||
//#define FAST_SINE
|
||||
|
|
@ -31,6 +31,7 @@ nmt_LDADD = \
|
|||
$(top_builddir)/src/libtimer/libtimer.a \
|
||||
$(top_builddir)/src/libsamplerate/libsamplerate.a \
|
||||
$(top_builddir)/src/libemphasis/libemphasis.a \
|
||||
$(top_builddir)/src/libfm/libfm.a \
|
||||
$(top_builddir)/src/libfilter/libfilter.a \
|
||||
$(top_builddir)/src/libwave/libwave.a \
|
||||
$(top_builddir)/src/libfft/libfft.a \
|
||||
|
|
|
@ -19,6 +19,7 @@ radiocom2000_LDADD = \
|
|||
$(top_builddir)/src/libtimer/libtimer.a \
|
||||
$(top_builddir)/src/libsamplerate/libsamplerate.a \
|
||||
$(top_builddir)/src/libemphasis/libemphasis.a \
|
||||
$(top_builddir)/src/libfm/libfm.a \
|
||||
$(top_builddir)/src/libfilter/libfilter.a \
|
||||
$(top_builddir)/src/libwave/libwave.a \
|
||||
$(top_builddir)/src/libfft/libfft.a \
|
||||
|
|
|
@ -20,6 +20,7 @@ tacs_LDADD = \
|
|||
$(top_builddir)/src/libtimer/libtimer.a \
|
||||
$(top_builddir)/src/libsamplerate/libsamplerate.a \
|
||||
$(top_builddir)/src/libemphasis/libemphasis.a \
|
||||
$(top_builddir)/src/libfm/libfm.a \
|
||||
$(top_builddir)/src/libfilter/libfilter.a \
|
||||
$(top_builddir)/src/libwave/libwave.a \
|
||||
$(top_builddir)/src/libfft/libfft.a \
|
||||
|
|
|
@ -19,6 +19,7 @@ test_filter_LDADD = \
|
|||
$(top_builddir)/src/libtimer/libtimer.a \
|
||||
$(top_builddir)/src/libsamplerate/libsamplerate.a \
|
||||
$(top_builddir)/src/libemphasis/libemphasis.a \
|
||||
$(top_builddir)/src/libfm/libfm.a \
|
||||
$(top_builddir)/src/libfilter/libfilter.a \
|
||||
$(top_builddir)/src/libwave/libwave.a \
|
||||
$(top_builddir)/src/libfft/libfft.a \
|
||||
|
@ -48,6 +49,7 @@ test_emphasis_LDADD = \
|
|||
$(top_builddir)/src/libtimer/libtimer.a \
|
||||
$(top_builddir)/src/libsamplerate/libsamplerate.a \
|
||||
$(top_builddir)/src/libemphasis/libemphasis.a \
|
||||
$(top_builddir)/src/libfm/libfm.a \
|
||||
$(top_builddir)/src/libfilter/libfilter.a \
|
||||
$(top_builddir)/src/libwave/libwave.a \
|
||||
$(top_builddir)/src/libfft/libfft.a \
|
||||
|
@ -67,6 +69,7 @@ test_dms_LDADD = \
|
|||
$(top_builddir)/src/libtimer/libtimer.a \
|
||||
$(top_builddir)/src/libsamplerate/libsamplerate.a \
|
||||
$(top_builddir)/src/libemphasis/libemphasis.a \
|
||||
$(top_builddir)/src/libfm/libfm.a \
|
||||
$(top_builddir)/src/libfilter/libfilter.a \
|
||||
$(top_builddir)/src/libwave/libwave.a \
|
||||
$(top_builddir)/src/libfft/libfft.a \
|
||||
|
@ -86,6 +89,7 @@ test_sms_LDADD = \
|
|||
$(top_builddir)/src/libtimer/libtimer.a \
|
||||
$(top_builddir)/src/libsamplerate/libsamplerate.a \
|
||||
$(top_builddir)/src/libemphasis/libemphasis.a \
|
||||
$(top_builddir)/src/libfm/libfm.a \
|
||||
$(top_builddir)/src/libfilter/libfilter.a \
|
||||
$(top_builddir)/src/libwave/libwave.a \
|
||||
$(top_builddir)/src/libfft/libfft.a \
|
||||
|
@ -100,6 +104,7 @@ test_performance_LDADD = \
|
|||
$(COMMON_LA) \
|
||||
$(top_builddir)/src/common/libmobile.a \
|
||||
$(top_builddir)/src/common/libcommon.a \
|
||||
$(top_builddir)/src/libfm/libfm.a \
|
||||
$(top_builddir)/src/libfilter/libfilter.a \
|
||||
$(ALSA_LIBS) \
|
||||
$(UHD_LIBS) \
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include <sys/time.h>
|
||||
#include "../common/sample.h"
|
||||
#include "../libfilter/iir_filter.h"
|
||||
#include "../common/fm_modulation.h"
|
||||
#include "../libfm/fm.h"
|
||||
#include "../common/debug.h"
|
||||
|
||||
struct timeval start_tv, tv;
|
||||
|
|
|
@ -17,6 +17,7 @@ osmotv_LDADD = \
|
|||
$(top_builddir)/src/common/libimage.a \
|
||||
$(top_builddir)/src/common/libcommon.a \
|
||||
$(top_builddir)/src/libtimer/libtimer.a \
|
||||
$(top_builddir)/src/libfm/libfm.a \
|
||||
$(top_builddir)/src/libfilter/libfilter.a \
|
||||
$(top_builddir)/src/libwave/libwave.a \
|
||||
$(top_builddir)/src/libfft/libfft.a \
|
||||
|
|
|
@ -29,7 +29,7 @@ enum paging_signal;
|
|||
#include <math.h>
|
||||
#include "../common/sample.h"
|
||||
#include "../libfilter/iir_filter.h"
|
||||
#include "../common/fm_modulation.h"
|
||||
#include "../libfm/fm.h"
|
||||
#include "../libwave/wave.h"
|
||||
#include "../common/img.h"
|
||||
#include "../common/debug.h"
|
||||
|
|
Loading…
Reference in New Issue