aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2017-11-18 09:30:08 +0100
committerAndreas Eversberg <jolly@eversberg.eu>2017-12-03 08:46:00 +0100
commit021c6958837dd99ee24dc9c711718fc57e694a33 (patch)
tree6240e318db3cb9c9890bcc1ada272d23190fa7ca
parent1a341f6b4e1cc062b9cedc738a6e2205c0fa651e (diff)
Restructure: Fixing library linking order
-rw-r--r--src/amps/Makefile.am6
-rw-r--r--src/anetz/Makefile.am6
-rw-r--r--src/bnetz/Makefile.am6
-rw-r--r--src/cnetz/Makefile.am6
-rw-r--r--src/jtacs/Makefile.am6
-rw-r--r--src/nmt/Makefile.am6
-rw-r--r--src/r2000/Makefile.am6
-rw-r--r--src/tacs/Makefile.am6
-rw-r--r--src/test/Makefile.am39
-rw-r--r--src/tv/Makefile.am14
10 files changed, 45 insertions, 56 deletions
diff --git a/src/amps/Makefile.am b/src/amps/Makefile.am
index b9d03f7..35f8b67 100644
--- a/src/amps/Makefile.am
+++ b/src/amps/Makefile.am
@@ -41,14 +41,14 @@ amps_LDADD = \
$(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \
- $(UHD_LIBS) \
- $(SOAPY_LIBS) \
-lm
if HAVE_SDR
amps_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \
- $(top_builddir)/src/libfm/libfm.a
+ $(top_builddir)/src/libfm/libfm.a \
+ $(UHD_LIBS) \
+ $(SOAPY_LIBS)
endif
diff --git a/src/anetz/Makefile.am b/src/anetz/Makefile.am
index 0a33082..ba993aa 100644
--- a/src/anetz/Makefile.am
+++ b/src/anetz/Makefile.am
@@ -33,14 +33,14 @@ anetz_LDADD = \
$(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \
- $(UHD_LIBS) \
- $(SOAPY_LIBS) \
-lm
if HAVE_SDR
anetz_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \
- $(top_builddir)/src/libfm/libfm.a
+ $(top_builddir)/src/libfm/libfm.a \
+ $(UHD_LIBS) \
+ $(SOAPY_LIBS)
endif
diff --git a/src/bnetz/Makefile.am b/src/bnetz/Makefile.am
index 0e45a0a..24da3fe 100644
--- a/src/bnetz/Makefile.am
+++ b/src/bnetz/Makefile.am
@@ -23,20 +23,20 @@ bnetz_LDADD = \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
$(top_builddir)/src/libfsk/libfsk.a \
+ $(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libmncc/libmncc.a \
$(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \
- $(UHD_LIBS) \
- $(SOAPY_LIBS) \
-lm
if HAVE_SDR
bnetz_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \
- $(top_builddir)/src/libfm/libfm.a
+ $(UHD_LIBS) \
+ $(SOAPY_LIBS)
endif
diff --git a/src/cnetz/Makefile.am b/src/cnetz/Makefile.am
index da085e3..64c5a87 100644
--- a/src/cnetz/Makefile.am
+++ b/src/cnetz/Makefile.am
@@ -32,14 +32,14 @@ cnetz_LDADD = \
$(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \
- $(UHD_LIBS) \
- $(SOAPY_LIBS) \
-lm
if HAVE_SDR
cnetz_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \
- $(top_builddir)/src/libfm/libfm.a
+ $(top_builddir)/src/libfm/libfm.a \
+ $(UHD_LIBS) \
+ $(SOAPY_LIBS)
endif
diff --git a/src/jtacs/Makefile.am b/src/jtacs/Makefile.am
index 10eef16..70b7587 100644
--- a/src/jtacs/Makefile.am
+++ b/src/jtacs/Makefile.am
@@ -27,14 +27,14 @@ jtacs_LDADD = \
$(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \
- $(UHD_LIBS) \
- $(SOAPY_LIBS) \
-lm
if HAVE_SDR
jtacs_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \
- $(top_builddir)/src/libfm/libfm.a
+ $(top_builddir)/src/libfm/libfm.a \
+ $(UHD_LIBS) \
+ $(SOAPY_LIBS)
endif
diff --git a/src/nmt/Makefile.am b/src/nmt/Makefile.am
index 2eda683..ac5c2eb 100644
--- a/src/nmt/Makefile.am
+++ b/src/nmt/Makefile.am
@@ -41,13 +41,13 @@ nmt_LDADD = \
$(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \
- $(UHD_LIBS) \
- $(SOAPY_LIBS) \
-lm
if HAVE_SDR
nmt_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \
- $(top_builddir)/src/libfft/libfft.a
+ $(top_builddir)/src/libfft/libfft.a \
+ $(UHD_LIBS) \
+ $(SOAPY_LIBS)
endif
diff --git a/src/r2000/Makefile.am b/src/r2000/Makefile.am
index 7bf973a..f9a3a6a 100644
--- a/src/r2000/Makefile.am
+++ b/src/r2000/Makefile.am
@@ -29,13 +29,13 @@ radiocom2000_LDADD = \
$(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \
- $(UHD_LIBS) \
- $(SOAPY_LIBS) \
-lm
if HAVE_SDR
radiocom2000_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \
- $(top_builddir)/src/libfft/libfft.a
+ $(top_builddir)/src/libfft/libfft.a \
+ $(UHD_LIBS) \
+ $(SOAPY_LIBS)
endif
diff --git a/src/tacs/Makefile.am b/src/tacs/Makefile.am
index 5834906..3cdc017 100644
--- a/src/tacs/Makefile.am
+++ b/src/tacs/Makefile.am
@@ -28,14 +28,14 @@ tacs_LDADD = \
$(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \
- $(UHD_LIBS) \
- $(SOAPY_LIBS) \
-lm
if HAVE_SDR
tacs_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \
- $(top_builddir)/src/libfm/libfm.a
+ $(top_builddir)/src/libfm/libfm.a \
+ $(UHD_LIBS) \
+ $(SOAPY_LIBS)
endif
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 81065c6..3acba91 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -26,27 +26,22 @@ test_filter_LDADD = \
$(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \
- $(UHD_LIBS) \
- $(SOAPY_LIBS) \
-lm
if HAVE_SDR
test_filter_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \
- $(top_builddir)/src/libfm/libfm.a
+ $(top_builddir)/src/libfm/libfm.a \
+ $(UHD_LIBS) \
+ $(SOAPY_LIBS)
endif
test_compandor_SOURCES = dummy.x test_compandor.c
test_compandor_LDADD = \
$(COMMON_LA) \
- $(top_builddir)/src/libdebug/libdebug.a \
- $(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libcompandor/libcompandor.a \
- $(ALSA_LIBS) \
- $(UHD_LIBS) \
- $(SOAPY_LIBS) \
-lm
test_emphasis_SOURCES = test_emphasis.c dummy.c
@@ -66,15 +61,15 @@ test_emphasis_LDADD = \
$(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \
- $(UHD_LIBS) \
- $(SOAPY_LIBS) \
-lm
if HAVE_SDR
test_emphasis_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \
- $(top_builddir)/src/libfm/libfm.a
+ $(top_builddir)/src/libfm/libfm.a \
+ $(UHD_LIBS) \
+ $(SOAPY_LIBS)
endif
test_dms_SOURCES = test_dms.c dummy.c
@@ -95,15 +90,15 @@ test_dms_LDADD = \
$(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \
- $(UHD_LIBS) \
- $(SOAPY_LIBS) \
-lm
if HAVE_SDR
test_dms_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \
- $(top_builddir)/src/libfm/libfm.a
+ $(top_builddir)/src/libfm/libfm.a \
+ $(UHD_LIBS) \
+ $(SOAPY_LIBS)
endif
test_sms_SOURCES = dummy.c test_sms.c
@@ -124,39 +119,29 @@ test_sms_LDADD = \
$(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \
- $(UHD_LIBS) \
- $(SOAPY_LIBS) \
-lm
if HAVE_SDR
test_sms_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \
- $(top_builddir)/src/libfm/libfm.a
+ $(top_builddir)/src/libfm/libfm.a \
+ $(UHD_LIBS) \
+ $(SOAPY_LIBS)
endif
test_performance_SOURCES = dummy.c test_performance.c
test_performance_LDADD = \
$(COMMON_LA) \
- $(top_builddir)/src/libdebug/libdebug.a \
- $(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
- $(ALSA_LIBS) \
- $(UHD_LIBS) \
- $(SOAPY_LIBS) \
-lm
test_hagelbarger_SOURCES = dummy.c test_hagelbarger.c
test_hagelbarger_LDADD = \
$(COMMON_LA) \
- $(top_builddir)/src/libdebug/libdebug.a \
- $(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libhagelbarger/libhagelbarger.a \
- $(ALSA_LIBS) \
- $(UHD_LIBS) \
- $(SOAPY_LIBS) \
-lm
diff --git a/src/tv/Makefile.am b/src/tv/Makefile.am
index b4f6bd7..e812342 100644
--- a/src/tv/Makefile.am
+++ b/src/tv/Makefile.am
@@ -21,22 +21,26 @@ osmotv_LDADD = \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \
- $(UHD_LIBS) \
- $(SOAPY_LIBS) \
$(GRAPHICSMAGICK_LIBS) $(IMAGEMAGICK_LIBS) \
-lm
if HAVE_SDR
osmotv_LDADD += \
- $(top_builddir)/src/libsdr/libsdr.a \
- $(top_builddir)/src/libdisplay/libdisplay.a \
- $(top_builddir)/src/libfft/libfft.a
+ $(top_builddir)/src/libsdr/libsdr.a
endif
osmotv_LDADD += \
+ $(top_builddir)/src/libdisplay/libdisplay.a \
$(top_builddir)/src/libtimer/libtimer.a
if HAVE_SDR
+osmotv_LDADD += \
+ $(top_builddir)/src/libfft/libfft.a \
+ $(UHD_LIBS) \
+ $(SOAPY_LIBS)
+endif
+
+if HAVE_SDR
AM_CPPFLAGS += -DHAVE_SDR
endif