From 34e2a2ad663ae69358f61335008e540ee9802761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Mon, 17 Oct 2011 20:18:36 +0200 Subject: [PATCH] Makefile: Disable rules by default --- Makefile | 4 ++-- tools/dmake.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 814e83551..b60730086 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ # This file is generated by tools/dmake, do not edit. -# To compile without rules, use 'make HAVE_RULES=no' +# To compile with rules, use 'make HAVE_RULES=yes' ifndef HAVE_RULES - HAVE_RULES=yes + HAVE_RULES=no endif ifndef CXXFLAGS diff --git a/tools/dmake.cpp b/tools/dmake.cpp index a076856b1..55e686df7 100644 --- a/tools/dmake.cpp +++ b/tools/dmake.cpp @@ -93,10 +93,10 @@ static void getCppFiles(std::vector &files, const std::string &path } -static void makeConditionalVariable(std::ostream &os, const std::string &variable, const std::string &value) +static void makeConditionalVariable(std::ostream &os, const std::string &variable, const std::string &defaultValue) { os << "ifndef " << variable << '\n' - << " " << variable << '=' << value << '\n' + << " " << variable << '=' << defaultValue << '\n' << "endif\n" << "\n"; } @@ -202,8 +202,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"; - makeConditionalVariable(fout, "HAVE_RULES", "yes"); + fout << "# To compile with rules, use 'make HAVE_RULES=yes'\n"; + makeConditionalVariable(fout, "HAVE_RULES", "no"); // Makefile settings.. if (release) {