aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2017-11-17 09:06:57 +0100
committerAndreas Eversberg <jolly@eversberg.eu>2017-11-25 19:28:35 +0100
commit0e3e4d92308e9da7a7f5eaeedb995259cd1ce021 (patch)
tree9a8a91b295b037c606e04662e4602aba7a1b9c78
parent7b539d5dc78cfd843c4f6890f15fa851d06dbb09 (diff)
Restructure: Move img from common code to 'libimage'
-rw-r--r--.gitignore2
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am2
-rw-r--r--src/common/Makefile.am9
-rw-r--r--src/libimage/Makefile.am11
-rwxr-xr-xsrc/libimage/img.c (renamed from src/common/img.c)0
-rw-r--r--src/libimage/img.h (renamed from src/common/img.h)0
-rw-r--r--src/tv/Makefile.am2
-rw-r--r--src/tv/main.c2
9 files changed, 17 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore
index d3bb270..855ddbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ compile
.libs
.dirstamp
m4
+src/libimage/libimage.a
src/libcompandor/libcompandor.a
src/libgoertzel/libgoertzel.a
src/libjitter/libjitter.a
@@ -38,7 +39,6 @@ src/libfft/libfft.a
src/libmncc/libmncc.a
src/common/libcommon.a
src/common/libmobile.a
-src/common/libimage.a
src/anetz/libgermanton.a
src/anetz/anetz
src/bnetz/bnetz
diff --git a/configure.ac b/configure.ac
index f99dd03..7b5779d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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/libimage/Makefile
src/libcompandor/Makefile
src/libgoertzel/Makefile
src/libjitter/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index cb2f18b..708f01e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,3 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = libcompandor libgoertzel libjitter libsquelch libhagelbarger libdtmf libtimer libsamplerate libscrambler libemphasis libfsk libfm libfilter libwave libfft libmncc common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
+SUBDIRS = libimage libcompandor libgoertzel libjitter libsquelch libhagelbarger libdtmf libtimer libsamplerate libscrambler libemphasis libfsk libfm libfilter libwave libfft libmncc common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 8607cb2..83bc9e4 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,6 +1,6 @@
AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) $(GRAPHICSMAGICK_CFLAGS) $(IMAGEMAGICK_CFLAGS) $(UHD_CFLAGS) $(SOAPY_CFLAGS)
-noinst_LIBRARIES = libcommon.a libmobile.a libimage.a
+noinst_LIBRARIES = libcommon.a libmobile.a
libcommon_a_SOURCES = \
sample.c \
@@ -15,9 +15,6 @@ libmobile_a_SOURCES = \
display_status.c \
main_mobile.c
-libimage_a_SOURCES = \
- img.c
-
if HAVE_SDR
AM_CPPFLAGS += -DHAVE_SDR
@@ -42,7 +39,3 @@ libcommon_a_SOURCES += \
soapy.c
endif
-if ENABLE_MAGICK
-AM_CPPFLAGS += -DWITH_MAGICK
-endif
-
diff --git a/src/libimage/Makefile.am b/src/libimage/Makefile.am
new file mode 100644
index 0000000..7805bbe
--- /dev/null
+++ b/src/libimage/Makefile.am
@@ -0,0 +1,11 @@
+AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+
+noinst_LIBRARIES = libimage.a
+
+libimage_a_SOURCES = \
+ img.c
+
+if ENABLE_MAGICK
+AM_CPPFLAGS += -DWITH_MAGICK
+endif
+
diff --git a/src/common/img.c b/src/libimage/img.c
index 8a7f5a4..8a7f5a4 100755
--- a/src/common/img.c
+++ b/src/libimage/img.c
diff --git a/src/common/img.h b/src/libimage/img.h
index 4541cdf..4541cdf 100644
--- a/src/common/img.h
+++ b/src/libimage/img.h
diff --git a/src/tv/Makefile.am b/src/tv/Makefile.am
index e0e2cf2..da94296 100644
--- a/src/tv/Makefile.am
+++ b/src/tv/Makefile.am
@@ -14,7 +14,7 @@ osmotv_SOURCES = \
main.c
osmotv_LDADD = \
$(COMMON_LA) \
- $(top_builddir)/src/common/libimage.a \
+ $(top_builddir)/src/libimage/libimage.a \
$(top_builddir)/src/common/libcommon.a \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libfm/libfm.a \
diff --git a/src/tv/main.c b/src/tv/main.c
index e997156..8663952 100644
--- a/src/tv/main.c
+++ b/src/tv/main.c
@@ -31,7 +31,7 @@ enum paging_signal;
#include "../libfilter/iir_filter.h"
#include "../libfm/fm.h"
#include "../libwave/wave.h"
-#include "../common/img.h"
+#include "../libimage/img.h"
#include "../common/debug.h"
#ifdef HAVE_SDR
#include "../common/sdr_config.h"