Merge pull request #61 from UweBonnes/master

[fw/stlink] / flash / Makefile

diff --git a/flash/Makefile b/flash/Makefile
index fe0dff7ce4aeddd49850db3223d7a99043ffc0bb..5345dcbfdb913a483964c55e6f81e3f2ad4c5910 100644 (file)
--- a/flash/Makefile
+++ b/flash/Makefile
@@ -1,21 +1,23 @@
 CFLAGS+=-g
-CFLAGS+=-DCONFIG_USE_LIBUSB
-CFLAGS+=-DCONFIG_USE_LIBSG
 CFLAGS+=-DDEBUG
 CFLAGS+=-std=gnu99
 CFLAGS+=-Wall -Wextra
 CFLAGS+=-I../src
 
-LDFLAGS=-L.. -lstlink -lusb-1.0 -lsgutils2
+LDFLAGS=-L.. -lstlink
+
+# libusb location
+LDFLAGS+=`pkg-config --libs libusb-1.0`
+CFLAGS+=`pkg-config --cflags libusb-1.0`
 
 SRCS=main.c
 OBJS=$(SRCS:.c=.o)
 
-NAME=flash
+NAME=st-flash
 
 all: $(NAME)
 
-$(NAME): $(OBJS)
+$(NAME): $(OBJS) ../libstlink.a
        $(CC) $(CFLAGS) -o $(NAME) $(OBJS) $(LDFLAGS)
 
 %.o: %.c