From adf3d071d1375b6d85f40fd023cd271a476a95ef Mon Sep 17 00:00:00 2001
From: Fionn Cleary <clearyf@tcd.ie>
Date: Thu, 13 Jun 2013 16:22:39 +0200
Subject: [PATCH] Make clang build as silent as possible

Signed-off-by: Fionn Cleary <clearyf@tcd.ie>
---
 Makefile    | 9 +++++----
 fvs_main.c  | 1 -
 test_main.c | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 65b0c64..4194e0e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
 MAKEFLAGS += -rR
 CC=gcc
-FLAGS=-O3 -I include -lm -Wall -Wextra -MMD -O `pkg-config --cflags --libs MagickCore` -D_GNU_SOURCE
-CFLAGS=$(FLAGS) -std=c99
+FLAGS=-O3 -I include -Wall -Wextra -MMD -O -D_GNU_SOURCE
+CFLAGS=$(FLAGS) -std=c99 `pkg-config --cflags MagickCore`
+LDFLAGS=$(FLAGS) `pkg-config --libs MagickCore` -lm
 # turns on extra information about which loop have been vectorised
 # CFLAGS+= -ftree-vectorizer-verbose=2
 COMPILE = $(CC) -c $(CFLAGS)
@@ -22,9 +23,9 @@ $(BIN_DIR)/%.o : %.c
 	$(COMPILE) -o $@ $<
 
 $(FVSCBIN) : $(addprefix $(BIN_DIR)/, $(SRCS:.c=.o)) $(addprefix $(BIN_DIR)/, $(MAIN:.c=.o))
-	$(CC) -o $@ $^ $(CFLAGS)
+	$(CC) -o $@ $^ $(LDFLAGS)
 $(FVSCTEST) : $(addprefix $(BIN_DIR)/, $(SRCS:.c=.o)) $(addprefix $(BIN_DIR)/, $(TEST:.c=.o))
-	$(CC) -o $@ $^ $(CFLAGS)
+	$(CC) -o $@ $^ $(LDFLAGS)
 
 clean:
 	rm -rf $(BIN_DIR)/*
diff --git a/fvs_main.c b/fvs_main.c
index 0bd2ca3..5c7677a 100644
--- a/fvs_main.c
+++ b/fvs_main.c
@@ -30,7 +30,6 @@
 *   02111-1307, USA.
 ########################################################################*/
 
-#include <omp.h>
 #include "fvs.h"
 
 int main(int argc, char *argv[])
diff --git a/test_main.c b/test_main.c
index 286af31..fb05436 100644
--- a/test_main.c
+++ b/test_main.c
@@ -1,4 +1,3 @@
-#include <omp.h>
 #include "fvs.h"
 #include <sys/types.h>
 #include <dirent.h>
-- 
2.11.4.GIT