Build: Renamed HAVE_DEPENDENCIES to HAVE_RULES

This commit is contained in:
Daniel Marjamäki 2011-02-14 19:37:58 +01:00
parent cdd8d3f785
commit 805773663e
4 changed files with 7 additions and 7 deletions

View File

@ -1,7 +1,7 @@
# This file is generated by tools/dmake, do not edit.
ifndef CXXFLAGS
CXXFLAGS=-DHAVE_DEPENDENCIES -Wall -Wextra -Wshadow -pedantic -Wno-long-long -Wfloat-equal -Wcast-qual -Wsign-conversion -g
CXXFLAGS=-DHAVE_RULES -Wall -Wextra -Wshadow -pedantic -Wno-long-long -Wfloat-equal -Wcast-qual -Wsign-conversion -g
endif
ifndef CXX

View File

@ -28,7 +28,7 @@
#include "path.h"
#include "filelister.h"
#ifdef HAVE_DEPENDENCIES
#ifdef HAVE_RULES
// xml is used in rules
#include <tinyxml.h>
#endif
@ -505,7 +505,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
_settings->_showtime = SHOWTIME_NONE;
}
#ifdef HAVE_DEPENDENCIES
#ifdef HAVE_RULES
// Rule given at command line
else if (strncmp(argv[i], "--rule=", 7) == 0)
{

View File

@ -30,7 +30,7 @@
#include <ctime>
#include "timer.h"
#ifdef HAVE_DEPENDENCIES
#ifdef HAVE_RULES
#define PCRE_STATIC
#include <pcre.h>
#endif
@ -309,7 +309,7 @@ void CppCheck::checkFile(const std::string &code, const char FileName[])
(*it)->runSimplifiedChecks(&_tokenizer, &_settings, this);
}
#ifdef HAVE_DEPENDENCIES
#ifdef HAVE_RULES
// Are there extra rules?
if (!_settings.rules.empty())
{

View File

@ -225,7 +225,7 @@ int main(int argc, char **argv)
// Makefile settings..
if (release)
{
makeConditionalVariable(fout, "CXXFLAGS", "-O2 -DNDEBUG -DHAVE_DEPENDENCIES -Wall");
makeConditionalVariable(fout, "CXXFLAGS", "-O2 -DNDEBUG -DHAVE_RULES -Wall");
}
else
{
@ -235,7 +235,7 @@ int main(int argc, char **argv)
// The _GLIBCXX_DEBUG doesn't work in cygwin
makeConditionalVariable(fout, "CXXFLAGS",
"-DHAVE_DEPENDENCIES "
"-DHAVE_RULES "
"-Wall "
"-Wextra "
"-Wshadow "