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

10
server/core/monitor.cc
View File

@ -37,13 +37,13 @@
#include <maxscale/secrets.h>
#include <maxscale/spinlock.h>
#include <maxscale/utils.h>
#include <maxscale/json_api.h>
#include <mysqld_error.h>
#include "maxscale/config.h"
#include "maxscale/externcmd.h"
#include "maxscale/monitor.h"
#include "maxscale/modules.h"
#include "maxscale/json_api.h"
#include "internal/config.h"
#include "internal/externcmd.h"
#include "internal/monitor.h"
#include "internal/modules.h"
/** Schema version, journals must have a matching version */
#define MMB_SCHEMA_VERSION 1