Get st-util ack'ing the monitor request. Responds to

[fw/stlink] / Makefile

diff --git a/Makefile b/Makefile
index bbd76a807fb6f9541d529d182a6f83f4caec6fa9..4bb0608b1d2ca5317c3939713d8e7bbdbb8112d8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,14 @@
 ##
 VPATH=src
 
-SOURCES_LIB=stlink-common.c stlink-usb.c #stlink-sg.c
+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=-lusb-1.0 -L. -lstlink
+TEST_PROGRAMS=test_usb test_sg
+LDFLAGS=-L. -lstlink 
+
+# libusb location
+LDFLAGS+=`pkg-config --libs libusb-1.0`
+CFLAGS+=`pkg-config --cflags libusb-1.0`
 
 CFLAGS+=-g
 CFLAGS+=-DDEBUG=1
@@ -42,8 +46,6 @@ clean:
        rm -rf $(LIBRARY)
        rm -rf test_usb*
        rm -rf test_sg*
-
-distclean: clean
        $(MAKE) -C flash clean
        $(MAKE) -C gdbserver clean
        
@@ -51,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