Makefile: fix CFLAGS != CPPFLAGS, allow overriding them

Change-Id: Id31923856915a3d2c3a03201ef8922c2129bc635
---
M src/Makefile
1 file changed, 14 insertions(+), 4 deletions(-)


git pull ssh://gerrit.osmocom.org:29418/osmo-qcdiag refs/changes/23/37223/1

diff --git a/src/Makefile b/src/Makefile
index 199b712..795a1ac 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,14 +1,15 @@
-CPPFLAGS ?= -g -O0 -Wall $(shell pkg-config --cflags libosmocore qmi-glib)
-LIBS ?= $(shell pkg-config --libs libosmocore qmi-glib)
+CFLAGS ?= -g -O0 -Wall
+LIBS = libosmocore qmi-glib
+
 all: osmo-qcdiag-log
 
 MODS_LOG = gprs_l1.o gprs_rlc.o gprs_mac.o diag_gsm.o diag_log.o diag_log_gsm.o diag_log_gprs.o diag_log_wcdma.o diag_log_umts.o diag_log_qmi.o diag_dpl.o diag_log_simcard.o diag_event.o
 
 %.o: %.c
-	$(CC) $(CPPFLAGS) -c -o $@ $^
+	$(CC) $(shell pkg-config --cflags $(LIBS)) $(CFLAGS) -c -o $@ $^
 
 osmo-qcdiag-log: diagchar_hdlc.o diag_io.o osmo-qcdiag-log.o diag_msg.o protocol.o diag_cmd.o $(MODS_LOG)
-	$(CC) $(LIBS) -o $@ $^
+	$(CC) $(shell pkg-config --libs $(LIBS)) -o $@ $^
 
 clean:
 	@rm -f osmo-qcdiag-log *.o

