Merge pull request #76 from timvideos/minor-fixes

mithro · mithro · commit 41e7cd53706f · 2015-09-28T00:45:07.000+10:00
Small fixes to the Makefile
diff --git a/Makefile b/Makefile
@@ -1,3 +1,8 @@
+
+ifneq "$(HDMI2USB_ENV)" "1"
+$(error "Please 'source scripts/setup-env.sh'")
+endif
+
 BOARD ?= atlys
 MSCDIR ?= build/misoc
 PROG ?= impact
@@ -26,8 +31,6 @@ else
 	FLTERM = $(MSCDIR)/tools/flterm
 endif
 
-include Makefile.$(TARGET)
-
 help:
 	@echo "Environment:"
 	@echo "  BOARD=atlys OR opsis  (current: $(BOARD))"
@@ -45,6 +48,8 @@ help:
 	@echo " make clean"
 	@echo " make all"
 
+include Makefile.$(TARGET)
+
 clean: clean-$(TARGET)
 	cd $(MSCDIR) && $(CMD) clean
 
diff --git a/scripts/setup-env.sh b/scripts/setup-env.sh
@@ -75,4 +75,4 @@ python3 -c "import fl" || (echo "libfpgalink broken"; return)
 
 alias python=python3
 
-HDMI2USB_ENV=1
+export HDMI2USB_ENV=1

Original file line number	Diff line number	Diff line change
`@@ -75,4 +75,4 @@ python3 -c "import fl" \|\| (echo "libfpgalink broken"; return)`
`75`	`75`
`76`	`76`	`alias python=python3`
`77`	`77`
`78`		`-HDMI2USB_ENV=1`
	`78`	`+export HDMI2USB_ENV=1`