*More makefile fix.

--HG--
branch : trunk

src/shared/Config/Makefile.am

@@ -21,7 +21,7 @@
 ## Sub-directories to parse
 
 ## CPP flags for includes, defines, etc.
-AM_CPPFLAGS = $(MYSQL_INCLUDES) $(POSTGRE_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(srcdir)/../../../dep/include -I$(srcdir)/../../framework -I$(srcdir)/../../shared -I$(srcdir)/../../../dep/include/g3dlite
+AM_CPPFLAGS = $(TRINI_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(srcdir)/../../../dep/include -I$(srcdir)/../../framework -I$(srcdir)/../../shared -I$(srcdir)/../../../dep/include/g3dlite
 
 ## Build MaNGOS shared library and its parts as convenience library.
 #  All libraries will be convenience libraries. Might be changed to shared

src/shared/Database/Makefile.am

@@ -21,7 +21,7 @@
 ## Sub-directories to parse
 
 ## CPP flags for includes, defines, etc.
-AM_CPPFLAGS = $(MYSQL_INCLUDES) $(POSTGRE_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(srcdir)/../../../dep/include -I$(srcdir)/../../framework -I$(srcdir)/../../shared -I$(srcdir)/../../../dep/include/g3dlite
+AM_CPPFLAGS = $(TRINI_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(srcdir)/../../../dep/include -I$(srcdir)/../../framework -I$(srcdir)/../../shared -I$(srcdir)/../../../dep/include/g3dlite
 
 ## Build MaNGOS shared library and its parts as convenience library.
 #  All libraries will be convenience libraries. Might be changed to shared
@@ -43,6 +43,7 @@ libmangosdatabase_a_SOURCES = \
     DatabasePostgre.h \
     DatabaseSqlite.cpp \
     DatabaseSqlite.h \
+    DBCEnums.h \
     Field.cpp \
     Field.h \
     MySQLDelayThread.h \
@@ -56,6 +57,7 @@ libmangosdatabase_a_SOURCES = \
     QueryResultSqlite.h \
     SQLStorage.cpp \
     SQLStorage.h \
+    SQLStorageImpl.h \
     SqlDelayThread.cpp \
     SqlDelayThread.h \
     SqlOperations.cpp \

src/shared/vmap/Makefile.am

@@ -18,41 +18,41 @@
 
 ## Process this file with automake to produce Makefile.in
 
-noinst_LIBRARIES = libvmaps.a
+## Sub-directories to parse
 
-## Preprocessor flags
+## CPP flags for includes, defines, etc.
-libvmaps_a_CPPFLAGS = \
+AM_CPPFLAGS = $(TRINI_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(srcdir)/../../../dep/include -I$(srcdir)/../../framework -I$(srcdir)/../../shared -I$(srcdir)/../../../dep/include/g3dlite
-$(TRINI_INCLUDES) \
--I$(top_srcdir)/dep/include \
--I$(top_srcdir)/dep/include/g3dlite
-
-libvmaps_a_SOURCES = \
-$(srcdir)/AABSPTree.h \
-$(srcdir)/BaseModel.cpp \
-$(srcdir)/BaseModel.h \
-$(srcdir)/CoordModelMapping.cpp \
-$(srcdir)/CoordModelMapping.h \
-$(srcdir)/DebugCmdLogger.cpp \
-$(srcdir)/DebugCmdLogger.h \
-$(srcdir)/IVMapManager.h \
-$(srcdir)/ManagedModelContainer.cpp \
-$(srcdir)/ManagedModelContainer.h \
-$(srcdir)/ModelContainer.cpp \
-$(srcdir)/ModelContainer.h \
-$(srcdir)/NodeValueAccess.h \
-$(srcdir)/ShortBox.h \
-$(srcdir)/ShortVector.h \
-$(srcdir)/SubModel.cpp \
-$(srcdir)/SubModel.h \
-$(srcdir)/TileAssembler.cpp \
-$(srcdir)/TileAssembler.h \
-$(srcdir)/TreeNode.cpp \
-$(srcdir)/TreeNode.h \
-$(srcdir)/VMapDefinitions.h \
-$(srcdir)/VMapFactory.cpp \
-$(srcdir)/VMapFactory.h \
-$(srcdir)/VMapManager.cpp \
-$(srcdir)/VMapManager.h \
-$(srcdir)/VMapTools.h
 
+## Build MaNGOS shared library and its parts as convenience library.
+#  All libraries will be convenience libraries. Might be changed to shared
+#  later.
+noinst_LIBRARIES = libmangosvmaps.a
 
+libmangosvmaps_a_SOURCES = \
+    AABSPTree.h \
+    BaseModel.cpp \
+    BaseModel.h \
+    CoordModelMapping.cpp \
+    CoordModelMapping.h \
+    DebugCmdLogger.cpp \
+    DebugCmdLogger.h \
+    IVMapManager.h \
+    ManagedModelContainer.cpp \
+    ManagedModelContainer.h \
+    ModelContainer.cpp \
+    ModelContainer.h \
+    NodeValueAccess.h \
+    ShortBox.h \
+    ShortVector.h \
+    SubModel.cpp \
+    SubModel.h \
+    TileAssembler.cpp \
+    TileAssembler.h \
+    TreeNode.cpp \
+    TreeNode.h \
+    VMapDefinitions.h \
+    VMapFactory.cpp \
+    VMapFactory.h \
+    VMapManager.cpp \
+    VMapManager.h \
+    VMapTools.h