aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2017-11-14 21:04:58 +0100
committerAndreas Eversberg <jolly@eversberg.eu>2017-11-14 21:04:58 +0100
commit17b34fbae63f0ddebcb82e9714718c030e770300 (patch)
treefd68161c4cba5d005cfb11ebd43d15ded17c932a
parentffd934709ff9ad2c208735e39b4b1cdf71976d51 (diff)
Restructure: Move scrambler from C-Netz code to 'libscrambler'
-rw-r--r--.gitignore1
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am2
-rw-r--r--src/cnetz/Makefile.am2
-rw-r--r--src/cnetz/cnetz.h2
-rw-r--r--src/libscrambler/Makefile.am6
-rw-r--r--src/libscrambler/scrambler.c (renamed from src/cnetz/scrambler.c)0
-rw-r--r--src/libscrambler/scrambler.h (renamed from src/cnetz/scrambler.h)0
8 files changed, 11 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 30c29ca..1cc062d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/configure.ac b/configure.ac
index 109ae00..4f44bf8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/src/Makefile.am b/src/Makefile.am
index 39668e0..c2b8808 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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
diff --git a/src/cnetz/Makefile.am b/src/cnetz/Makefile.am
index b3791e1..0550625 100644
--- a/src/cnetz/Makefile.am
+++ b/src/cnetz/Makefile.am
@@ -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) \
diff --git a/src/cnetz/cnetz.h b/src/cnetz/cnetz.h
index 0cb0931..8a8c73c 100644
--- a/src/cnetz/cnetz.h
+++ b/src/cnetz/cnetz.h
@@ -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
diff --git a/src/libscrambler/Makefile.am b/src/libscrambler/Makefile.am
new file mode 100644
index 0000000..05e1e05
--- /dev/null
+++ b/src/libscrambler/Makefile.am
@@ -0,0 +1,6 @@
+AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+
+noinst_LIBRARIES = libscrambler.a
+
+libscrambler_a_SOURCES = \
+ scrambler.c
diff --git a/src/cnetz/scrambler.c b/src/libscrambler/scrambler.c
index ad57b08..ad57b08 100644
--- a/src/cnetz/scrambler.c
+++ b/src/libscrambler/scrambler.c
diff --git a/src/cnetz/scrambler.h b/src/libscrambler/scrambler.h
index d38edc5..d38edc5 100644
--- a/src/cnetz/scrambler.h
+++ b/src/libscrambler/scrambler.h