aboutsummaryrefslogtreecommitdiffstats
path: root/Transceiver52M/Makefile.am
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2018-04-28 00:20:19 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2018-04-28 01:38:30 +0200
commit2a8183bdf0dfd5c5a59c3933fb932e827ddf811c (patch)
treea777911b728e4cf2972516168eb294be779ce3a5 /Transceiver52M/Makefile.am
parent478f82f47ed71adec51c8c3b556d07b632a22faf (diff)
build: More OBS build failure fixes
It seems the order in which static code and -lfoo is passed to the linker matters. Change-Id: I3b25be0154053ae8eb5f0a24c39fb9a229130fcf
Diffstat (limited to 'Transceiver52M/Makefile.am')
-rw-r--r--Transceiver52M/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index d6dec2d..bb253bb 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -84,9 +84,9 @@ if DEVICE_UHD
bin_PROGRAMS += osmo-trx-uhd
osmo_trx_uhd_SOURCES = osmo-trx.cpp
osmo_trx_uhd_LDADD = \
+ $(builddir)/device/uhd/libdevice.la \
$(COMMON_LDADD) \
- $(UHD_LIBS) \
- $(builddir)/device/uhd/libdevice.la
+ $(UHD_LIBS)
osmo_trx_uhd_CPPFLAGS = $(AM_CPPFLAGS) $(UHD_CFLAGS)
endif
@@ -94,8 +94,8 @@ if DEVICE_USRP1
bin_PROGRAMS += osmo-trx-usrp1
osmo_trx_usrp1_SOURCES = osmo-trx.cpp
osmo_trx_usrp1_LDADD = \
+ $(builddir)/device/usrp1/libdevice.la \
$(COMMON_LDADD) \
- $(USRP_LIBS) \
- $(builddir)/device/usrp1/libdevice.la
+ $(USRP_LIBS)
osmo_trx_usrp1_CPPFLAGS = $(AM_CPPFLAGS) $(USRP_CFLAGS)
endif