Ugh! extra patches got here, reverting

diff --git a/Makefile b/Makefile
index 9f16a4fb7b97bf9048deda3b9e4c3bc8331346b6..c3f225688dd7cdce7e3989529155e425ee644deb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -72,9 +72,8 @@ else
        LDLIBS += -lrt
 endif
 
-GIT_REV_WHERE ?= HEAD
 YOSYS_VER := 0.6+$(shell test -e .git && { git log --author=clifford@clifford.at --oneline 5869d26da021.. | wc -l; })
-GIT_REV := $(shell cd $(YOSYS_SRC) && git rev-parse --short $(GIT_REV_WHERE) 2> /dev/null || echo UNKNOWN)
+GIT_REV := $(shell cd $(YOSYS_SRC) && git rev-parse --short HEAD 2> /dev/null || echo UNKNOWN)
 OBJS = kernel/version_$(GIT_REV).o
 
 # set 'ABCREV = default' to use abc/ as it is
@@ -411,7 +410,7 @@ else
 SEEDOPT=""
 endif
 
-test-all: $(TARGETS) $(EXTRA_TARGETS)
+test: $(TARGETS) $(EXTRA_TARGETS)
        +cd tests/simple && bash run-test.sh $(SEEDOPT)
        +cd tests/hana && bash run-test.sh $(SEEDOPT)
        +cd tests/asicworld && bash run-test.sh $(SEEDOPT)
@@ -558,6 +557,6 @@ echo-git-rev:
 -include kernel/*.d
 -include techlibs/*/*.d
 
-.PHONY: all top-all abc test-all install install-abc manual clean mrproper qtcreator
+.PHONY: all top-all abc test install install-abc manual clean mrproper qtcreator
 .PHONY: config-clean config-clang config-gcc config-gcc-4.8 config-gprof config-sudo