[MERGED] osmo-trx[master]: Move ARCH_LA to Makefile.common

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Fri Jan 12 13:07:20 UTC 2018


Harald Welte has submitted this change and it was merged.

Change subject: Move ARCH_LA to Makefile.common
......................................................................


Move ARCH_LA to Makefile.common

It will later be used by other directories too (tests/Transceiver52M).

Change-Id: I0ca9b7fc5e1377db971cb7da0b3496ba8d61c716
---
M Makefile.common
M Transceiver52M/Makefile.am
2 files changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Max: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/Makefile.common b/Makefile.common
index c0fc850..e9820a4 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -32,4 +32,10 @@
 COMMON_LA = $(top_builddir)/CommonLibs/libcommon.la
 GSM_LA = $(top_builddir)/GSM/libGSM.la
 
+if ARCH_ARM
+ARCH_LA = $(top_builddir)/Transceiver52M/arm/libarch.la
+else
+ARCH_LA = $(top_builddir)/Transceiver52M/x86/libarch.la
+endif
+
 MOSTLYCLEANFILES = *~
diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index dc6e597..8df2d34 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -26,12 +26,6 @@
 
 SUBDIRS = arm x86
 
-if ARCH_ARM
-ARCH_LA = arm/libarch.la
-else
-ARCH_LA = x86/libarch.la
-endif
-
 if USRP1
 AM_CPPFLAGS += $(USRP_CFLAGS)
 else

-- 
To view, visit https://gerrit.osmocom.org/5742
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ca9b7fc5e1377db971cb7da0b3496ba8d61c716
Gerrit-PatchSet: 1
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>



More information about the gerrit-log mailing list