diff options
| author | Josh Blum <josh@joshknows.com> | 2010-01-22 11:58:32 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-01-22 11:58:32 -0800 |
| commit | da57b53f803af2598a06fa89e6da2797e5e65155 (patch) | |
| tree | bfc0772d0cb7d880d1f91ed936baa02d8ac8d155 /usrp1/Makefile.am | |
| parent | 7bf8a6df381a667134b55701993c6770d32bc76b (diff) | |
| parent | a170b9b42345794429486dd4f3316e84ea2cc871 (diff) | |
| download | uhd-da57b53f803af2598a06fa89e6da2797e5e65155.tar.gz uhd-da57b53f803af2598a06fa89e6da2797e5e65155.tar.bz2 uhd-da57b53f803af2598a06fa89e6da2797e5e65155.zip | |
Merge branch 'usrp1' into usrp2
Conflicts:
.gitignore
Diffstat (limited to 'usrp1/Makefile.am')
| -rw-r--r-- | usrp1/Makefile.am | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/usrp1/Makefile.am b/usrp1/Makefile.am new file mode 100644 index 000000000..8721af4a7 --- /dev/null +++ b/usrp1/Makefile.am @@ -0,0 +1,24 @@ +# +# Copyright 2004,2005,2006 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +SUBDIRS = rbf + +include Makefile.extra |