From 23c6c89237325cffae60cb982b14dc845471cdba Mon Sep 17 00:00:00 2001
From: Michael Spang <mspang@uwaterloo.ca>
Date: Wed, 29 Jul 2009 09:58:11 -0400
Subject: [PATCH] Fix redundant arguments to linker

---
 src/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 47bbc98..08aaa69 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,6 @@
 CFLAGS   := -g3 -O2 -Wall -Werror -DDEBUG
 LDFLAGS  := -Wl,--as-needed
 INCLUDES := $(shell krb5-config --cflags)
-override LDFLAGS += -std=gnu99 $(INCLUDES)
 override CFLAGS  += -std=gnu99 $(INCLUDES)
 
 DESTDIR :=
@@ -43,7 +42,7 @@ ceo.pb-c.c ceo.pb-c.h: ceo.proto
 	protoc-c --c_out=. ceo.proto
 
 ceod: dmaster.o dslave.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+	$(CC) $(LDFLAGS) $^ $(CFLAGS) $(LDLIBS) -o $@
 
 config-test: config-test.o parser.o