3 files changed, 6 insertions, 10 deletions
diff --git a/usrp/firmware/lib/Makefile.am b/usrp/firmware/lib/Makefile.am
index 3ddafcf1b..47fc6f730 100644
--- a/usrp/firmware/lib/Makefile.am
+++ b/usrp/firmware/lib/Makefile.am
@@ -57,13 +57,9 @@ LIBOBJS = 		\
 
 all: libfx2.lib
 
-%.rel : %.c
+.c.rel:
 	$(XCC) $(INCLUDES) $(DEFINES) -c $< -o $@
 
-%.rel : %.a51
-	$(XAS) $<
-
-
 $(LIBRARY): $(LIBOBJS)
 	-rm -f $(LIBRARY)
 	touch $(LIBRARY)
diff --git a/usrp/firmware/src/usrp2/Makefile.am b/usrp/firmware/src/usrp2/Makefile.am
index 41664a2da..e2b9f9e61 100644
--- a/usrp/firmware/src/usrp2/Makefile.am
+++ b/usrp/firmware/src/usrp2/Makefile.am
@@ -90,11 +90,11 @@ noinst_SCRIPTS = 		\
 	burn-usrp4-eeprom
 
 
-%.rel : %.c
+.c.rel:
 	$(XCC) $(INCLUDES) $(DEFINES) \
 		-c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
 
-%.rel : %.a51
+.a51.rel:
 	test -f `basename '$<'` || ln -s '$<' .
 	test -f ../common/`basename '$<'` -o \
 		\! -f `dirname '$<'`/../common/`basename '$<'` \
@@ -108,11 +108,11 @@ eeprom_boot.ihx: $(EEPROM_BOOT_OBJS) $(LIBDEP)
 	$(XCC) $(LINKOPTS) -o $@ $(EEPROM_BOOT_OBJS)
 
 burn-usrp2-eeprom: eeprom_boot.ihx
-	$(srcdir)/../common/build_eeprom.py -r2 $< > $@
+	$(srcdir)/../common/build_eeprom.py -r2 eeprom_boot.ihx > $@
 	chmod +x $@
 
 burn-usrp4-eeprom: eeprom_boot.ihx
-	$(srcdir)/../common/build_eeprom.py -r4 $< > $@
+	$(srcdir)/../common/build_eeprom.py -r4 eeprom_boot.ihx > $@
 	chmod +x $@
 
 
diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am
index 2a1f5b8a5..78459515e 100644
--- a/usrp/host/swig/Makefile.am
+++ b/usrp/host/swig/Makefile.am
@@ -71,7 +71,7 @@ _usrp_prims_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
 
 prims.cc usrp_prims.py : prims.i ../../firmware/include/fpga_regs_common.h ../../firmware/include/fpga_regs_standard.h
-	$(SWIG) $(SWIGPYTHONARGS) -module usrp_prims -o prims.cc $<
+	$(SWIG) $(SWIGPYTHONARGS) -module usrp_prims -o prims.cc prims.i
 
 
 MOSTLYCLEANFILES = \