williamp/osmocom-analog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restructure: Fixing library linking order

Browse Source
This commit is contained in:
Andreas Eversberg
2017-11-18 09:30:08 +01:00
parent 1a341f6b4e
commit 021c695883
10 changed files with 45 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/amps/Makefile.am
View File

@@ -41,14 +41,14 @@ amps_LDADD = \
$(top_builddir)/src/libsound/libsound.a \ $(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \ $(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \ $(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
-lm -lm
if HAVE_SDR if HAVE_SDR
amps_LDADD += \ amps_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \ $(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \ $(top_builddir)/src/libfft/libfft.a \
$(top_builddir)/src/libfm/libfm.a $(top_builddir)/src/libfm/libfm.a \
$(UHD_LIBS) \
$(SOAPY_LIBS)
endif endif

6
src/anetz/Makefile.am
View File

@@ -33,14 +33,14 @@ anetz_LDADD = \
$(top_builddir)/src/libsound/libsound.a \ $(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \ $(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \ $(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
-lm -lm
if HAVE_SDR if HAVE_SDR
anetz_LDADD += \ anetz_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \ $(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \ $(top_builddir)/src/libfft/libfft.a \
$(top_builddir)/src/libfm/libfm.a $(top_builddir)/src/libfm/libfm.a \
$(UHD_LIBS) \
$(SOAPY_LIBS)
endif endif

6
src/bnetz/Makefile.am
View File

@@ -23,20 +23,20 @@ bnetz_LDADD = \
$(top_builddir)/src/libsamplerate/libsamplerate.a \ $(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \ $(top_builddir)/src/libemphasis/libemphasis.a \
$(top_builddir)/src/libfsk/libfsk.a \ $(top_builddir)/src/libfsk/libfsk.a \
$(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \ $(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libmncc/libmncc.a \ $(top_builddir)/src/libmncc/libmncc.a \
$(top_builddir)/src/libsound/libsound.a \ $(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \ $(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \ $(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
-lm -lm
if HAVE_SDR if HAVE_SDR
bnetz_LDADD += \ bnetz_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \ $(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \ $(top_builddir)/src/libfft/libfft.a \
$(top_builddir)/src/libfm/libfm.a $(UHD_LIBS) \
$(SOAPY_LIBS)
endif endif

6
src/cnetz/Makefile.am
View File

@@ -32,14 +32,14 @@ cnetz_LDADD = \
$(top_builddir)/src/libsound/libsound.a \ $(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \ $(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \ $(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
-lm -lm
if HAVE_SDR if HAVE_SDR
cnetz_LDADD += \ cnetz_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \ $(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \ $(top_builddir)/src/libfft/libfft.a \
$(top_builddir)/src/libfm/libfm.a $(top_builddir)/src/libfm/libfm.a \
$(UHD_LIBS) \
$(SOAPY_LIBS)
endif endif

6
src/jtacs/Makefile.am
View File

@@ -27,14 +27,14 @@ jtacs_LDADD = \
$(top_builddir)/src/libsound/libsound.a \ $(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \ $(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \ $(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
-lm -lm
if HAVE_SDR if HAVE_SDR
jtacs_LDADD += \ jtacs_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \ $(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \ $(top_builddir)/src/libfft/libfft.a \
$(top_builddir)/src/libfm/libfm.a $(top_builddir)/src/libfm/libfm.a \
$(UHD_LIBS) \
$(SOAPY_LIBS)
endif endif

6
src/nmt/Makefile.am
View File

@@ -41,13 +41,13 @@ nmt_LDADD = \
$(top_builddir)/src/libsound/libsound.a \ $(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \ $(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \ $(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
-lm -lm
if HAVE_SDR if HAVE_SDR
nmt_LDADD += \ nmt_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \ $(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a $(top_builddir)/src/libfft/libfft.a \
$(UHD_LIBS) \
$(SOAPY_LIBS)
endif endif

6
src/r2000/Makefile.am
View File

@@ -29,13 +29,13 @@ radiocom2000_LDADD = \
$(top_builddir)/src/libsound/libsound.a \ $(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \ $(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \ $(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
-lm -lm
if HAVE_SDR if HAVE_SDR
radiocom2000_LDADD += \ radiocom2000_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \ $(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a $(top_builddir)/src/libfft/libfft.a \
$(UHD_LIBS) \
$(SOAPY_LIBS)
endif endif

6
src/tacs/Makefile.am
View File

@@ -28,14 +28,14 @@ tacs_LDADD = \
$(top_builddir)/src/libsound/libsound.a \ $(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \ $(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \ $(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
-lm -lm
if HAVE_SDR if HAVE_SDR
tacs_LDADD += \ tacs_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \ $(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \ $(top_builddir)/src/libfft/libfft.a \
$(top_builddir)/src/libfm/libfm.a $(top_builddir)/src/libfm/libfm.a \
$(UHD_LIBS) \
$(SOAPY_LIBS)
endif endif

39
src/test/Makefile.am
View File

@@ -26,27 +26,22 @@ test_filter_LDADD = \
$(top_builddir)/src/libsound/libsound.a \ $(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \ $(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \ $(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
-lm -lm
if HAVE_SDR if HAVE_SDR
test_filter_LDADD += \ test_filter_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \ $(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \ $(top_builddir)/src/libfft/libfft.a \
$(top_builddir)/src/libfm/libfm.a $(top_builddir)/src/libfm/libfm.a \
$(UHD_LIBS) \
$(SOAPY_LIBS)
endif endif
test_compandor_SOURCES = dummy.x test_compandor.c test_compandor_SOURCES = dummy.x test_compandor.c
test_compandor_LDADD = \ test_compandor_LDADD = \
$(COMMON_LA) \ $(COMMON_LA) \
$(top_builddir)/src/libdebug/libdebug.a \
$(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libcompandor/libcompandor.a \ $(top_builddir)/src/libcompandor/libcompandor.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
-lm -lm
test_emphasis_SOURCES = test_emphasis.c dummy.c test_emphasis_SOURCES = test_emphasis.c dummy.c
@@ -66,15 +61,15 @@ test_emphasis_LDADD = \
$(top_builddir)/src/libsound/libsound.a \ $(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \ $(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \ $(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
-lm -lm
if HAVE_SDR if HAVE_SDR
test_emphasis_LDADD += \ test_emphasis_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \ $(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \ $(top_builddir)/src/libfft/libfft.a \
$(top_builddir)/src/libfm/libfm.a $(top_builddir)/src/libfm/libfm.a \
$(UHD_LIBS) \
$(SOAPY_LIBS)
endif endif
test_dms_SOURCES = test_dms.c dummy.c test_dms_SOURCES = test_dms.c dummy.c
@@ -95,15 +90,15 @@ test_dms_LDADD = \
$(top_builddir)/src/libsound/libsound.a \ $(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \ $(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \ $(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
-lm -lm
if HAVE_SDR if HAVE_SDR
test_dms_LDADD += \ test_dms_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \ $(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \ $(top_builddir)/src/libfft/libfft.a \
$(top_builddir)/src/libfm/libfm.a $(top_builddir)/src/libfm/libfm.a \
$(UHD_LIBS) \
$(SOAPY_LIBS)
endif endif
test_sms_SOURCES = dummy.c test_sms.c test_sms_SOURCES = dummy.c test_sms.c
@@ -124,39 +119,29 @@ test_sms_LDADD = \
$(top_builddir)/src/libsound/libsound.a \ $(top_builddir)/src/libsound/libsound.a \
$(top_builddir)/src/libsample/libsample.a \ $(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \ $(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
-lm -lm
if HAVE_SDR if HAVE_SDR
test_sms_LDADD += \ test_sms_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \ $(top_builddir)/src/libsdr/libsdr.a \
$(top_builddir)/src/libfft/libfft.a \ $(top_builddir)/src/libfft/libfft.a \
$(top_builddir)/src/libfm/libfm.a $(top_builddir)/src/libfm/libfm.a \
$(UHD_LIBS) \
$(SOAPY_LIBS)
endif endif
test_performance_SOURCES = dummy.c test_performance.c test_performance_SOURCES = dummy.c test_performance.c
test_performance_LDADD = \ test_performance_LDADD = \
$(COMMON_LA) \ $(COMMON_LA) \
$(top_builddir)/src/libdebug/libdebug.a \
$(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libfm/libfm.a \ $(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \ $(top_builddir)/src/libfilter/libfilter.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
-lm -lm
test_hagelbarger_SOURCES = dummy.c test_hagelbarger.c test_hagelbarger_SOURCES = dummy.c test_hagelbarger.c
test_hagelbarger_LDADD = \ test_hagelbarger_LDADD = \
$(COMMON_LA) \ $(COMMON_LA) \
$(top_builddir)/src/libdebug/libdebug.a \
$(top_builddir)/src/libmobile/libmobile.a \
$(top_builddir)/src/libhagelbarger/libhagelbarger.a \ $(top_builddir)/src/libhagelbarger/libhagelbarger.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
-lm -lm

14
src/tv/Makefile.am
View File

@@ -21,21 +21,25 @@ osmotv_LDADD = \
$(top_builddir)/src/libwave/libwave.a \ $(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libsample/libsample.a \ $(top_builddir)/src/libsample/libsample.a \
$(ALSA_LIBS) \ $(ALSA_LIBS) \
$(UHD_LIBS) \
$(SOAPY_LIBS) \
$(GRAPHICSMAGICK_LIBS) $(IMAGEMAGICK_LIBS) \ $(GRAPHICSMAGICK_LIBS) $(IMAGEMAGICK_LIBS) \
-lm -lm
if HAVE_SDR if HAVE_SDR
osmotv_LDADD += \ osmotv_LDADD += \
$(top_builddir)/src/libsdr/libsdr.a \ $(top_builddir)/src/libsdr/libsdr.a
$(top_builddir)/src/libdisplay/libdisplay.a \
$(top_builddir)/src/libfft/libfft.a
endif endif
osmotv_LDADD += \ osmotv_LDADD += \
$(top_builddir)/src/libdisplay/libdisplay.a \
$(top_builddir)/src/libtimer/libtimer.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 if HAVE_SDR
AM_CPPFLAGS += -DHAVE_SDR AM_CPPFLAGS += -DHAVE_SDR
endif endif