hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix in-source builds

Browse Source 
The internal header directory conflicted with in-source builds causing a
build failure. This is fixed by renaming the internal header directory to
something other than maxscale.

The renaming pointed out a few problems in a couple of source files that
appeared to include internal headers when the headers were in fact public
headers.

Fixed maxctrl in-source builds by making the copying of the sources
optional.
This commit is contained in:
Markus Mäkelä
2017-11-22 08:12:09 +02:00
parent 6054fa0957
commit 396b81f336
74 changed files with 135 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/filter/test/filtermodule.cc
View File

@ -12,8 +12,8 @@
*/
#include <maxscale/cppdefs.hh>
#include <maxscale/filtermodule.hh>
#include "../../../core/maxscale/modules.h"
#include "maxscale/filtermodule.hh"
#include "../../../core/internal/modules.h"
using std::auto_ptr;

4
server/modules/filter/test/module.cc
View File

@ -11,8 +11,8 @@
* Public License.
*/
#include <maxscale/module.hh>
#include "../../../core/maxscale/modules.h"
#include "maxscale/module.hh"
#include "../../../core/internal/modules.h"
namespace maxscale
{

2
server/modules/monitor/mysqlmon/mysql_mon.cc
View File

@ -32,7 +32,7 @@
#include <maxscale/mysql_utils.h>
#include <maxscale/utils.h>
// TODO: For monitorAddParameters
#include "../../../core/maxscale/monitor.h"
#include "../../../core/internal/monitor.h"
/** Column positions for SHOW SLAVE STATUS */
#define MYSQL55_STATUS_MASTER_LOG_POS 5

2
server/modules/protocol/MySQL/mariadb_client.cc
View File

@ -15,7 +15,7 @@
#include <maxscale/utils.h>
// TODO: Find a way to cleanly expose this
#include "../../../core/maxscale/worker.hh"
#include "../../../core/internal/worker.hh"
#ifdef EPOLLRDHUP
#define ERROR_EVENTS (EPOLLRDHUP | EPOLLHUP | EPOLLERR)

2
server/modules/routing/binlogrouter/test/testbinlog.c
View File

@ -49,7 +49,7 @@
#include <maxscale/version.h>
// This isn't really a clean way of testing
#include "../../../../core/maxscale/service.h"
#include "../../../../core/internal/service.h"
static void printVersion(const char *progname);
static void printUsage(const char *progname);

12
server/modules/routing/debugcli/debugcmd.c
View File

@ -56,12 +56,12 @@
#include <debugcli.h>
#include "../../../core/maxscale/config_runtime.h"
#include "../../../core/maxscale/maxscale.h"
#include "../../../core/maxscale/modules.h"
#include "../../../core/maxscale/monitor.h"
#include "../../../core/maxscale/poll.h"
#include "../../../core/maxscale/session.h"
#include "../../../core/internal/config_runtime.h"
#include "../../../core/internal/maxscale.h"
#include "../../../core/internal/modules.h"
#include "../../../core/internal/monitor.h"
#include "../../../core/internal/poll.h"
#include "../../../core/internal/session.h"
#define MAXARGS 12

8
server/modules/routing/maxinfo/maxinfo.c
View File

@ -52,10 +52,10 @@
#include <maxscale/users.h>
#include <maxscale/protocol/mysql.h>
#include "../../../core/maxscale/modules.h"
#include "../../../core/maxscale/monitor.h"
#include "../../../core/maxscale/session.h"
#include "../../../core/maxscale/poll.h"
#include "../../../core/internal/modules.h"
#include "../../../core/internal/monitor.h"
#include "../../../core/internal/session.h"
#include "../../../core/internal/poll.h"
extern char *create_hex_sha1_sha1_passwd(char *passwd);

10
server/modules/routing/maxinfo/maxinfo_exec.c
View File

@ -45,11 +45,11 @@
#include <maxscale/spinlock.h>
#include <maxscale/version.h>
#include "../../../core/maxscale/maxscale.h"
#include "../../../core/maxscale/modules.h"
#include "../../../core/maxscale/monitor.h"
#include "../../../core/maxscale/poll.h"
#include "../../../core/maxscale/session.h"
#include "../../../core/internal/maxscale.h"
#include "../../../core/internal/modules.h"
#include "../../../core/internal/monitor.h"
#include "../../../core/internal/poll.h"
#include "../../../core/internal/session.h"
static void exec_show(DCB *dcb, MAXINFO_TREE *tree);
static void exec_select(DCB *dcb, MAXINFO_TREE *tree);