Restructure: Move scrambler from C-Netz code to 'libscrambler'

pull/1/head
Andreas Eversberg 5 years ago
parent ffd934709f
commit 17b34fbae6
  1. 1
      .gitignore
  2. 1
      configure.ac
  3. 2
      src/Makefile.am
  4. 2
      src/cnetz/Makefile.am
  5. 2
      src/cnetz/cnetz.h
  6. 6
      src/libscrambler/Makefile.am
  7. 0
      src/libscrambler/scrambler.c
  8. 0
      src/libscrambler/scrambler.h

1
.gitignore vendored

@ -23,6 +23,7 @@ m4
src/libgermanton/libgermanton.a
src/libtimer/libtimer.a
src/libsamplerate/libsamplerate.a
src/libscrambler/libscrambler.a
src/libfilter/libfilter.a
src/common/libcommon.a
src/common/libmobile.a

@ -78,6 +78,7 @@ AC_OUTPUT(
src/libgermanton/Makefile
src/libtimer/Makefile
src/libsamplerate/Makefile
src/libscrambler/Makefile
src/libfilter/Makefile
src/common/Makefile
src/anetz/Makefile

@ -1,3 +1,3 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = libgermanton libtimer libsamplerate libfilter common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
SUBDIRS = libgermanton libtimer libsamplerate libscrambler libfilter common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test

@ -11,7 +11,6 @@ cnetz_SOURCES = \
telegramm.c \
dsp.c \
fsk_demod.c \
scrambler.c \
image.c \
ansage.c \
main.c
@ -22,6 +21,7 @@ cnetz_LDADD = \
$(top_builddir)/src/common/libcommon.a \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libscrambler/libscrambler.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \

@ -2,7 +2,7 @@
#include "../libtimer/timer.h"
#include "../common/sender.h"
#include "fsk_demod.h"
#include "scrambler.h"
#include "../libscrambler/scrambler.h"
#include "transaction.h"
#define CNETZ_OGK_KANAL 131

@ -0,0 +1,6 @@
AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
noinst_LIBRARIES = libscrambler.a
libscrambler_a_SOURCES = \
scrambler.c
Loading…
Cancel
Save