--- parser3/tests/Makefile	2005/12/16 11:58:42	1.3
+++ parser3/tests/Makefile	2016/08/03 20:20:43	1.7
@@ -5,7 +5,7 @@ else
 	PARSER_DIR=../src/targets/cgi
 	PARSER_EXECUTABLE=$(PARSER_DIR)/parser3
 endif
-PARSER_CONFIG=NONE
+PARSER_CONFIG=results/auto.p
 
 RUN_PARSER=./run_parser.sh
 DIFF=diff -b
@@ -13,27 +13,33 @@ RM=rm
 
 #
 
-OUTPUTS=$(patsubst %.html,outputs/%.processed,$(wildcard *.html))
-RESULTS=$(patsubst %.html,results/%.processed,$(wildcard *.html))
+COMMON=$(sort $(wildcard ???.html))
+OUTPUTS_COMMON=$(patsubst %.html,outputs/%.processed,$(COMMON))
+RESULTS_COMMON=$(patsubst %.html,results/%.processed,$(COMMON))
+
+CURL=$(sort $(wildcard *-curl.html))
+OUTPUTS_CURL=$(patsubst %.html,outputs/%.processed,$(CURL))
+RESULTS_CURL=$(patsubst %.html,results/%.processed,$(CURL))
+
+SQL=$(sort $(wildcard *-sql.html))
+OUTPUTS_SQL=$(patsubst %.html,outputs/%.processed,$(SQL))
+RESULTS_SQL=$(patsubst %.html,results/%.processed,$(SQL))
 
 outputs/%.processed: %.html
-# Makefile $(RUN_PARSER) $(PARSER_EXECUTABLE) $(PARSER_CONFIG)
-	$(RUN_PARSER) $(PARSER_EXECUTABLE) $< > $@
+	$(RUN_PARSER) $(PARSER_EXECUTABLE) $< $(PARSER_CONFIG) > $@
 
-.PHONY: FORCE all tests clean install install-exec install-data
+.PHONY: FORCE tests tests-curl tests-sql all clean
 
 results/%.processed: outputs/%.processed FORCE
-	-$(DIFF) $< $@
+	-$(DIFF) $@ $<
 
-tests: outputs compares
+tests: $(OUTPUTS_COMMON) $(RESULTS_COMMON)
 
-outputs: $(OUTPUTS)
+tests-curl: $(OUTPUTS_CURL) $(RESULTS_CURL)
 
-compares: $(RESULTS)
+tests-sql: $(OUTPUTS_SQL) $(RESULTS_SQL)
+
+all: tests tests-curl
 
 clean:
 	$(RM) -f outputs/*.processed
-
-install:
-install-exec:
-install-data: