--- 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
 IMAGES_LIST =
+USRP1_LIST =
+USRP2_LIST =
 
 ##little rule to make the images directory
 $(BUILT_IMAGES_DIR):
@@ -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)
+USRP1_LIST += $(_usrp1_fw_ihx) $(_usrp_b100_fw_ihx)
 
 $(_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
 IMAGES_LIST += $(_usrp1_fpga_rbf) $(_usrp1_fpga_4rx_rbf)
+USRP1_LIST += $(_usrp1_fpga_rbf) $(_usrp1_fpga_4rx_rbf)
 
 $(_usrp1_fpga_rbf): $(GLOBAL_DEPS)
 	cp $(_usrp1_fpga_dir)/std_2rxhb_2tx.rbf $@
@@ -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
-	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)
+USRP2_LIST += $(_usrp2_fw_bin) $(_usrp_n200_fw_bin) $(_usrp_n210_fw_bin)
 
 $(_usrp2_fw_bin): $(GLOBAL_DEPS)
 	cd $(_usrp2_fw_dir) && rm -rf build
 	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
-	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
-	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,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
-	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,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
-	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
-	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
-	find $(TOP_FPGA_DIR) -name "*.twr" | xargs grep constraint | grep met
+#	find $(TOP_FPGA_DIR) -name "*.twr" | xargs grep constraint | grep met
+
+images_usrp1:	$(USRP1_LIST)
+	find $(BUILT_IMAGES_DIR) -type f | xargs chmod -x
+
+images_usrp2:	$(USRP2_LIST)
+	find $(BUILT_IMAGES_DIR) -type f | xargs chmod -x
 
 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)