patch-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Patch-gnuradio] [PATCH] fix usrp host include path


From: Tom Rondeau
Subject: Re: [Patch-gnuradio] [PATCH] fix usrp host include path
Date: Sun, 9 Oct 2011 22:10:51 -0400

On Sat, Oct 1, 2011 at 12:12 AM, Maitland Bottoms <address@hidden> wrote:
Sorry I misssed the window between 3.4.0 and 3.4.1 to get this
trivial fix in. As long as you're supporting automake along
with CMake, please consider adding this trivial bugfix patch.

I happen to build gnuradio in a separate build directory rather
than the regular building in place. So I hit an error when
make couldn't find the source file usrp_dbid.h where it was looking.

I think the bug is in usrp/host/lib/Makefile.am, in that it
specified $(abs_top_builddir) - when I really think it should
say $(top_srcdir) in the path assigned to BUILT_SOURCES.

Using this patch makes the build work for me. And building
in place still works too!

-Maitland


Maitland,
I always build in a separate path and don't have any issues. The line you point out in the Makefile.am refers to a built source, so the source, usrp_dbid.h, is built during make into the build directory, not into the source directory. The include directory that is used takes the directive from config/grc_usrp.m4 to look for include files in BOTH the build and source directories, so it will properly find the created usrp_dbid.h.

Incidentally, when we run 'make distcheck,' it does a VPATH build to make sure these kinds of things are accounted for.

Tom


 
enc:
2011-09-30  "A. Maitland Bottoms" <address@hidden>  (tiny change)
 * fix usrp host include path


>From 97b91caa3a3f0c5b0a3b531009475824c82edffd Mon Sep 17 00:00:00 2001
From: A. Maitland Bottoms <address@hidden>
Date: Fri, 30 Sep 2011 22:53:00 -0400
Subject: [PATCH] fix usrp host include path

---
 usrp/host/lib/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am
index 96ab558..9803acc 100644
--- a/usrp/host/lib/Makefile.am
+++ b/usrp/host/lib/Makefile.am
@@ -46,7 +46,7 @@ EXTRA_DIST +=                                 \
       std_paths.h.in                  \
       usrp_dbid.dat

-BUILT_SOURCES += $(abs_top_builddir)/usrp/host/include/usrp/usrp_dbid.h
+BUILT_SOURCES += $(top_srcdir)/usrp/host/include/usrp/usrp_dbid.h

 BUILT_SOURCES += usrp_dbid.cc \
                usrp_dbid.py
--
1.7.2.5


_______________________________________________
Patch-gnuradio mailing list
address@hidden
https://lists.gnu.org/mailman/listinfo/patch-gnuradio



reply via email to

[Prev in Thread] Current Thread [Next in Thread]