aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2019-07-30 18:05:31 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2019-08-01 13:46:00 +0200
commitcbc02086d58edec257c20645d147284fba004a5f (patch)
tree052f28864c61f5db2755859375ad0510b60a4d10
parent3d29b4d5b0055b459dde65769dd84e86073b926d (diff)
Move std_inband.rbf under device/usrp1/ dir
This file is only used by USRP1, so let's move it there and avoid processing it in Makefiles if build for USRP1 is not requested at configure time. Change-Id: Ibb40ba487581e76d2ae3e8a420d631670f876cf0
-rw-r--r--Transceiver52M/Makefile.am6
-rw-r--r--Transceiver52M/device/usrp1/Makefile.am6
-rwxr-xr-xTransceiver52M/device/usrp1/std_inband.rbf (renamed from Transceiver52M/std_inband.rbf)bin176507 -> 176507 bytes
-rw-r--r--debian/copyright2
4 files changed, 7 insertions, 7 deletions
diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index f039e3f..ade4e30 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -27,12 +27,6 @@ AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/arch/common -I${srcd
AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
AM_CFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
-rev2dir = $(datadir)/usrp/rev2
-rev4dir = $(datadir)/usrp/rev4
-
-dist_rev2_DATA = std_inband.rbf
-dist_rev4_DATA = std_inband.rbf
-
noinst_LTLIBRARIES = libtransceiver_common.la
COMMON_SOURCES = \
diff --git a/Transceiver52M/device/usrp1/Makefile.am b/Transceiver52M/device/usrp1/Makefile.am
index 5078934..24760f7 100644
--- a/Transceiver52M/device/usrp1/Makefile.am
+++ b/Transceiver52M/device/usrp1/Makefile.am
@@ -3,6 +3,12 @@ include $(top_srcdir)/Makefile.common
AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common
AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(USRP_CFLAGS)
+rev2dir = $(datadir)/usrp/rev2
+rev4dir = $(datadir)/usrp/rev4
+
+dist_rev2_DATA = std_inband.rbf
+dist_rev4_DATA = std_inband.rbf
+
noinst_HEADERS = USRPDevice.h
noinst_LTLIBRARIES = libdevice.la
diff --git a/Transceiver52M/std_inband.rbf b/Transceiver52M/device/usrp1/std_inband.rbf
index 63842b7..63842b7 100755
--- a/Transceiver52M/std_inband.rbf
+++ b/Transceiver52M/device/usrp1/std_inband.rbf
Binary files differ
diff --git a/debian/copyright b/debian/copyright
index d8db465..19926cd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: OsmoTRX
Source: http://cgit.osmocom.org/osmo-trx/
-Files-Excluded: Transceiver52M/std_inband.rbf
+Files-Excluded: Transceiver52M/device/usrp1/std_inband.rbf
Files: *
Copyright: 2008-2013 Free Software Foundation