From 8ebc3f17961ef6a0cf708cc6bdca948d77817ee0 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Mon, 21 Dec 2009 18:59:32 +0000 Subject: Wow, it's much more general now, I like that. --- default.bld | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'default.bld') diff --git a/default.bld b/default.bld index de31b78..19b66bf 100644 --- a/default.bld +++ b/default.bld @@ -5,6 +5,8 @@ CXXFLAGS += "-ggdb -W -Wall"; +CC = CXX; // We actually want to use c++ to compile our c files. + action "default" { build: "build"; @@ -49,6 +51,7 @@ target "build" rule "exe"; LDFLAGS += "-Llibbu++ -lbu++ -ldl"; CXXFLAGS += "-Ilibbu++"; + CFLAGS = CXXFLAGS; tag "tools"; } @@ -74,19 +77,6 @@ target "build-r$(svnversion "-n").tar.bz2" tag "pkg"; } -// We want to override the c rule, and just use c++ for it -rule "c" -{ - input "*.c"; - output replace(".c", ".o"); - tag "auto-source"; - requires getMakeDeps("g++ ${CXXFLAGS} -M ${INPUT}"); - profile "build" - { - execute("g++ ${CXXFLAGS} -c -o ${OUTPUT} ${INPUT}"); - } -} - rule "tarball" { input matches("*.cpp", "*.h", "*.c", "*.y", "*.l", "*.conf", "Doxyfile", -- cgit v1.2.3