--- parser3/tests/Makefile 2003/03/12 14:20:39 1.1.2.8 +++ parser3/tests/Makefile 2005/12/19 13:48:04 1.4 @@ -1,16 +1,14 @@ ifdef COMSPEC - PARSER_DIR=../src/targets/cgi/debug + PARSER_DIR=../src/targets/cgi/release PARSER_EXECUTABLE=$(PARSER_DIR)/parser3.exe - PARSER_CONFIG=$(PARSER_DIR)/auto.p else PARSER_DIR=../src/targets/cgi PARSER_EXECUTABLE=$(PARSER_DIR)/parser3 - PARSER_CONFIG=$(PARSER_DIR)/auto.p endif +PARSER_CONFIG=results/auto.p RUN_PARSER=./run_parser.sh -DIFF=diff -ECHO=echo +DIFF=diff -b RM=rm # @@ -18,8 +16,8 @@ RM=rm OUTPUTS=$(patsubst %.html,outputs/%.processed,$(wildcard *.html)) RESULTS=$(patsubst %.html,results/%.processed,$(wildcard *.html)) -outputs/%.processed: %.html Makefile $(RUN_PARSER) $(PARSER_EXECUTABLE) $(PARSER_CONFIG) - $(RUN_PARSER) $(PARSER_EXECUTABLE) $< > $@ +outputs/%.processed: %.html + $(RUN_PARSER) $(PARSER_EXECUTABLE) $< $(PARSER_CONFIG) > $@ .PHONY: FORCE all tests clean install install-exec install-data @@ -31,7 +29,6 @@ tests: outputs compares outputs: $(OUTPUTS) compares: $(RESULTS) - @$(ECHO) DONE clean: $(RM) -f outputs/*.processed