diff options
| author | eb | 2008-10-01 23:11:11 +0000 |
|---|---|---|
| committer | eb | 2008-10-01 23:11:11 +0000 |
| commit | d497b054a51bc049640c1d43cb54ca3d54ffdb4a (patch) | |
| tree | 44076c93867e489e4af0358a9d2c924e7c0fc206 /usrp2/firmware/Makefile.am | |
| parent | 5bfda44b8d4093c81779c05c98f3bbd310f198df (diff) | |
| download | gnuradio-d497b054a51bc049640c1d43cb54ca3d54ffdb4a.tar.gz gnuradio-d497b054a51bc049640c1d43cb54ca3d54ffdb4a.tar.bz2 gnuradio-d497b054a51bc049640c1d43cb54ca3d54ffdb4a.zip | |
Fixes ticket:297. Refactors how usrp2/firmware is built. Now
AC_CONFIG_SUBDIRS is always called, and there's a AM_CONDITIONAL in
usrp2/firmware that decides whether anything really gets built or not.
I think this will fix the "double cross" issue (cross-compiling the
bulk of this for cell while cross-compiling the usrp2 firmware at the
same time), though it's not tested yet.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9695 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp2/firmware/Makefile.am')
| -rw-r--r-- | usrp2/firmware/Makefile.am | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/usrp2/firmware/Makefile.am b/usrp2/firmware/Makefile.am index 437f23226..62b2d5bad 100644 --- a/usrp2/firmware/Makefile.am +++ b/usrp2/firmware/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007 Free Software Foundation, Inc. +# Copyright 2007,2008 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,7 +15,20 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # +ACLOCAL_AMFLAGS = -I config + include $(top_srcdir)/Makefile.common -SUBDIRS = include lib apps +EXTRA_DIST = \ + bootstrap \ + configure \ + configure.gnu + + +SUBDIRS = config + +if BUILDING_USRP2_FIRMWARE +SUBDIRS += include lib apps +endif + |