From c0a0deec86c79d276bc4443fd0f6aef7b6b12f9f Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Thu, 13 Dec 2012 11:20:20 +0100
Subject: Add clean target. Fix broken c++ compilation, add c++ compilation
 test to Makefile

---
 Makefile | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 776ea60..c397c53 100644
--- a/Makefile
+++ b/Makefile
@@ -2,19 +2,28 @@ include Makefile.files
 
 CFLAGS=-Werror -Wall -D_FORTIFY_SOURCE=2 -g -O2
 
-all: complete simple syslog filter mutex
+all: complete complete-cpp simple syslog filter mutex minimal
 
 complete:
-	g++ ${CFLAGS} ${DEBUG_SOURCES} main_complete.c -o debug-complete -DWITH_DBG_SYSLOG -DWITH_DBG_FILTER -DWITH_DBG_MUTEX
+	gcc ${CFLAGS} ${DEBUG_SOURCES} main_complete.c -o debug-complete -DWITH_DBG_SYSLOG -DWITH_DBG_FILTER -DWITH_DBG_MUTEX
+
+complete-cpp:
+	g++ ${CFLAGS} ${DEBUG_SOURCES} main_complete.c -o debug-complete-cpp -DWITH_DBG_SYSLOG -DWITH_DBG_FILTER -DWITH_DBG_MUTEX
 
 simple:
-	g++ ${CFLAGS} debug.c main_simple.c -o debug-simple
+	gcc ${CFLAGS} debug.c main_simple.c -o debug-simple
+
+minimal:
+	gcc ${CFLAGS} debug.c main_minimal.c -o debug-minimal
 
 syslog:
-	g++ ${CFLAGS} debug.c debug_syslog.c main_syslog.c -o debug-syslog -DWITH_DBG_SYSLOG
+	gcc ${CFLAGS} debug.c debug_syslog.c main_syslog.c -o debug-syslog -DWITH_DBG_SYSLOG
 
 filter:
-	g++ ${CFLAGS} debug.c debug_filter.c main_filter.c -o debug-filter -DWITH_DBG_FILTER
+	gcc ${CFLAGS} debug.c debug_filter.c main_filter.c -o debug-filter -DWITH_DBG_FILTER
 
 mutex:
-	g++ ${CFLAGS} debug.c main_mutex.c -o debug-mutex -DWITH_DBG_MUTEX
+	gcc ${CFLAGS} debug.c main_mutex.c -o debug-mutex -DWITH_DBG_MUTEX
+
+clean:
+	rm -f debug_{complete,complete-cpp,simple,syslog,filter,mutex,minimal}
\ No newline at end of file
-- 
cgit v1.2.3