Change in libusrp[master]: firmware: Fix include directory path names

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 11 16:59:02 UTC 2019


Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12528


Change subject: firmware: Fix include directory path names
......................................................................

firmware: Fix include directory path names

When we forked libusrp from the gnuradio source archive, we moved
around the directories, but failed to adjust the FW_INCLUDES.

Change-Id: I51a10da2325f7f6d158bb80f43e42b6ed29006f0
---
M firmware/lib/Makefile.am
M firmware/src/usrp2/Makefile.am
2 files changed, 5 insertions(+), 5 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/28/12528/1

diff --git a/firmware/lib/Makefile.am b/firmware/lib/Makefile.am
index a6790f0..a791031 100644
--- a/firmware/lib/Makefile.am
+++ b/firmware/lib/Makefile.am
@@ -30,7 +30,7 @@
 
 
 DEFINES=
-FW_INCLUDES=-I$(top_srcdir)/usrp/firmware/include
+FW_INCLUDES=-I$(top_srcdir)/firmware/include
 
 # with EA = 0, the FX2 implements a portion of the 8051 "external memory"
 # on chip.  This memory is mapped like this:
diff --git a/firmware/src/usrp2/Makefile.am b/firmware/src/usrp2/Makefile.am
index 4402cd6..24ff9b1 100644
--- a/firmware/src/usrp2/Makefile.am
+++ b/firmware/src/usrp2/Makefile.am
@@ -54,10 +54,10 @@
 
 
 DEFINES=-DHAVE_USRP2
-FW_INCLUDES=-I$(top_srcdir)/usrp/firmware/include \
-         -I$(top_srcdir)/usrp/firmware/src/usrp2 \
-	 -I$(top_srcdir)/usrp/firmware/src/common \
-	 -I$(top_builddir)/usrp/firmware/src/common
+FW_INCLUDES=-I$(top_srcdir)/firmware/include \
+         -I$(top_srcdir)/firmware/src/usrp2 \
+	 -I$(top_srcdir)/firmware/src/common \
+	 -I$(top_builddir)/firmware/src/common
 
 # with EA = 0, the FX2 implements a portion of the 8051 "external memory"
 # on chip.  This memory is mapped like this:

-- 
To view, visit https://gerrit.osmocom.org/12528
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libusrp
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51a10da2325f7f6d158bb80f43e42b6ed29006f0
Gerrit-Change-Number: 12528
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190111/62c0ce44/attachment.htm>


More information about the gerrit-log mailing list