[PATCH linux-firmware 1/2] usbdux: Assume as31 is already installed

[Ben Hutchings]

Don't try to build the as31 assembler in a subdirectory.  A suitable
version may be installed separately; for example it is packaged in
Debian.  Update the README accordingly.

Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
 usbdux/Makefile_dux |   18 ++++++++----------
 usbdux/README.dux   |   12 +++++-------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/usbdux/Makefile_dux b/usbdux/Makefile_dux
index 1dc0939..a61118e 100644
--- a/usbdux/Makefile_dux
+++ b/usbdux/Makefile_dux
@@ -3,20 +3,18 @@
 # no warranty
 #
 
-all: as31 usbduxfast_firmware.bin usbdux_firmware.bin usbduxsigma_firmware.bin
+AS31 := as31
 
-as31:
-	make -C as31-2.1
+all: usbduxfast_firmware.bin usbdux_firmware.bin usbduxsigma_firmware.bin
 
-usbduxfast_firmware.bin: fx2-include.asm usbduxfast_firmware.asm as31
-	as31-2.1/as31 -Fbin usbduxfast_firmware.asm
+usbduxfast_firmware.bin: fx2-include.asm usbduxfast_firmware.asm
+	$(AS31) -Fbin usbduxfast_firmware.asm
 
-usbdux_firmware.bin: fx2-include.asm usbdux_firmware.asm as31
-	as31-2.1/as31 -Fbin usbdux_firmware.asm
+usbdux_firmware.bin: fx2-include.asm usbdux_firmware.asm
+	$(AS31) -Fbin usbdux_firmware.asm
 
-usbduxsigma_firmware.bin: fx2-include.asm usbduxsigma_firmware.asm as31
-	as31-2.1/as31 -Fbin usbduxsigma_firmware.asm
+usbduxsigma_firmware.bin: fx2-include.asm usbduxsigma_firmware.asm
+	$(AS31) -Fbin usbduxsigma_firmware.asm
 
 clean:
 	rm -f *.bin *~ *.lst *.bin
-	make -C as31-2.1 clean
diff --git a/usbdux/README.dux b/usbdux/README.dux
index b3c8c05..791f14d 100644
--- a/usbdux/README.dux
+++ b/usbdux/README.dux
@@ -1,15 +1,13 @@
 To compile the firmware for the USBDUX,USBDUXfast and USBDUXsigma
 -----------------------------------------------------------------
-Download the as31 from:
 
-http://www.berndporr.me.uk/as31/
-
-(this is a patched version of as31 which supports an
-include directive).
+You need a version of as31 that supports the include directive.  If
+your distribution doesn't provide this, it may be downloaded from:
 
-Install it in this directory.
+http://www.berndporr.me.uk/as31/
 
-Then run "make -f Makefile_dux".
+Then run "make -f Makefile_dux".  If as31 is not installed in your
+path, set the AS31 make variable accordingly.
 
 Feedback:
 BerndPorr at f2s.com
-- 
1.7.9



-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 828 bytes
Desc: This is a digitally signed message part
URL: <http://driverdev.linuxdriverproject.org/pipermail/devel/attachments/20120219/44df87f8/attachment-0001.asc>