X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=flash%2FMakefile;h=4914587179b287eb3d4560c06f770313cd955912;hb=5e5d1fa747efd4c913fc9b64414d33a1586c99a3;hp=9fa67435c4b163afed58e5e11c2a0dce4d9bb86d;hpb=207a5b7c6aaeb37e4522977c803c876abbdabd2f;p=fw%2Fstlink

diff --git a/flash/Makefile b/flash/Makefile
index 9fa6743..4914587 100644
--- a/flash/Makefile
+++ b/flash/Makefile
@@ -1,27 +1,14 @@
-# make ... for both libusb and libsg
-#
-# make CONFIG_USE_LIBSG=0 ...
-# for just libusb
-#
-CC=gcc
-
 CFLAGS+=-g
-CFLAGS+=-DCONFIG_USE_LIBUSB=1
 CFLAGS+=-DDEBUG
 CFLAGS+=-std=gnu99
 CFLAGS+=-Wall -Wextra
 CFLAGS+=-I../src
 
-LDFLAGS=-L.. -lstlink -lusb-1.0
-
-ifeq ($(CONFIG_USE_LIBSG),)
-CONFIG_USE_LIBSG=1
-endif
+LDFLAGS=-L.. -lstlink
 
-ifneq ($(CONFIG_USE_LIBSG),0)
-CFLAGS+=-DCONFIG_USE_LIBSG=1
-LDFLAGS+=-lsgutils2
-endif
+# libusb location
+LDFLAGS+=`pkg-config --libs libusb-1.0`
+CFLAGS+=`pkg-config --cflags libusb-1.0`
 
 SRCS=main.c
 OBJS=$(SRCS:.c=.o)
@@ -30,7 +17,7 @@ NAME=flash
 
 all: $(NAME)
 
-$(NAME): $(OBJS)
+$(NAME): $(OBJS) ../libstlink.a
 	$(CC) $(CFLAGS) -o $(NAME) $(OBJS) $(LDFLAGS)
 
 %.o: %.c