--- parser3/tests/Makefile	2003/03/03 13:33:00	1.1.2.2
+++ parser3/tests/Makefile	2015/05/27 13:24:35	1.5
@@ -1,34 +1,38 @@
 ifdef COMSPEC
-	PARSER=./parser-cygwin.sh
+	PARSER_DIR=../src/targets/cgi/release
+	PARSER_EXECUTABLE=$(PARSER_DIR)/parser3.exe
 else
-	PARSER=./parser-unix.sh
+	PARSER_DIR=../src/targets/cgi
+	PARSER_EXECUTABLE=$(PARSER_DIR)/parser3
 endif
+PARSER_CONFIG=results/auto.p
 
-DIFF=diff
-ECHO=echo
+RUN_PARSER=./run_parser.sh
+DIFF=diff -b
 RM=rm
 
 #
 
-OUTPUTS=$(patsubst %.html,outputs/%.processed,$(wildcard *.html))
-RESULTS=$(patsubst %.html,results/%.processed,$(wildcard *.html))
+OUTPUTS=$(patsubst %.html,outputs/%.processed,$(sort $(wildcard *.html)))
+RESULTS=$(patsubst %.html,results/%.processed,$(sort $(wildcard *.html)))
 
-outputs/%.processed: %.html Makefile $(PARSER)
-	$(PARSER) $< > $@
+outputs/%.processed: %.html
+	$(RUN_PARSER) $(PARSER_EXECUTABLE) $< $(PARSER_CONFIG) > $@
 
-.PHONY: FORCE all clean
+.PHONY: FORCE all tests clean install install-exec install-data
 
 results/%.processed: outputs/%.processed FORCE
-	@$(DIFF) $< $@
-
-all: tests
+	-$(DIFF) $< $@
 
 tests: outputs compares
 
 outputs: $(OUTPUTS)
 
 compares: $(RESULTS)
-	@$(ECHO) All tests passed OK
 
 clean:
 	$(RM) -f outputs/*.processed
+
+install:
+install-exec:
+install-data: