From 61f5f4fbdf3f7b05715badad035f391718d282aa Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Fri, 24 Jul 2009 07:45:17 +0000
Subject: Fixed compiler issues...

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

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

diff --git a/server/src/Makefile.am b/server/src/Makefile.am
index 99863f0..cdc4bfe 100644
--- a/server/src/Makefile.am
+++ b/server/src/Makefile.am
@@ -32,7 +32,7 @@ pracrod_SOURCES = \
 	transactionparser.cc \
 	tcpsocket.cc \
 	utf8.cc \
-	version.cc \
+	versionstr.cc \
 	widgetgenerator.cc \
 	xml_encode_decode.cc
 
@@ -59,7 +59,7 @@ macrotool_SOURCES = \
 	pracrodaopgsql.cc \
 	saxparser.cc \
 	templateparser.cc \
-	version.cc
+	versionstr.cc
 
 EXTRA_DIST = \
 	configuration.h \
@@ -93,12 +93,12 @@ EXTRA_DIST = \
 	transactionparser.h \
 	tcpsocket.h \
 	utf8.h \
-	version.h \
+	versionstr.h \
 	widgetgenerator.h \
 	xml_encode_decode.h
 
 TESTFILES = \
-	test_version \
+	test_versionstr \
 	test_macrolist \
 	test_queryhandlerpentominos \
 	test_queryhandlerpracro \
@@ -124,11 +124,11 @@ test: $(TESTFILES)
 test_clean:
 	rm -f $(TESTFILES)
 
-test_version: version.cc
-	@../../tools/test version.cc
+test_versionstr: versionstr.cc
+	@../../tools/test versionstr.cc
 
 test_macrolist: macrolist.cc
-	@../../tools/test macrolist.cc version.cc macroheaderparser.cc $(PARSERBASICS) $(BASICS)
+	@../../tools/test macrolist.cc versionstr.cc macroheaderparser.cc $(PARSERBASICS) $(BASICS)
 
 test_queryhandlerpentominos: queryhandlerpentominos.cc
 	@../../tools/test queryhandlerpentominos.cc tcpsocket.cc queryparser.cc $(PARSERBASICS) $(BASICS)
@@ -149,7 +149,7 @@ test_macroparser: macroparser.cc
 	@../../tools/test macroparser.cc $(PARSERBASICS) $(BASICS)
 
 test_server: server.cc
-	@../../tools/test server.cc templateparser.cc queryparser.cc queryhandlerpentominos.cc journal_commit.cc macrolist.cc queryhandlerpracro.cc macroheaderparser.cc version.cc resumeparser.cc luaquerymapper.cc tcpsocket.cc $(BASICS) transactionparser.cc widgetgenerator.cc database.cc pracrodao.cc pracrodaopgsql.cc luaresume.cc macroparser.cc xml_encode_decode.cc $(PARSERBASICS) $(LUA_LIBS) $(CONFIG_LIBS) $(PQXX_LIBS) $(PQXX_CXXFLAGS)
+	@../../tools/test server.cc templateparser.cc queryparser.cc queryhandlerpentominos.cc journal_commit.cc macrolist.cc queryhandlerpracro.cc macroheaderparser.cc versionstr.cc resumeparser.cc luaquerymapper.cc tcpsocket.cc $(BASICS) transactionparser.cc widgetgenerator.cc database.cc pracrodao.cc pracrodaopgsql.cc luaresume.cc macroparser.cc xml_encode_decode.cc $(PARSERBASICS) $(LUA_LIBS) $(CONFIG_LIBS) $(PQXX_LIBS) $(PQXX_CXXFLAGS)
 	@sleep 1s; killall -9 test_server
 
 test_pracrodaopgsql: pracrodaopgsql.cc
-- 
cgit v1.2.3