[Discuss-gnuradio] patch to enable building usrp outside of sourcedir

[Martin Dvh]

2006-02-27  Martin Dudok van Heel <nldudok1 at olifantasia.com>

        Enable building usrp outside of sourcedir

        * firmware/src/usrp2/Makefile.am: changed. Add includedirs 
$(top_srcdir)/firmware/src/common ./
        * fpga/rbf/Makefile.am: changed. If not in sourcedir copy rbf files and 
dirs over to ./ before trying to install them

? bootstrap-mdvh-debian
? bootstrap_25jan2006.log
? firmware/src/usrp0/Makefile.in
? firmware/src/usrp1/Makefile.in
Index: firmware/src/usrp2/Makefile.am
===================================================================
RCS file: /cvsroot/opensdr/usrp/firmware/src/usrp2/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- firmware/src/usrp2/Makefile.am      19 Feb 2006 04:07:28 -0000      1.8
+++ firmware/src/usrp2/Makefile.am      27 Feb 2006 00:52:21 -0000
@@ -54,7 +54,7 @@
 
 
 DEFINES=-DHAVE_USRP2
-INCLUDES=-I$(top_srcdir)/firmware/include -I$(top_srcdir)/firmware/src/usrp2 
-I../common
+INCLUDES=-I$(top_srcdir)/firmware/include -I$(top_srcdir)/firmware/src/usrp2 
-I$(top_srcdir)/firmware/src/common -I./ -I../common
 
 # with EA = 0, the FX2 implements a portion of the 8051 "external memory"
 # on chip.  This memory is mapped like this:
Index: fpga/rbf/Makefile.am
===================================================================
RCS file: /cvsroot/opensdr/usrp/fpga/rbf/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- fpga/rbf/Makefile.am        19 Feb 2006 04:07:28 -0000      1.5
+++ fpga/rbf/Makefile.am        27 Feb 2006 00:52:21 -0000
@@ -31,6 +31,9 @@
 
 
 install-data-local:
+       if test ! -d rev2; then \
+       cp -a $(srcdir)/rev* ./; \
+       fi;
        @for rev in rev?; do \
                if test ! -f $(DESTDIR)/$(datadir)/$$rev/DONT_INSTALL_RBF; then 
\
                  echo "$(INSTALL_DATA) $$rev/std_2rxhb_2tx.rbf 
$(DESTDIR)$(datadir)/$$rev/std_2rxhb_2tx.rbf"; \