Move AMPS/TACS/JTACS into one source directory

.gitignore

@@ -62,8 +62,8 @@ src/nmt/nmt
 src/amps/libusatone.a
 src/amps/libamps.a
 src/amps/amps
-src/tacs/tacs
+src/amps/tacs
-src/jtacs/jtacs
+src/amps/jtacs
 src/r2000/radiocom2000
 src/imts/imts
 src/imts/imts-dialer

configure.ac

@@ -98,8 +98,6 @@ AC_OUTPUT(
     src/cnetz/Makefile
     src/nmt/Makefile
     src/amps/Makefile
-    src/tacs/Makefile
-    src/jtacs/Makefile
     src/r2000/Makefile
     src/imts/Makefile
     src/mpt1327/Makefile

src/Makefile.am

@@ -48,8 +48,6 @@ SUBDIRS += \
 	cnetz \
 	nmt \
 	amps \
-	tacs \
-	jtacs \
 	r2000 \
 	imts \
 	mpt1327 \

src/amps/Makefile.am

@@ -1,12 +1,12 @@
 AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
 
 bin_PROGRAMS = \
-	amps
+	amps tacs jtacs
 
 noinst_LIBRARIES = libamps.a libusatone.a
 
 libamps_a_SOURCES = \
-	amps_tacs_main.c \
+	main_common.c \
 	amps.c \
 	transaction.c \
 	frame.c \
@@ -14,16 +14,16 @@ libamps_a_SOURCES = \
 	sysinfo.c
 
 libusatone_a_SOURCES = \
-	tones.c \
+	usa_tones.c \
-	noanswer.c \
+	usa_noanswer.c \
-	outoforder.c \
+	usa_outoforder.c \
-	invalidnumber.c \
+	usa_invalidnumber.c \
-	congestion.c
+	usa_congestion.c
 
 amps_SOURCES = \
-	stations.c \
+	amps_stations.c \
-	image.c \
+	amps_image.c \
-	main.c
+	amps_main.c
 
 amps_LDADD = \
 	$(COMMON_LA) \
@@ -63,3 +63,90 @@ amps_LDADD += \
 	$(SOAPY_LIBS)
 endif
 
+tacs_SOURCES = \
+	tacs_tones.c \
+	tacs_outoforder.c \
+	tacs_stations.c \
+	tacs_image.c \
+	tacs_main.c
+
+tacs_LDADD = \
+	$(COMMON_LA) \
+	../amps/libamps.a \
+	$(top_builddir)/src/liboptions/liboptions.a \
+	$(top_builddir)/src/libdebug/libdebug.a \
+	$(top_builddir)/src/libmobile/libmobile.a \
+	$(top_builddir)/src/libosmocc/libosmocc.a \
+	$(top_builddir)/src/libdisplay/libdisplay.a \
+	$(top_builddir)/src/libcompandor/libcompandor.a \
+	$(top_builddir)/src/libgoertzel/libgoertzel.a \
+	$(top_builddir)/src/libjitter/libjitter.a \
+	$(top_builddir)/src/libtimer/libtimer.a \
+	$(top_builddir)/src/libsamplerate/libsamplerate.a \
+	$(top_builddir)/src/libemphasis/libemphasis.a \
+	$(top_builddir)/src/libfm/libfm.a \
+	$(top_builddir)/src/libfilter/libfilter.a \
+	$(top_builddir)/src/libwave/libwave.a \
+	$(top_builddir)/src/libsample/libsample.a \
+	$(top_builddir)/src/libg711/libg711.a \
+	$(top_builddir)/src/libaaimage/libaaimage.a \
+	-lm
+
+if HAVE_ALSA
+tacs_LDADD += \
+	$(top_builddir)/src/libsound/libsound.a \
+	$(ALSA_LIBS)
+endif
+
+if HAVE_SDR
+tacs_LDADD += \
+	$(top_builddir)/src/libsdr/libsdr.a \
+	$(top_builddir)/src/libam/libam.a \
+	$(top_builddir)/src/libfft/libfft.a \
+	$(UHD_LIBS) \
+	$(SOAPY_LIBS)
+endif
+
+jtacs_SOURCES = \
+	jtacs_tones.c \
+	jtacs_stations.c \
+	jtacs_image.c \
+	jtacs_main.c
+
+jtacs_LDADD = \
+	$(COMMON_LA) \
+	../amps/libamps.a \
+	$(top_builddir)/src/liboptions/liboptions.a \
+	$(top_builddir)/src/libdebug/libdebug.a \
+	$(top_builddir)/src/libmobile/libmobile.a \
+	$(top_builddir)/src/libosmocc/libosmocc.a \
+	$(top_builddir)/src/libdisplay/libdisplay.a \
+	$(top_builddir)/src/libcompandor/libcompandor.a \
+	$(top_builddir)/src/libgoertzel/libgoertzel.a \
+	$(top_builddir)/src/libjitter/libjitter.a \
+	$(top_builddir)/src/libtimer/libtimer.a \
+	$(top_builddir)/src/libsamplerate/libsamplerate.a \
+	$(top_builddir)/src/libemphasis/libemphasis.a \
+	$(top_builddir)/src/libfm/libfm.a \
+	$(top_builddir)/src/libfilter/libfilter.a \
+	$(top_builddir)/src/libwave/libwave.a \
+	$(top_builddir)/src/libsample/libsample.a \
+	$(top_builddir)/src/libg711/libg711.a \
+	$(top_builddir)/src/libaaimage/libaaimage.a \
+	-lm
+
+if HAVE_ALSA
+jtacs_LDADD += \
+	$(top_builddir)/src/libsound/libsound.a \
+	$(ALSA_LIBS)
+endif
+
+if HAVE_SDR
+jtacs_LDADD += \
+	$(top_builddir)/src/libsdr/libsdr.a \
+	$(top_builddir)/src/libam/libam.a \
+	$(top_builddir)/src/libfft/libfft.a \
+	$(UHD_LIBS) \
+	$(SOAPY_LIBS)
+endif
+

src/jtacs/Makefile.am

@@ -1,48 +0,0 @@
-AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
-
-bin_PROGRAMS = \
-	jtacs
-
-jtacs_SOURCES = \
-	tones.c \
-	stations.c \
-	image.c \
-	main.c
-
-jtacs_LDADD = \
-	$(COMMON_LA) \
-	../amps/libamps.a \
-	$(top_builddir)/src/liboptions/liboptions.a \
-	$(top_builddir)/src/libdebug/libdebug.a \
-	$(top_builddir)/src/libmobile/libmobile.a \
-	$(top_builddir)/src/libosmocc/libosmocc.a \
-	$(top_builddir)/src/libdisplay/libdisplay.a \
-	$(top_builddir)/src/libcompandor/libcompandor.a \
-	$(top_builddir)/src/libgoertzel/libgoertzel.a \
-	$(top_builddir)/src/libjitter/libjitter.a \
-	$(top_builddir)/src/libtimer/libtimer.a \
-	$(top_builddir)/src/libsamplerate/libsamplerate.a \
-	$(top_builddir)/src/libemphasis/libemphasis.a \
-	$(top_builddir)/src/libfm/libfm.a \
-	$(top_builddir)/src/libfilter/libfilter.a \
-	$(top_builddir)/src/libwave/libwave.a \
-	$(top_builddir)/src/libsample/libsample.a \
-	$(top_builddir)/src/libg711/libg711.a \
-	$(top_builddir)/src/libaaimage/libaaimage.a \
-	-lm
-
-if HAVE_ALSA
-jtacs_LDADD += \
-	$(top_builddir)/src/libsound/libsound.a \
-	$(ALSA_LIBS)
-endif
-
-if HAVE_SDR
-jtacs_LDADD += \
-	$(top_builddir)/src/libsdr/libsdr.a \
-	$(top_builddir)/src/libam/libam.a \
-	$(top_builddir)/src/libfft/libfft.a \
-	$(UHD_LIBS) \
-	$(SOAPY_LIBS)
-endif
-

src/tacs/Makefile.am

@@ -1,49 +0,0 @@
-AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
-
-bin_PROGRAMS = \
-	tacs
-
-tacs_SOURCES = \
-	tones.c \
-	outoforder.c \
-	stations.c \
-	image.c \
-	main.c
-
-tacs_LDADD = \
-	$(COMMON_LA) \
-	../amps/libamps.a \
-	$(top_builddir)/src/liboptions/liboptions.a \
-	$(top_builddir)/src/libdebug/libdebug.a \
-	$(top_builddir)/src/libmobile/libmobile.a \
-	$(top_builddir)/src/libosmocc/libosmocc.a \
-	$(top_builddir)/src/libdisplay/libdisplay.a \
-	$(top_builddir)/src/libcompandor/libcompandor.a \
-	$(top_builddir)/src/libgoertzel/libgoertzel.a \
-	$(top_builddir)/src/libjitter/libjitter.a \
-	$(top_builddir)/src/libtimer/libtimer.a \
-	$(top_builddir)/src/libsamplerate/libsamplerate.a \
-	$(top_builddir)/src/libemphasis/libemphasis.a \
-	$(top_builddir)/src/libfm/libfm.a \
-	$(top_builddir)/src/libfilter/libfilter.a \
-	$(top_builddir)/src/libwave/libwave.a \
-	$(top_builddir)/src/libsample/libsample.a \
-	$(top_builddir)/src/libg711/libg711.a \
-	$(top_builddir)/src/libaaimage/libaaimage.a \
-	-lm
-
-if HAVE_ALSA
-tacs_LDADD += \
-	$(top_builddir)/src/libsound/libsound.a \
-	$(ALSA_LIBS)
-endif
-
-if HAVE_SDR
-tacs_LDADD += \
-	$(top_builddir)/src/libsdr/libsdr.a \
-	$(top_builddir)/src/libam/libam.a \
-	$(top_builddir)/src/libfft/libfft.a \
-	$(UHD_LIBS) \
-	$(SOAPY_LIBS)
-endif
-