Restructure: Move img from common code to 'libimage'

.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

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

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
 

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
-

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
+

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 \

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"