Restructure: Move hagelbarger from common code to 'libhagelbarger'

pull/1/head
Andreas Eversberg 5 years ago
parent ac7bb3539f
commit 60ffdcaf53
  1. 1
      .gitignore
  2. 1
      configure.ac
  3. 2
      src/Makefile.am
  4. 1
      src/common/Makefile.am
  5. 6
      src/libhagelbarger/Makefile.am
  6. 0
      src/libhagelbarger/hagelbarger.c
  7. 0
      src/libhagelbarger/hagelbarger.h
  8. 1
      src/nmt/Makefile.am
  9. 2
      src/nmt/frame.c
  10. 1
      src/r2000/Makefile.am
  11. 2
      src/r2000/frame.c
  12. 1
      src/test/Makefile.am
  13. 2
      src/test/test_hagelbarger.c

1
.gitignore vendored

@ -20,6 +20,7 @@ compile
.libs
.dirstamp
m4
src/libhagelbarger/libhagelbarger.a
src/libdtmf/libdtmf.a
src/libgermanton/libgermanton.a
src/libtimer/libtimer.a

@ -75,6 +75,7 @@ AS_IF([test "x$with_soapy" == "xyes"],[AC_MSG_NOTICE( Compiling with SoapySDR su
AS_IF([test "x$somethingmagick" == "xyes"],[AC_MSG_NOTICE( Compiling with ImageMagick )],[AC_MSG_NOTICE( ImageMagick not supported )])
AC_OUTPUT(
src/libhagelbarger/Makefile
src/libdtmf/Makefile
src/libgermanton/Makefile
src/libtimer/Makefile

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

@ -25,7 +25,6 @@ libmobile_a_SOURCES = \
mncc_console.c \
mncc_cross.c \
mncc_sock.c \
hagelbarger.c \
display_status.c \
main_mobile.c

@ -0,0 +1,6 @@
AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
noinst_LIBRARIES = libhagelbarger.a
libhagelbarger_a_SOURCES = \
hagelbarger.c

@ -22,6 +22,7 @@ nmt_SOURCES = \
nmt_LDADD = \
$(COMMON_LA) \
libdmssms.a \
$(top_builddir)/src/libhagelbarger/libhagelbarger.a \
$(top_builddir)/src/libdtmf/libdtmf.a \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \

@ -24,7 +24,7 @@
#include <inttypes.h>
#include "../common/sample.h"
#include "../common/debug.h"
#include "../common/hagelbarger.h"
#include "../libhagelbarger/hagelbarger.h"
#include "nmt.h"
#include "frame.h"

@ -12,6 +12,7 @@ radiocom2000_SOURCES = \
main.c
radiocom2000_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/libhagelbarger/libhagelbarger.a \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
$(top_builddir)/src/libtimer/libtimer.a \

@ -23,8 +23,8 @@
#include <stdlib.h>
#include <errno.h>
#include <inttypes.h>
#include "../common/hagelbarger.h"
#include "../common/debug.h"
#include "../libhagelbarger/hagelbarger.h"
#include "frame.h"
static const char *param_hex(uint64_t value)

@ -98,6 +98,7 @@ test_hagelbarger_SOURCES = dummy.c test_hagelbarger.c
test_hagelbarger_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/libhagelbarger/libhagelbarger.a \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
$(ALSA_LIBS) \

@ -1,7 +1,7 @@
#include "stdio.h"
#include "stdint.h"
#include "string.h"
#include "../common/hagelbarger.h"
#include "../libhagelbarger/hagelbarger.h"
int main(void)
{

Loading…
Cancel
Save