Fixed #3017 (set HAVE_RULES to yes only if HAVE_RULES is undefined when executing make.)

This commit is contained in:
Edoardo Prezioso 2011-08-19 00:28:31 +02:00 committed by Daniel Marjamäki
parent a7728fef48
commit f62d1d0122
2 changed files with 5 additions and 3 deletions

View File

@ -1,7 +1,9 @@
# This file is generated by tools/dmake, do not edit.
# To compile without rules, use 'make HAVE_RULES=no'
HAVE_RULES = yes
ifndef HAVE_RULES
HAVE_RULES=yes
endif
ifndef CXXFLAGS
CXXFLAGS=-Wall -Wextra -Wshadow -pedantic -Wno-long-long -Wfloat-equal -Wcast-qual -D_GLIBCXX_DEBUG -g

View File

@ -218,8 +218,8 @@ int main(int argc, char **argv)
}
fout << "# This file is generated by tools/dmake, do not edit.\n\n";
fout << "# To compile without rules, use 'make HAVE_RULES=no'\n"
<< "HAVE_RULES = yes\n\n";
fout << "# To compile without rules, use 'make HAVE_RULES=no'\n";
makeConditionalVariable(fout, "HAVE_RULES", "yes");
// Makefile settings..
if (release)