diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-01-10 12:32:31 +0100 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-01-10 12:32:33 +0100 |
| commit | 611212676b9c519a1f186ebaa8ad224178700005 (patch) | |
| tree | b3c33ad8d9a8ab2060ab95f4732b2b8455cfb417 | |
| parent | 4ebb289c908090582e968c7f1d050b52ba9389b1 (diff) | |
Move ARCH_LA to Makefile.common
It will later be used by other directories too (tests/Transceiver52M).
Change-Id: I0ca9b7fc5e1377db971cb7da0b3496ba8d61c716
| -rw-r--r-- | Makefile.common | 6 | ||||
| -rw-r--r-- | Transceiver52M/Makefile.am | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.common b/Makefile.common index c0fc850..e9820a4 100644 --- a/Makefile.common +++ b/Makefile.common @@ -32,4 +32,10 @@ STD_DEFINES_AND_INCLUDES = \ 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 @@ AM_CXXFLAGS = -ldl -lpthread 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 |