Updated configure so that only one database backend can be selected and simplified Makefile.am.

1 files changed, 36 insertions, 69 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 33e18365..3c39871d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,79 +1,46 @@
+# $Id$
+
+
 bin_PROGRAMS = tmwserv
+
 tmwserv_SOURCES = main.cpp \
-		  accounthandler.h \
-		  accounthandler.cpp \
-		  connectionhandler.h \
-		  connectionhandler.cpp \
-		  debug.h \
-		  debug.cpp \
-		  defines.h \
-		  messagehandler.h \
-		  messagehandler.cpp \
-		  messagein.h \
-		  messagein.cpp \
-		  messageout.h \
-		  messageout.cpp \
-		  netcomputer.h \
-		  netcomputer.cpp \
-		  netsession.h \
-		  netsession.cpp \
-		  packet.h \
-		  packet.cpp \
-		  skill.h \
-		  skill.cpp \
-		  script.h \
-		  script.cpp \
-		  script-squirrel.h \
-		  script-squirrel.cpp \
-		  storage.cpp storage.h \
-		  account.h \
-		  account.cpp \
-		  object.h \
-		  object.cpp \
-		  dal/dataprovider.h \
-		  dal/dataprovider.cpp \
-		  dal/dataproviderfactory.h \
-		  dal/dataproviderfactory.cpp \
-		  dal/recordset.h \
-		  dal/recordset.cpp \
-		  dal/dalexcept.h \
-		  dalstorage.h \
-		  dalstoragesql.h \
-		  dalstorage.cpp \
-		  utils/singleton.h \
-		  utils/cipher.h \
-		  utils/cipher.cpp \
-		  utils/logger.h \
-		  utils/logger.cpp
+				  accounthandler.cpp \
+				  connectionhandler.cpp \
+				  debug.cpp \
+				  defines.h \
+				  messagehandler.cpp \
+				  messagein.cpp \
+				  messageout.cpp \
+				  netcomputer.cpp \
+				  netsession.cpp \
+				  packet.cpp \
+				  skill.cpp \
+				  storage.cpp \
+				  account.cpp \
+				  object.cpp \
+				  dalstorage.cpp \
+				  dal/dataprovider.cpp \
+				  dal/dataproviderfactory.cpp \
+				  dal/recordset.cpp \
+				  utils/cipher.cpp \
+				  utils/logger.cpp
 
-if BUILD_SQLITE
-tmwserv_SOURCES += dal/sqlitedataprovider.h \
-		   dal/sqlitedataprovider.cpp
+if BUILD_MYSQL
+tmwserv_SOURCES += dal/mysqldataprovider.cpp
 endif
 
-if BUILD_POSTGRE
-tmwserv_SOURCES += dal/pqdataprovider.h \
-		   dal/pqdataprovider.cpp
+if BUILD_POSTGRESQL
+tmwserv_SOURCES += dal/pqdataprovider.cpp
 endif
 
-if BUILD_MYSQL
-tmwserv_SOURCES += dal/mysqldataprovider.h \
-		   dal/mysqldataprovider.cpp
+if BUILD_SQLITE
+tmwserv_SOURCES += dal/sqlitedataprovider.cpp
 endif
 
-# set the include path found by configure
-INCLUDES= $(all_includes) 
-LIBS = $(SQLITE_LIBS) $(MYSQL_LIBS) $(POSTGRE_LIBS)
-
-# the library search path.
-tmwserv_LDFLAGS = $(all_libraries) \
-				  -lSDL_net `sdl-config --libs` \
-				  `pkg-config --libs libxml-2.0` \
-				  -lphysfs \
-				  -lcrypto
-tmwserv_CXXFLAGS = -g -Wall `sdl-config --cflags` `pkg-config --cflags libxml-2.0` -fno-inline $(SCRIPT_CFLAGS) $(POSTGRE_CFLAGS) $(SQLITE_CFLAGS)
-
-#tmwserv_LDADD = $(LIBSDL_LIBS) -lphysfs
-tmwserv_LDADD = $(SCRIPT_LIBS)
-tmwserv_TARGET = ../tmwserv
+if BUILD_SQUIRREL
+tmwserv_SOURCES += script.cpp \
+				   script-squirrel.cpp
+endif
 
+tmwserv_CXXFLAGS = -Wall -fno-inline
+tmwserv_TARGET = tmwserv