Fixed #3017 (set HAVE_RULES to yes only if HAVE_RULES is undefined when executing make.)
This commit is contained in:
parent
a7728fef48
commit
f62d1d0122
4
Makefile
4
Makefile
|
@ -1,7 +1,9 @@
|
||||||
# This file is generated by tools/dmake, do not edit.
|
# This file is generated by tools/dmake, do not edit.
|
||||||
|
|
||||||
# To compile without rules, use 'make HAVE_RULES=no'
|
# To compile without rules, use 'make HAVE_RULES=no'
|
||||||
HAVE_RULES = yes
|
ifndef HAVE_RULES
|
||||||
|
HAVE_RULES=yes
|
||||||
|
endif
|
||||||
|
|
||||||
ifndef CXXFLAGS
|
ifndef CXXFLAGS
|
||||||
CXXFLAGS=-Wall -Wextra -Wshadow -pedantic -Wno-long-long -Wfloat-equal -Wcast-qual -D_GLIBCXX_DEBUG -g
|
CXXFLAGS=-Wall -Wextra -Wshadow -pedantic -Wno-long-long -Wfloat-equal -Wcast-qual -D_GLIBCXX_DEBUG -g
|
||||||
|
|
|
@ -218,8 +218,8 @@ int main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
|
|
||||||
fout << "# This file is generated by tools/dmake, do not edit.\n\n";
|
fout << "# This file is generated by tools/dmake, do not edit.\n\n";
|
||||||
fout << "# To compile without rules, use 'make HAVE_RULES=no'\n"
|
fout << "# To compile without rules, use 'make HAVE_RULES=no'\n";
|
||||||
<< "HAVE_RULES = yes\n\n";
|
makeConditionalVariable(fout, "HAVE_RULES", "yes");
|
||||||
|
|
||||||
// Makefile settings..
|
// Makefile settings..
|
||||||
if (release)
|
if (release)
|
||||||
|
|
Loading…
Reference in New Issue