pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-trx/+/42255?usp=email )
Change subject: Drop libusb dependency
......................................................................
Drop libusb dependency
We aren't using libusb anywhere directly, so drop checks for it, plus
incorrect USB_INCLUDES which was empty.
Change-Id: I600db0bfe6f746024a329f2972879563d2a013b0
---
M Makefile.am
M configure.ac
M debian/control
3 files changed, 1 insertion(+), 3 deletions(-)
Approvals:
osmith: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
diff --git a/Makefile.am b/Makefile.am
index 33d8bfa..d4c3c93 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
include $(top_srcdir)/Makefile.common
ACLOCAL_AMFLAGS = -I config
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(USB_INCLUDES) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(WITH_INCLUDES)
AM_CXXFLAGS = -Wall -pthread
#AM_CXXFLAGS = -Wall -O2 -NDEBUG -pthread
#AM_CFLAGS = -Wall -O2 -NDEBUG -pthread
diff --git a/configure.ac b/configure.ac
index 62eb625..c4f707b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -286,7 +286,6 @@
AM_CONDITIONAL(ARCH_ARM_A15, [test "x$with_neon_vfpv4" = "xyes"])
AM_CONDITIONAL(ENABLE_MS_TRX, [test "x$with_mstrx" = "xyes"])
-PKG_CHECK_MODULES(LIBUSB, libusb-1.0)
PKG_CHECK_MODULES(FFTWF, fftw3f)
# Generate manuals
diff --git a/debian/control b/debian/control
index bb1be71..20dda3f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@
pkg-config,
dh-autoreconf,
libuhd-dev,
- libusb-1.0-0-dev,
libboost-all-dev,
libfftw3-dev,
libtalloc-dev,
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/42255?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I600db0bfe6f746024a329f2972879563d2a013b0
Gerrit-Change-Number: 42255
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
