Use libartefact for pentominos data retrieval.

1 files changed, 5 insertions, 16 deletions

diff --git a/server/src/Makefile.am b/server/src/Makefile.am
index 9af183f..f269db8 100644
--- a/server/src/Makefile.am
+++ b/server/src/Makefile.am
@@ -1,9 +1,11 @@
 
 bin_PROGRAMS = pracrod macrotool
 
-pracrod_LDADD = $(LD_EFENCE) $(PQXX_LIBS) $(CONFIG_LIBS) $(LUA_LIBS) $(HTTPD_LIBS) -lpthread
+pracrod_LDADD = $(LD_EFENCE) $(PQXX_LIBS) $(CONFIG_LIBS) \
+	$(LUA_LIBS) $(HTTPD_LIBS) -lpthread $(ATF_LIBS)
 
-pracrod_CXXFLAGS = $(PQXX_CXXFLAGS) $(CONFIG_CXXFLAGS) $(LUA_CXXFLAGS) $(HTTPD_CFLAGS)
+pracrod_CXXFLAGS = $(PQXX_CXXFLAGS) $(CONFIG_CXXFLAGS) \
+	$(LUA_CXXFLAGS) $(HTTPD_CFLAGS) $(ATF_CFLAGS)
 
 pracrod_SOURCES = \
 	pracrod.cc \
@@ -15,7 +17,6 @@ pracrod_SOURCES = \
 	exception.cc \
 	queryhandlerpentominos.cc \
 	queryhandlerpracro.cc \
-	queryparser.cc \
 	journal_commit.cc \
 	log.cc \
 	luaquerymapper.cc \
@@ -78,7 +79,6 @@ EXTRA_DIST = \
 	queryhandler.h \
 	queryhandlerpentominos.h \
 	queryhandlerpracro.h \
-	queryparser.h \
 	journal_commit.h \
 	log.h \
 	luaquerymapper.h \
@@ -126,7 +126,6 @@ TESTFILES = \
 	test_macrolist \
 	test_queryhandlerpentominos \
 	test_queryhandlerpracro \
-	test_queryparser \
 	test_luaquerymapper \
 	test_templateparser \
 	test_server \
@@ -242,29 +241,20 @@ test_versionstr: $(TEST_VERSIONSTR_FILES)
 TEST_QUERYHANDLERPENTOMINOS_FILES = \
 	queryhandlerpentominos.cc \
 	tcpsocket.cc \
-	queryparser.cc \
 	$(PARSERFILES) \
 	$(BASICFILES)
 test_queryhandlerpentominos: $(TEST_QUERYHANDLERPENTOMINOS_FILES)
-	@../../tools/test $(TEST_QUERYHANDLERPENTOMINOS_FILES) $(PARSERFLAGS) $(BASICFLAGS)
+	@../../tools/test $(TEST_QUERYHANDLERPENTOMINOS_FILES) $(PARSERFLAGS) $(BASICFLAGS) $(ATF_CFLAGS) $(ATF_LIBS)
 
 TEST_QUERYHANDLERPRACRO_FILES = \
 	queryhandlerpracro.cc \
 	tcpsocket.cc \
-	queryparser.cc \
 	$(DBFILES) \
 	$(PARSERFILES) \
 	$(BASICFILES)
 test_queryhandlerpracro: $(TEST_QUERYHANDLERPRACRO_FILES)
 	@../../tools/test $(TEST_QUERYHANDLERPRACRO_FILES) $(DBFLAGS) $(PARSERFLAGS) $(BASICFLAGS)
 
-TEST_QUERYPARSER_FILES = \
-	queryparser.cc \
-	$(BASICFILES) \
-	$(PARSERFILES)
-test_queryparser: $(TEST_QUERYPARSER_FILES)
-	@../../tools/test $(TEST_QUERYPARSER_FILES) $(BASICFLAGS) $(PARSERFLAGS)
-
 TEST_LUAQUERMAPPER_FILES = \
 	luaquerymapper.cc \
 	$(BASICFILES)
@@ -290,7 +280,6 @@ TEST_SERVER_FILES = \
 	templateparser.cc \
 	templatelist.cc \
 	templateheaderparser.cc \
-	queryparser.cc \
 	queryhandlerpentominos.cc \
 	journal_commit.cc \
 	macrolist.cc \