[Commit-gnuradio] r3775 - in gnuradio/branches/releases/3.0/usrp: . firmware/include

[jcorgan]

Author: jcorgan
Date: 2006-10-11 13:20:09 -0600 (Wed, 11 Oct 2006)
New Revision: 3775

Modified:
   gnuradio/branches/releases/3.0/usrp/ChangeLog
   gnuradio/branches/releases/3.0/usrp/firmware/include/Makefile.am
Log:
Applied changeset r3762 on trunk to release branch.

Modified: gnuradio/branches/releases/3.0/usrp/ChangeLog
===================================================================
--- gnuradio/branches/releases/3.0/usrp/ChangeLog       2006-10-11 16:24:01 UTC 
(rev 3774)
+++ gnuradio/branches/releases/3.0/usrp/ChangeLog       2006-10-11 19:20:09 UTC 
(rev 3775)
@@ -1,3 +1,9 @@
+2006-10-10  Greg Troxel  <address@hidden>
+
+       * firmware/include/Makefile.am: avoid nonportable use of $< (first
+       prereq in GNU make, implied source for pattern rule in BSD make)
+       used in a non-pattern rule.
+
 2006-06-25  Eric Blossom  <address@hidden>
 
        * firmware/include/fpga_regs_standard.h: doc fix to reflect current 
reality.

Modified: gnuradio/branches/releases/3.0/usrp/firmware/include/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/usrp/firmware/include/Makefile.am    
2006-10-11 16:24:01 UTC (rev 3774)
+++ gnuradio/branches/releases/3.0/usrp/firmware/include/Makefile.am    
2006-10-11 19:20:09 UTC (rev 3775)
@@ -53,7 +53,7 @@
        $(CODE_GENERATOR)
 
 fpga_regs_common.v: fpga_regs_common.h generate_regs.py 
-       PYTHONPATH=$(top_srcdir)/usrp/firmware/include 
$(srcdir)/generate_regs.py $< $@
+       PYTHONPATH=$(top_srcdir)/usrp/firmware/include 
$(srcdir)/generate_regs.py fpga_regs_common.h $@
 
 fpga_regs_standard.v: fpga_regs_standard.h generate_regs.py
-       PYTHONPATH=$(top_srcdir)/usrp/firmware/include 
$(srcdir)/generate_regs.py $< $@
+       PYTHONPATH=$(top_srcdir)/usrp/firmware/include 
$(srcdir)/generate_regs.py fpga_regs_standard.h $@