4 files changed, 74 insertions, 51 deletions
diff --git a/usrp/doc/Makefile.am b/usrp/doc/Makefile.am
index cc1f51891..1c01e43fa 100644
--- a/usrp/doc/Makefile.am
+++ b/usrp/doc/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2001,2005 Free Software Foundation, Inc.
+# Copyright 2001,2005,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -25,7 +25,7 @@ include $(top_srcdir)/Makefile.common
 SUBDIRS = other
 
 man3dir = $(mandir)/man3
-docdir  = $(prefix)/share/doc/usrp-@VERSION@
+usrp_docdir  = $(prefix)/share/doc/usrp-@VERSION@
 
 EXTRA_DIST = 			\
 	Doxyfile.in		\
@@ -44,9 +44,11 @@ DOCBOOK_HTML_FILES=
 all-local: dox
 endif
 
+dist_usrp_doc_DATA = $(top_srcdir)/usrp/README
+
 dox: html/index.html
 html/index.html:
-	mkdir -p html
+	$(MKDIR_P) html
 	@DOXYGEN@
 
 docbook-html: usrp_guide.html
@@ -55,25 +57,15 @@ usrp_guide.html: usrp_guide.xml
 	xmlto html-nochunks $(top_srcdir)/usrp/doc/usrp_guide.xml
 
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(docdir)
-	@for i in $(top_srcdir)/usrp/README ; do \
-		echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \
-		$(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \
-	done
-
-	mkdir -p $(DESTDIR)$(docdir)/html
+	$(MKDIR_P) $(DESTDIR)$(usrp_docdir)/html
 	@for i in $(DOCBOOK_HTML_FILES); do \
-		echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html"; \
-		$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html; \
+		echo "$(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html"; \
+		$(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html; \
 	done
-	cp -r html $(DESTDIR)$(docdir)
+	cp -r html $(DESTDIR)$(usrp_docdir)
 
 uninstall-local:
-	@for i in README ChangeLog; do \
-		echo "$(RM) $(DESTDIR)$(docdir)/$$i;"; \
-		$(RM) $(DESTDIR)$(docdir)/$$i; \
-	done
-	$(RM) -fr $(DESTDIR)$(docdir)/html
+	$(RM) -fr $(DESTDIR)$(usrp_docdir)/html
 
 clean-local:
 	$(RM) -fr latex html man xml $(DOCBOOK_HTML_FILES)
diff --git a/usrp/fpga/rbf/Makefile.am b/usrp/fpga/rbf/Makefile.am
index c7c9ce670..7bce77d5f 100644
--- a/usrp/fpga/rbf/Makefile.am
+++ b/usrp/fpga/rbf/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -19,35 +19,4 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-include $(top_srcdir)/Makefile.common
-
-datadir = $(prefix)/share/usrp
-
-rbfs = 				\
-	rev2/std_2rxhb_2tx.rbf	\
-	rev2/std_4rx_0tx.rbf	\
-	rev2/inband_1rxhb_1tx.rbf	\
-	rev2/inband_2rxhb_2tx.rbf	\
-	rev4/std_2rxhb_2tx.rbf	\
-	rev4/std_4rx_0tx.rbf    \
-	rev4/inband_1rxhb_1tx.rbf	\
-	rev4/inband_2rxhb_2tx.rbf	\
-	rev2/multi_2rxhb_2tx.rbf	\
-	rev4/multi_2rxhb_2tx.rbf		
-
-
-EXTRA_DIST = 			\
-	$(rbfs)
-
-
-install-data-local:
-	@for file in $(rbfs); do \
-		echo "$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(datadir)/$$file"; \
-		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(datadir)/$$file; \
-	done
-
-uninstall-local:
-	@for file in $(rbfs); do \
-		echo "$(RM) $(DESTDIR)$(datadir)/$$file"; \
-		$(RM) $(DESTDIR)$(datadir)/$$file; \
-	done
+SUBDIRS = rev2 rev4
diff --git a/usrp/fpga/rbf/rev2/Makefile.am b/usrp/fpga/rbf/rev2/Makefile.am
new file mode 100644
index 000000000..487650e18
--- /dev/null
+++ b/usrp/fpga/rbf/rev2/Makefile.am
@@ -0,0 +1,31 @@
+#
+# Copyright 2009 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.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+rbf2datadir = $(prefix)/share/usrp/rev2
+
+dist_rbf2data_DATA =		\
+	std_2rxhb_2tx.rbf		\
+	std_4rx_0tx.rbf		\
+	inband_1rxhb_1tx.rbf	\
+	inband_2rxhb_2tx.rbf	\
+	multi_2rxhb_2tx.rbf
diff --git a/usrp/fpga/rbf/rev4/Makefile.am b/usrp/fpga/rbf/rev4/Makefile.am
new file mode 100644
index 000000000..54de9b818
--- /dev/null
+++ b/usrp/fpga/rbf/rev4/Makefile.am
@@ -0,0 +1,31 @@
+#
+# Copyright 2009 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.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+rbf4datadir = $(prefix)/share/usrp/rev4
+
+dist_rbf4data_DATA =		\
+	std_2rxhb_2tx.rbf		\
+	std_4rx_0tx.rbf		\
+	inband_1rxhb_1tx.rbf	\
+	inband_2rxhb_2tx.rbf	\
+	multi_2rxhb_2tx.rbf