From dad77becc53e2f2c3b0880ee4fddd97d69099f94 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Wed, 4 Jun 2008 11:41:46 +0000
Subject: Modulized the template/course/macro system.

---
 server/src/Makefile.am | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'server/src/Makefile.am')

diff --git a/server/src/Makefile.am b/server/src/Makefile.am
index c21b814..abf9da7 100644
--- a/server/src/Makefile.am
+++ b/server/src/Makefile.am
@@ -16,6 +16,7 @@ pracrod_SOURCES = \
 	journal_commit.cc \
 	log.cc \
 	luaquerymapper.cc \
+	macroparser.cc \
 	resumeparser.cc \
 	saxparser.cc \
 	server.cc \
@@ -35,6 +36,7 @@ EXTRA_DIST = \
 	journal_commit.h \
 	log.h \
 	luaquerymapper.h \
+	macroparser.h \
 	resumeparser.h \
 	saxparser.h \
 	server.h \
@@ -49,7 +51,8 @@ TESTFILES = \
 	test_luaquerymapper \
 	test_templateparser \
 	test_server \
-	test_database
+	test_database \
+	test_macroparser
 
 TESTLOGS = `for F in ${TESTFILES}; do echo $$F.log; done`
 
@@ -69,7 +72,10 @@ test_luaquerymapper: luaquerymapper.cc
 	@../../tools/test luaquerymapper.cc queryparser.cc queryhandler.cc tcpsocket.cc exception.cc uid.cc log.cc saxparser.cc -lexpat $(LUA_LIBS)
 
 test_templateparser: templateparser.cc
-	@../../tools/test templateparser.cc saxparser.cc -lexpat -DXML="\"../xml\""
+	@../../tools/test templateparser.cc saxparser.cc exception.cc log.cc -lexpat -DXML="\"../xml\""
+
+test_macroparser: macroparser.cc
+	@../../tools/test macroparser.cc saxparser.cc exception.cc log.cc -lexpat -DXML="\"../xml\""
 
 test_server: server.cc
 	@../../tools/test server.cc templateparser.cc saxparser.cc queryparser.cc queryhandler.cc luaquerymapper.cc tcpsocket.cc exception.cc log.cc configuration.cc transactionparser.cc widgetgenerator.cc -lexpat $(LUA_LIBS) $(CONFIG_LIBS) -DXML="\"../xml\""
-- 
cgit v1.2.3