Makefile cleanup

Makefile

@@ -16,7 +16,7 @@ CIVAS := $(BIN_DIR)/civas
 CIVVM := $(BIN_DIR)/civvm
 
 DIST_TGT := civicaml.tar.gz
-DIST_FILES := $(RESULT) $(SOURCES) Makefile OCamlMakefile README.md test bin \
+DIST_FILES := $(BIN_DIR) $(SOURCES) Makefile OCamlMakefile README.md test \
 	.gitignore
 
 TESTSUITE_TGT := testsuite.tar.gz
@@ -28,12 +28,10 @@ TOOLCHAIN_TGT := toolchain.tar.gz
 OCAMLYACC := menhir
 YFLAGS := --infer --explain
 
-.PHONY: all check dist testsuite myclean cleaner
+.PHONY: all check dist testsuite myclean cleaner toolchain
 
 all: native-code
 
-clean:: myclean
-
 # The Types module needs an implementation file to stop ocamlc from complaining
 types.ml: types.mli
 	cp $< $@
@@ -57,6 +55,8 @@ testsuite: $(TESTSUITE_TGT)
 $(TESTSUITE_TGT): TESTSUITE_README test
 	tar -czf $@ $^
 
+clean:: myclean
+
 myclean:
 	rm -f a.out $(DIST_TGT) $(TESTSUITE_TGT) $(TOOLCHAIN_TGT)
 
@@ -65,7 +65,7 @@ cleaner: clean
 
 toolchain: $(TOOLCHAIN_TGT)
 
-$(TOOLCHAIN_TGT): $(RESULT) $(CIVAS) $(CIVVM)
+$(TOOLCHAIN_TGT): all
 	tar -czf $@ $(BIN_DIR)
 
 include OCamlMakefile