Merge pull request #51 from DanielO/master

[fw/stlink] / Makefile

diff --git a/Makefile b/Makefile
index f24ed13b0b88d29d7527d421cf154a05edbe41b9..4bb0608b1d2ca5317c3939713d8e7bbdbb8112d8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,11 @@ VPATH=src
 SOURCES_LIB=stlink-common.c stlink-usb.c stlink-sg.c uglylogging.c
 OBJS_LIB=$(SOURCES_LIB:.c=.o)
 TEST_PROGRAMS=test_usb test_sg
-LDFLAGS=-L. -lstlink -lusb-1.0
+LDFLAGS=-L. -lstlink 
+
+# libusb location
+LDFLAGS+=`pkg-config --libs libusb-1.0`
+CFLAGS+=`pkg-config --cflags libusb-1.0`
 
 CFLAGS+=-g
 CFLAGS+=-DDEBUG=1
@@ -49,6 +53,6 @@ flash:
        $(MAKE) -C flash
 
 gdbserver:
-       $(MAKE) -C gdbserver
+       $(MAKE) -C gdbserver CONFIG_USE_LIBSG="$(CONFIG_USE_LIBSG)"
 
 .PHONY: clean all flash gdbserver