From 9eab9badfd17e5e74e9411c1437e8f69aec810f9 Mon Sep 17 00:00:00 2001 From: theluda Date: Wed, 28 Feb 2007 23:40:03 +0000 Subject: [PATCH] [3278] Yay! Rewrite, part I is done. Dependencies, and framework, and shared library do survive a make distcheck for the first time ever in MaNGOS history. * configure.ac: Check for Base.cpp from shared library. * dep/src/zlib/Makefile.am: Fixed included sources and headers. * dep/src/zthread/Makefile.am: Fixed included sources and headers. * src/shared/Makefile.am: Fixed included sources and headers. --- configure.ac | 2 +- dep/src/zlib/Makefile.am | 14 ++++- dep/src/zthread/Makefile.am | 62 +++++++++++++++++++++- src/shared/Makefile.am | 125 +++++++++----------------------------------- 4 files changed, 100 insertions(+), 103 deletions(-) diff --git a/configure.ac b/configure.ac index 2df7c276..f00ecbb2 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ # VERSION: 0.7.01 (trunk) # BUG-REPORT-ADDRESS: mangos-devs@lists.sourceforge.net AC_INIT( [mangos], [0.7.01], [mangos-devs@lists.sourceforge.net]) -AC_CONFIG_SRCDIR([src/mangosd/Main.cpp]) +AC_CONFIG_SRCDIR([src/shared/Base.cpp]) ## Prelude, basic settings for Automake # Turn on all warnings and error messages, and enforce GNU diff --git a/dep/src/zlib/Makefile.am b/dep/src/zlib/Makefile.am index 73473de4..2f7bf237 100644 --- a/dep/src/zlib/Makefile.am +++ b/dep/src/zlib/Makefile.am @@ -20,7 +20,7 @@ ## Process this file with automake to produce Makefile.in ## CPP flags for includes, defines, etc. -AM_CPPFLAGS = -I$(srcdir)/../../include -I$(srcdir)/../../include/zlib +AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/../../include -I$(srcdir)/../../include/zlib ## Build zlib as convenience library. # libzlib conveniece library will later be reused by ... @@ -42,3 +42,15 @@ libzlib_a_SOURCES = \ ## Additional files to include when running 'make dist' # Nothing yet. +EXTRA_DIST = \ + crc32.h \ + deflate.h \ + inffast.h \ + inffixed.h \ + inflate.h \ + inftrees.h \ + trees.h \ + zconf.h \ + zlib.h \ + zutil.h + diff --git a/dep/src/zthread/Makefile.am b/dep/src/zthread/Makefile.am index 2c2a18e7..a3c91195 100644 --- a/dep/src/zthread/Makefile.am +++ b/dep/src/zthread/Makefile.am @@ -69,4 +69,64 @@ LTZTHREAD_AGE = 2 libZThread_la_LDFLAGS = -version-info $(LTZTHREAD_CURRENT):$(LTZTHREAD_REVISION):$(LTZTHREAD_AGE) ## Additional files to include when running 'make dist' -# Nothing yet. +# Header files. +EXTRA_DIST = \ + ConditionImpl.h \ + Debug.h \ + DeferredInterruptionScope.h \ + FastLock.h \ + FastRecursiveLock.h \ + IntrusivePtr.h \ + Monitor.h \ + MutexImpl.h \ + RecursiveMutexImpl.h \ + Scheduling.h \ + SemaphoreImpl.h \ + State.h \ + Status.h \ + TSS.h \ + ThreadImpl.h \ + ThreadOps.h \ + ThreadQueue.h \ + TimeStrategy.h \ + config.h + +# Implementation specific files. +EXTRA_DIST += \ + linux/AtomicCount.cxx \ + linux/AtomicFastLock.h \ + linux/FastRecursiveLock.h \ + macos/FastLock.h \ + macos/Monitor.cxx \ + macos/Monitor.h \ + macos/TSS.h \ + macos/ThreadOps.cxx \ + macos/ThreadOps.h \ + macos/UpTimeStrategy.h \ + posix/ConditionRecursiveLock.h \ + posix/FastLock.h \ + posix/FtimeStrategy.h \ + posix/GetTimeOfDayStrategy.h \ + posix/Monitor.cxx \ + posix/Monitor.h \ + posix/PriorityOps.h \ + posix/TSS.h \ + posix/ThreadOps.cxx \ + posix/ThreadOps.h \ + solaris/FastRecursiveLock.h \ + vanilla/DualMutexRecursiveLock.h \ + vanilla/SimpleAtomicCount.cxx \ + vanilla/SimpleRecursiveLock.h \ + win32/AtomicCount.cxx \ + win32/AtomicFastLock.h \ + win32/AtomicFastRecursiveLock.h \ + win32/FastLock.h \ + win32/FastRecursiveLock.h \ + win32/Monitor.cxx \ + win32/Monitor.h \ + win32/PerformanceCounterStrategy.h \ + win32/TSS.h \ + win32/ThreadOps.cxx \ + win32/ThreadOps.h \ + win9x/AtomicCount.cxx \ + win9x/AtomicFastLock.h diff --git a/src/shared/Makefile.am b/src/shared/Makefile.am index 892779db..ad68bb62 100644 --- a/src/shared/Makefile.am +++ b/src/shared/Makefile.am @@ -19,8 +19,8 @@ ## Sub-directories to parse ## CPP flags for includes, defines, etc. -AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/../../dep/include -I$(srcdir)/../framework $(MYSQL_INCLUDES) -##AM_CPPFLAGS += -I$(srcdir)/../game -I$(srcdir)/../realmd +AM_CPPFLAGS = $(MYSQL_INCLUDES) -I$(srcdir) -I$(srcdir)/../../dep/include -I$(srcdir)/../framework +## AM_CPPFLAGS += -I$(srcdir)/../game -I$(srcdir)/../realmd ## Build MaNGOS shared library and its parts as convenience library. # All libraries will be convenience libraries. Might be changed to shared @@ -44,7 +44,6 @@ libmangosshared_a_SOURCES = \ Mthread.h \ ProgressBar.cpp \ ProgressBar.h \ - Singleton.h \ Timer.h \ Util.cpp \ Util.h \ @@ -56,34 +55,31 @@ libmangosauth_a_SOURCES = \ Auth/BigNumber.cpp \ Auth/BigNumber.h \ Auth/Sha1.cpp \ - Auth/Sha1.h + Auth/Sha1.h \ + Auth/md5.c \ + Auth/md5.h libmangosconfig_a_SOURCES = \ - Config/Config.cpp \ - Config/ConfigEnv.h \ - Config/Config.h \ - Config/dotconfpp \ Config/dotconfpp/dotconfpp.cpp \ Config/dotconfpp/dotconfpp.h \ Config/dotconfpp/mempool.cpp \ - Config/dotconfpp/mempool.h + Config/dotconfpp/mempool.h \ + Config/Config.cpp \ + Config/Config.h \ + Config/ConfigEnv.h libmangosdatabase_a_SOURCES = \ + Database/DBCStores.cpp \ + Database/DBCStores.h \ + Database/DBCStructure.h \ + Database/DBCfmt.cpp \ Database/Database.cpp \ - Database/DatabaseEnv.h \ Database/Database.h \ + Database/DatabaseEnv.h \ Database/DatabaseMysql.cpp \ Database/DatabaseMysql.h \ Database/DatabaseSqlite.cpp \ Database/DatabaseSqlite.h \ - Database/DataStore.h \ - Database/dbcfile.cpp \ - Database/dbcfile.h \ - Database/DBCStores.cpp \ - Database/DBCStores.cpp \ - Database/DBCStores.h \ - Database/DBCStores.h \ - Database/DBCStructure.h \ Database/Field.cpp \ Database/Field.h \ Database/QueryResult.h \ @@ -92,7 +88,9 @@ libmangosdatabase_a_SOURCES = \ Database/QueryResultSqlite.cpp \ Database/QueryResultSqlite.h \ Database/SQLStorage.cpp \ - Database/SQLStorage.h + Database/SQLStorage.h \ + Database/dbcfile.cpp \ + Database/dbcfile.h libmangosnetwork_a_SOURCES = \ Network/Base64.cpp \ @@ -112,8 +110,6 @@ libmangosnetwork_a_SOURCES = \ Network/Socket.h \ Network/SocketHandler.cpp \ Network/SocketHandler.h \ - Network/socket_include.cpp \ - Network/socket_include.h \ Network/SocketThread.cpp \ Network/SocketThread.h \ Network/StdLog.h \ @@ -126,87 +122,16 @@ libmangosnetwork_a_SOURCES = \ Network/UdpSocket.cpp \ Network/UdpSocket.h \ Network/Utility.cpp \ - Network/Utility.h + Network/Utility.h \ + Network/socket_include.cpp \ + Network/socket_include.h ## Additional files to include when running 'make dist' -# Auth sources and headers. +# Disabled packet logger EXTRA_DIST = \ - Auth/AuthCrypt.cpp \ - Auth/AuthCrypt.h \ - Auth/BigNumber.cpp \ - Auth/BigNumber.h \ - Auth/Sha1.cpp \ - Auth/Sha1.h + PacketLog.cpp \ + PacketLog.h -# Configuration sources and headers. +# VC++ project workspace for dotconfpp EXTRA_DIST += \ - Config/Config.cpp \ - Config/ConfigEnv.h \ - Config/Config.h \ - Config/dotconfpp \ - Config/dotconfpp/dotconfpp.cpp \ - Config/dotconfpp/dotconfpp.h \ - Config/dotconfpp/mempool.cpp \ - Config/dotconfpp/mempool.h - -# Database sources and headers. -EXTRA_DIST += \ - Database/Database.cpp \ - Database/DatabaseEnv.h \ - Database/Database.h \ - Database/DatabaseMysql.cpp \ - Database/DatabaseMysql.h \ - Database/DatabaseSqlite.cpp \ - Database/DatabaseSqlite.h \ - Database/DataStore.h \ - Database/dbcfile.cpp \ - Database/dbcfile.h \ - Database/DBCStores.cpp \ - Database/DBCStores.cpp \ - Database/DBCStores.h \ - Database/DBCStores.h \ - Database/DBCStructure.h \ - Database/Field.cpp \ - Database/Field.h \ - Database/QueryResult.h \ - Database/QueryResultMysql.cpp \ - Database/QueryResultMysql.h \ - Database/QueryResultSqlite.cpp \ - Database/QueryResultSqlite.h \ - Database/SQLStorage.cpp \ - Database/SQLStorage.h - -# Network sources and headers. -EXTRA_DIST += \ - Network/Base64.cpp \ - Network/Base64.h \ - Network/CircularBuffer.cpp \ - Network/CircularBuffer.h \ - Network/ListenSocket.h \ - Network/Parse.cpp \ - Network/Parse.h \ - Network/PoolSocket.cpp \ - Network/PoolSocket.h \ - Network/ResolvServer.cpp \ - Network/ResolvServer.h \ - Network/ResolvSocket.cpp \ - Network/ResolvSocket.h \ - Network/Socket.cpp \ - Network/Socket.h \ - Network/SocketHandler.cpp \ - Network/SocketHandler.h \ - Network/socket_include.cpp \ - Network/socket_include.h \ - Network/SocketThread.cpp \ - Network/SocketThread.h \ - Network/StdLog.h \ - Network/StdoutLog.cpp \ - Network/StdoutLog.h \ - Network/TcpSocket.cpp \ - Network/TcpSocket.h \ - Network/Thread.cpp \ - Network/Thread.h \ - Network/UdpSocket.cpp \ - Network/UdpSocket.h \ - Network/Utility.cpp \ - Network/Utility.h + Config/ConfigLibrary.vcproj -- 2.11.4.GIT