- Fix usrp on 10.0

  New make on 10 and HEAD does not behave the same way as previous make,
  this masked an incorrect make use.

Submitted by:	myself
Approved by:	Maintainer (adrian@)

2 files changed, 105 insertions, 22 deletions

diff --git a/comms/usrp/files/patch-images_Makefile b/comms/usrp/files/patch-images_Makefile
index acd0ba7b397b..e84c19f36dbc 100644
--- a/comms/usrp/files/patch-images_Makefile
+++ b/comms/usrp/files/patch-images_Makefile
@@ -1,5 +1,5 @@
---- images/Makefile.orig	2012-07-30 14:09:48.000000000 -0500
-+++ images/Makefile	2012-10-27 08:32:32.000000000 -0500
+--- images/Makefile.orig	2013-12-22 13:39:06.675009366 -0500
++++ images/Makefile	2013-12-25 16:43:43.362707751 -0500
 @@ -29,6 +29,8 @@
  
  ##filled in below
@@ -9,7 +9,7 @@
  
  ##little rule to make the images directory
  $(BUILT_IMAGES_DIR):
-@@ -61,6 +63,7 @@
+@@ -61,12 +63,13 @@
  _usrp1_fw_ihx = $(BUILT_IMAGES_DIR)/usrp1_fw.ihx
  _usrp_b100_fw_ihx = $(BUILT_IMAGES_DIR)/usrp_b100_fw.ihx
  IMAGES_LIST += $(_usrp1_fw_ihx) $(_usrp_b100_fw_ihx)
@@ -17,6 +17,13 @@
  
  $(_usrp1_fw_ihx): $(GLOBAL_DEPS)
  	cd $(_usrp1_fw_dir) && rm -rf build
+ 	cd $(_usrp1_fw_dir) && mkdir build
+ 	cd $(_usrp1_fw_dir)/build && cmake ../
+-	cd $(_usrp1_fw_dir)/build && make
++	cd $(_usrp1_fw_dir)/build && gmake
+ 	cp $(_usrp1_fw_dir)/build/usrp1/usrp1_fw.ihx $@
+ 
+ $(_usrp_b100_fw_ihx): $(_usrp1_fw_ihx)
 @@ -81,6 +84,7 @@
  _usrp1_fpga_rbf = $(BUILT_IMAGES_DIR)/usrp1_fpga.rbf
  _usrp1_fpga_4rx_rbf = $(BUILT_IMAGES_DIR)/usrp1_fpga_4rx.rbf
@@ -25,15 +32,21 @@
  
  $(_usrp1_fpga_rbf): $(GLOBAL_DEPS)
  	cp $(_usrp1_fpga_dir)/std_2rxhb_2tx.rbf $@
-@@ -96,6 +100,7 @@
+@@ -96,10 +100,11 @@
  _usrp_b100_fpga_dir = $(TOP_FPGA_DIR)/usrp2/top/B100
  _usrp_b100_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_b100_fpga.bin
  IMAGES_LIST += $(_usrp_b100_fpga_bin)
 +USRP1_LIST += $(_usrp_b100_fpga_bin)
  
  $(_usrp_b100_fpga_bin): $(GLOBAL_DEPS)
- 	cd $(_usrp_b100_fpga_dir) && make -f Makefile.B100 clean
-@@ -114,6 +119,7 @@
+-	cd $(_usrp_b100_fpga_dir) && make -f Makefile.B100 clean
+-	cd $(_usrp_b100_fpga_dir) && make -f Makefile.B100 bin
++	cd $(_usrp_b100_fpga_dir) && gmake -f Makefile.B100 clean
++	cd $(_usrp_b100_fpga_dir) && gmake -f Makefile.B100 bin
+ 	cp $(_usrp_b100_fpga_dir)/build-B100/B100.bin $@
+ 
+ endif
+@@ -114,12 +119,13 @@
  _usrp_n200_fw_bin = $(BUILT_IMAGES_DIR)/usrp_n200_fw.bin
  _usrp_n210_fw_bin = $(BUILT_IMAGES_DIR)/usrp_n210_fw.bin
  IMAGES_LIST += $(_usrp2_fw_bin) $(_usrp_n200_fw_bin) $(_usrp_n210_fw_bin)
@@ -41,63 +54,126 @@
  
  $(_usrp2_fw_bin): $(GLOBAL_DEPS)
  	cd $(_usrp2_fw_dir) && rm -rf build
-@@ -138,6 +144,7 @@
+ 	cd $(_usrp2_fw_dir) && mkdir build
+ 	cd $(_usrp2_fw_dir)/build && cmake ../
+-	cd $(_usrp2_fw_dir)/build && make
++	cd $(_usrp2_fw_dir)/build && gmake
+ 	cp $(_usrp2_fw_dir)/build/usrp2/usrp2_txrx_uhd.bin $@
+ 
+ $(_usrp_n200_fw_bin): $(_usrp2_fw_bin)
+@@ -138,10 +144,11 @@
  _usrp2_fpga_dir = $(TOP_FPGA_DIR)/usrp2/top/USRP2
  _usrp2_fpga_bin = $(BUILT_IMAGES_DIR)/usrp2_fpga.bin
  IMAGES_LIST += $(_usrp2_fpga_bin)
 +USRP2_LIST += $(_usrp2_fpga_bin)
  
  $(_usrp2_fpga_bin): $(GLOBAL_DEPS)
- 	cd $(_usrp2_fpga_dir) && make clean
-@@ -155,6 +162,7 @@
+-	cd $(_usrp2_fpga_dir) && make clean
+-	cd $(_usrp2_fpga_dir) && make bin
++	cd $(_usrp2_fpga_dir) && gmake clean
++	cd $(_usrp2_fpga_dir) && gmake bin
+ 	cp $(_usrp2_fpga_dir)/build/u2_rev3.bin $@
+ 
+ endif
+@@ -155,18 +162,20 @@
  _usrp_n200_r3_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n200_r3_fpga.bin
  _usrp_n200_r3_fpga_bit = $(BUILT_IMAGES_DIR)/bit/usrp_n200_r3_fpga.bit
  IMAGES_LIST += $(_usrp_n200_r3_fpga_bin) $(_usrp_n200_r3_fpga_bit)
 +USRP2_LIST += $(_usrp_n200_r3_fpga_bin) $(_usrp_n200_r3_fpga_bit)
  
  $(_usrp_n200_r3_fpga_bin): $(GLOBAL_DEPS)
- 	cd $(_usrp_n200_r3_fpga_dir) && make -f Makefile.N200R3 clean
-@@ -167,6 +175,7 @@
- #its called r2 on the silkscreen, so make an r2
+-	cd $(_usrp_n200_r3_fpga_dir) && make -f Makefile.N200R3 clean
+-	cd $(_usrp_n200_r3_fpga_dir) && make -f Makefile.N200R3 bin
++	cd $(_usrp_n200_r3_fpga_dir) && gmake -f Makefile.N200R3 clean
++	cd $(_usrp_n200_r3_fpga_dir) && gmake -f Makefile.N200R3 bin
+ 	cp $(_usrp_n200_r3_fpga_dir)/build-N200R3/u2plus.bin $@
+ 
+ $(_usrp_n200_r3_fpga_bit): $(_usrp_n200_r3_fpga_bin)
+ 	cp $(_usrp_n200_r3_fpga_dir)/build-N200R3/u2plus.bit $@
+ 
+-#its called r2 on the silkscreen, so make an r2
++#its called r2 on the silkscreen, so gmake an r2
  _usrp_n200_r2_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n200_r2_fpga.bin
  IMAGES_LIST += $(_usrp_n200_r2_fpga_bin)
 +USRP2_LIST += $(_usrp_n200_r2_fpga_bin)
  $(_usrp_n200_r2_fpga_bin): $(_usrp_n200_r3_fpga_bin)
  	cp $< $@
  
-@@ -181,6 +190,7 @@
+@@ -181,18 +190,20 @@
  _usrp_n210_r3_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n210_r3_fpga.bin
  _usrp_n210_r3_fpga_bit = $(BUILT_IMAGES_DIR)/bit/usrp_n210_r3_fpga.bit
  IMAGES_LIST += $(_usrp_n210_r3_fpga_bin) $(_usrp_n210_r3_fpga_bit)
 +USRP2_LIST += $(_usrp_n210_r3_fpga_bin) $(_usrp_n210_r3_fpga_bit)
  
  $(_usrp_n210_r3_fpga_bin): $(GLOBAL_DEPS)
- 	cd $(_usrp_n210_r3_fpga_dir) && make -f Makefile.N210R3 clean
-@@ -193,6 +203,7 @@
- #its called r2 on the silkscreen, so make an r2
+-	cd $(_usrp_n210_r3_fpga_dir) && make -f Makefile.N210R3 clean
+-	cd $(_usrp_n210_r3_fpga_dir) && make -f Makefile.N210R3 bin
++	cd $(_usrp_n210_r3_fpga_dir) && gmake -f Makefile.N210R3 clean
++	cd $(_usrp_n210_r3_fpga_dir) && gmake -f Makefile.N210R3 bin
+ 	cp $(_usrp_n210_r3_fpga_dir)/build-N210R3/u2plus.bin $@
+ 
+ $(_usrp_n210_r3_fpga_bit): $(_usrp_n210_r3_fpga_bin)
+ 	cp $(_usrp_n210_r3_fpga_dir)/build-N210R3/u2plus.bit $@
+ 
+-#its called r2 on the silkscreen, so make an r2
++#its called r2 on the silkscreen, so gmake an r2
  _usrp_n210_r2_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n210_r2_fpga.bin
  IMAGES_LIST += $(_usrp_n210_r2_fpga_bin)
 +USRP2_LIST += $(_usrp_n210_r2_fpga_bin)
  $(_usrp_n210_r2_fpga_bin): $(_usrp_n210_r3_fpga_bin)
  	cp $< $@
  
-@@ -207,6 +218,7 @@
+@@ -207,10 +218,11 @@
  _usrp_n200_r4_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n200_r4_fpga.bin
  _usrp_n200_r4_fpga_bit = $(BUILT_IMAGES_DIR)/bit/usrp_n200_r4_fpga.bit
  IMAGES_LIST += $(_usrp_n200_r4_fpga_bin) $(_usrp_n200_r4_fpga_bit)
 +USRP2_LIST += $(_usrp_n200_r4_fpga_bin) $(_usrp_n200_r4_fpga_bit)
  
  $(_usrp_n200_r4_fpga_bin): $(GLOBAL_DEPS)
- 	cd $(_usrp_n200_r4_fpga_dir) && make -f Makefile.N200R4 clean
-@@ -227,6 +239,7 @@
+-	cd $(_usrp_n200_r4_fpga_dir) && make -f Makefile.N200R4 clean
+-	cd $(_usrp_n200_r4_fpga_dir) && make -f Makefile.N200R4 bin
++	cd $(_usrp_n200_r4_fpga_dir) && gmake -f Makefile.N200R4 clean
++	cd $(_usrp_n200_r4_fpga_dir) && gmake -f Makefile.N200R4 bin
+ 	cp $(_usrp_n200_r4_fpga_dir)/build-N200R4/u2plus.bin $@
+ 
+ $(_usrp_n200_r4_fpga_bit): $(_usrp_n200_r4_fpga_bin)
+@@ -227,10 +239,11 @@
  _usrp_n210_r4_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n210_r4_fpga.bin
  _usrp_n210_r4_fpga_bit = $(BUILT_IMAGES_DIR)/bit/usrp_n210_r4_fpga.bit
  IMAGES_LIST += $(_usrp_n210_r4_fpga_bin) $(_usrp_n210_r4_fpga_bit)
 +USRP2_LIST += $(_usrp_n210_r4_fpga_bin) $(_usrp_n210_r4_fpga_bit)
  
  $(_usrp_n210_r4_fpga_bin): $(GLOBAL_DEPS)
- 	cd $(_usrp_n210_r4_fpga_dir) && make -f Makefile.N210R4 clean
-@@ -275,7 +288,13 @@
+-	cd $(_usrp_n210_r4_fpga_dir) && make -f Makefile.N210R4 clean
+-	cd $(_usrp_n210_r4_fpga_dir) && make -f Makefile.N210R4 bin
++	cd $(_usrp_n210_r4_fpga_dir) && gmake -f Makefile.N210R4 clean
++	cd $(_usrp_n210_r4_fpga_dir) && gmake -f Makefile.N210R4 bin
+ 	cp $(_usrp_n210_r4_fpga_dir)/build-N210R4/u2plus.bin $@
+ 
+ $(_usrp_n210_r4_fpga_bit): $(_usrp_n210_r4_fpga_bin)
+@@ -248,8 +261,8 @@
+ IMAGES_LIST += $(_usrp_e100_fpga_bin)
+ 
+ $(_usrp_e100_fpga_bin): $(GLOBAL_DEPS)
+-	cd $(_usrp_e100_fpga_dir) && make -f Makefile.E100 clean
+-	cd $(_usrp_e100_fpga_dir) && make -f Makefile.E100 bin
++	cd $(_usrp_e100_fpga_dir) && gmake -f Makefile.E100 clean
++	cd $(_usrp_e100_fpga_dir) && gmake -f Makefile.E100 bin
+ 	cp $(_usrp_e100_fpga_dir)/build-E100/u1e.bin $@
+ 
+ endif
+@@ -264,8 +277,8 @@
+ IMAGES_LIST += $(_usrp_e110_fpga_bin)
+ 
+ $(_usrp_e110_fpga_bin): $(GLOBAL_DEPS)
+-	cd $(_usrp_e110_fpga_dir) && make -f Makefile.E110 clean
+-	cd $(_usrp_e110_fpga_dir) && make -f Makefile.E110 bin
++	cd $(_usrp_e110_fpga_dir) && gmake -f Makefile.E110 clean
++	cd $(_usrp_e110_fpga_dir) && gmake -f Makefile.E110 bin
+ 	cp $(_usrp_e110_fpga_dir)/build-E110/u1e.bin $@
+ 
+ endif
+@@ -275,13 +288,19 @@
  ########################################################################
  images: $(IMAGES_LIST)
  	find $(BUILT_IMAGES_DIR) -type f | xargs chmod -x
@@ -112,3 +188,11 @@
  
  package:
  	mkdir -p $(CMAKE_BUILD_DIR)
+ 	cd $(CMAKE_BUILD_DIR) && cmake -DUHD_RELEASE_MODE=OFF ..
+-	cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=TGZ .. && make package
+-	cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=ZIP .. && make package
++	cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=TGZ .. && gmake package
++	cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=ZIP .. && gmake package
+ 
+ clean:
+ 	$(RM) -rf $(BUILT_IMAGES_DIR)
diff --git a/comms/usrp/pkg-plist b/comms/usrp/pkg-plist
index d7141619c220..9aaec63cf025 100644
--- a/comms/usrp/pkg-plist
+++ b/comms/usrp/pkg-plist
@@ -894,7 +894,6 @@ share/uhd/utils/usrp_n2xx_net_burner_gui.py
 %%PUSRP1%%@dirrm share/uhd/fpga/usrp1/rev4
 %%PUSRP1%%@dirrm share/uhd/fpga/usrp1
 %%PUSRP1%%@dirrm share/uhd/fpga
-@dirrm share/uhd
 @dirrm share/uhd/examples
 @dirrm share/uhd/tests
 @dirrm share/uhd/utils