From a83894f2205f56a0c5897feb6ab036dc5e5a491a Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Fri, 5 Dec 2014 04:38:54 -0500
Subject: [PATCH] makefile improvements

---
 Makefile | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 993a086..41923f3 100644
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,17 @@ BIN=mediator
 
 CC := gcc
 
-GLIB_CFLAGS := `pkg-config glib-2.0 --cflags` `pkg-config --cflags gthread-2.0`
-CFLAGS := -I/usr/include/mysql $(GLIB_CFLAGS) -g -Wall -O3
+CFLAGS := -g -Wall -O3 -std=c99 -D_POSIX_SOURCE -D_GNU_SOURCE
+CFLAGS += `pkg-config glib-2.0 --cflags`
+CFLAGS += `pkg-config --cflags gthread-2.0`
+CFLAGS += `mysql_config --cflags`
 CFLAGS += -pthread
 #CFLAGS += -DWITH_TIME_CALC
 
-GLIB_LDFLAGS := `pkg-config glib-2.0 --libs` `pkg-config --libs gthread-2.0`
-LDFLAGS := -lmysqlclient
+LDFLAGS := -pthread
+LDFLAGS += `pkg-config glib-2.0 --libs`
+LDFLAGS += `pkg-config --libs gthread-2.0`
+LDFLAGS += `mysql_config --libs_r`
 
 CFILES := $(wildcard *.c)
 OFILES := $(CFILES:.c=.o)
@@ -18,13 +22,13 @@ OFILES := $(CFILES:.c=.o)
 all: $(BIN)
 
 $(BIN): $(OFILES)
-	$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) $(GLIB_LDFLAGS)
+	$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 clean:
-	rm -f *.o
+	rm -f $(OFILES)
 	rm -f core*
 	rm -f $(BIN)