X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile;h=fc8d4c1020dac2bce5e7f32c440847aa189fac51;hb=2b421d0ecf9ec717a6864da01a071d3c9bfeec7e;hp=22d0a691cd5c9f5ee9b8016b8d29abd06e263e84;hpb=d33eeacaf5129815c290146ba85b3a36c86f02fa;p=sigrok-firmware-fx2lafw.git

diff --git a/Makefile b/Makefile
index 22d0a691..fc8d4c10 100644
--- a/Makefile
+++ b/Makefile
@@ -23,42 +23,56 @@ VERSION = "0.1.0"
 
 DESTDIR ?= /usr/local/share/sigrok-firmware
 
-REPO = git://sigrok.git.sourceforge.net/gitroot/sigrok/fx2lafw
+REPO = git://sigrok.org/sigrok-firmware-fx2lafw
 
 TARBALLDIR = sigrok-firmware-fx2lafw-$(VERSION)
+TARBALLBINDIR = sigrok-firmware-fx2lafw-bin-$(VERSION)
 
 all: build-all
 
-build-all: saleae-logic cwav-usbeeax cwav-usbeesx cypress-fx2 braintechnology-usb-lps
+build-all: saleae-logic cwav-usbeeax cwav-usbeedx cwav-usbeesx cypress-fx2 braintechnology-usb-lps
 
 saleae-logic:
-	$(MAKE) -C hw/saleae-logic
+	@$(MAKE) -C hw/saleae-logic
 
 cwav-usbeeax:
-	$(MAKE) -C hw/cwav-usbeeax
+	@$(MAKE) -C hw/cwav-usbeeax
+
+cwav-usbeedx:
+	@$(MAKE) -C hw/cwav-usbeedx
 
 cwav-usbeesx:
-	$(MAKE) -C hw/cwav-usbeesx
+	@$(MAKE) -C hw/cwav-usbeesx
 
 cypress-fx2:
-	$(MAKE) -C hw/cypress-fx2
+	@$(MAKE) -C hw/cypress-fx2
 
 braintechnology-usb-lps:
-	$(MAKE) -C hw/braintechnology-usb-lps
+	@$(MAKE) -C hw/braintechnology-usb-lps
 
 ChangeLog:
 	@git log > ChangeLog || touch ChangeLog
 
 dist:
-	git clone $(REPO) $(TARBALLDIR)
-	cd $(TARBALLDIR) && $(MAKE) ChangeLog && cd ..
+	@git clone $(REPO) $(TARBALLDIR)
+	@cd $(TARBALLDIR) && $(MAKE) ChangeLog && cd ..
+	@rm -rf $(TARBALLDIR)/.git
 	@tar -c -z -f $(TARBALLDIR).tar.gz $(TARBALLDIR)
 	@rm -rf $(TARBALLDIR)
 
+distbin: build-all ChangeLog
+	@mkdir $(TARBALLBINDIR)
+	@cp hw/*/build/*.fw $(TARBALLBINDIR)
+	@cp README NEWS ChangeLog $(TARBALLBINDIR)
+	@tar -c -z -f $(TARBALLBINDIR).tar.gz $(TARBALLBINDIR)
+	@rm -rf $(TARBALLBINDIR)
+	@rm -f ChangeLog
+
 install: build-all
 	@mkdir -p $(DESTDIR)
 	@cp hw/saleae-logic/build/*.fw $(DESTDIR)
 	@cp hw/cwav-usbeeax/build/*.fw $(DESTDIR)
+	@cp hw/cwav-usbeedx/build/*.fw $(DESTDIR)
 	@cp hw/cwav-usbeesx/build/*.fw $(DESTDIR)
 	@cp hw/cypress-fx2/build/*.fw $(DESTDIR)
 	@cp hw/braintechnology-usb-lps/build/*.fw $(DESTDIR)
@@ -66,10 +80,10 @@ install: build-all
 clean:
 	@rm -rf hw/saleae-logic/build
 	@rm -rf hw/cwav-usbeeax/build
+	@rm -rf hw/cwav-usbeedx/build
 	@rm -rf hw/cwav-usbeesx/build
 	@rm -rf hw/cypress-fx2/build
 	@rm -rf hw/braintechnology-usb-lps/build
-	$(MAKE) -C fx2lib clean
-
-.PHONY: saleae-logic cwav-usbeeax cwav-usbeesx cypress-fx2 braintechnology-usb-lps
+	@$(MAKE) -C fx2lib clean
 
+.PHONY: saleae-logic cwav-usbeeax cwav-usbeedx cwav-usbeesx cypress-fx2 braintechnology-usb-lps