diff --git a/.gitignore b/.gitignore index 0d4cdc7..7207dfd 100644 --- a/.gitignore +++ b/.gitignore @@ -62,8 +62,8 @@ src/nmt/nmt src/amps/libusatone.a src/amps/libamps.a src/amps/amps -src/tacs/tacs -src/jtacs/jtacs +src/amps/tacs +src/amps/jtacs src/r2000/radiocom2000 src/imts/imts src/imts/imts-dialer diff --git a/configure.ac b/configure.ac index 236d945..8dea9de 100644 --- a/configure.ac +++ b/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 diff --git a/src/Makefile.am b/src/Makefile.am index 034fd4c..dafe363 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,8 +48,6 @@ SUBDIRS += \ cnetz \ nmt \ amps \ - tacs \ - jtacs \ r2000 \ imts \ mpt1327 \ diff --git a/src/amps/Makefile.am b/src/amps/Makefile.am index 82da289..0c4c964 100644 --- a/src/amps/Makefile.am +++ b/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 \ - noanswer.c \ - outoforder.c \ - invalidnumber.c \ - congestion.c + usa_tones.c \ + usa_noanswer.c \ + usa_outoforder.c \ + usa_invalidnumber.c \ + usa_congestion.c amps_SOURCES = \ - stations.c \ - image.c \ - main.c + amps_stations.c \ + amps_image.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 + diff --git a/src/amps/image.c b/src/amps/amps_image.c similarity index 100% rename from src/amps/image.c rename to src/amps/amps_image.c diff --git a/src/amps/main.c b/src/amps/amps_main.c similarity index 100% rename from src/amps/main.c rename to src/amps/amps_main.c diff --git a/src/amps/stations.c b/src/amps/amps_stations.c similarity index 100% rename from src/amps/stations.c rename to src/amps/amps_stations.c diff --git a/src/jtacs/image.c b/src/amps/jtacs_image.c similarity index 100% rename from src/jtacs/image.c rename to src/amps/jtacs_image.c diff --git a/src/jtacs/main.c b/src/amps/jtacs_main.c similarity index 100% rename from src/jtacs/main.c rename to src/amps/jtacs_main.c diff --git a/src/jtacs/stations.c b/src/amps/jtacs_stations.c similarity index 100% rename from src/jtacs/stations.c rename to src/amps/jtacs_stations.c diff --git a/src/jtacs/tones.c b/src/amps/jtacs_tones.c similarity index 100% rename from src/jtacs/tones.c rename to src/amps/jtacs_tones.c diff --git a/src/amps/amps_tacs_main.c b/src/amps/main_common.c similarity index 100% rename from src/amps/amps_tacs_main.c rename to src/amps/main_common.c diff --git a/src/tacs/image.c b/src/amps/tacs_image.c similarity index 100% rename from src/tacs/image.c rename to src/amps/tacs_image.c diff --git a/src/tacs/main.c b/src/amps/tacs_main.c similarity index 100% rename from src/tacs/main.c rename to src/amps/tacs_main.c diff --git a/src/tacs/outoforder.c b/src/amps/tacs_outoforder.c similarity index 100% rename from src/tacs/outoforder.c rename to src/amps/tacs_outoforder.c diff --git a/src/tacs/stations.c b/src/amps/tacs_stations.c similarity index 100% rename from src/tacs/stations.c rename to src/amps/tacs_stations.c diff --git a/src/tacs/tones.c b/src/amps/tacs_tones.c similarity index 100% rename from src/tacs/tones.c rename to src/amps/tacs_tones.c diff --git a/src/amps/congestion.c b/src/amps/usa_congestion.c similarity index 100% rename from src/amps/congestion.c rename to src/amps/usa_congestion.c diff --git a/src/amps/invalidnumber.c b/src/amps/usa_invalidnumber.c similarity index 100% rename from src/amps/invalidnumber.c rename to src/amps/usa_invalidnumber.c diff --git a/src/amps/noanswer.c b/src/amps/usa_noanswer.c similarity index 100% rename from src/amps/noanswer.c rename to src/amps/usa_noanswer.c diff --git a/src/amps/outoforder.c b/src/amps/usa_outoforder.c similarity index 100% rename from src/amps/outoforder.c rename to src/amps/usa_outoforder.c diff --git a/src/amps/tones.c b/src/amps/usa_tones.c similarity index 100% rename from src/amps/tones.c rename to src/amps/usa_tones.c diff --git a/src/jtacs/Makefile.am b/src/jtacs/Makefile.am deleted file mode 100644 index 5c2b496..0000000 --- a/src/jtacs/Makefile.am +++ /dev/null @@ -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 - diff --git a/src/tacs/Makefile.am b/src/tacs/Makefile.am deleted file mode 100644 index cc37f1d..0000000 --- a/src/tacs/Makefile.am +++ /dev/null @@ -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 -