X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=flash%2FMakefile;h=cb7dcd2c27491ed9ac0daa5c4891acae3f23b160;hb=e82da443bf0f113f7fc3cad71322a69f0db22360;hp=9fa67435c4b163afed58e5e11c2a0dce4d9bb86d;hpb=c98c487fa52651505871de11d65bacaeaf1cac39;p=fw%2Fstlink

diff --git a/flash/Makefile b/flash/Makefile
index 9fa6743..cb7dcd2 100644
--- a/flash/Makefile
+++ b/flash/Makefile
@@ -1,12 +1,4 @@
-# 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
@@ -14,15 +6,6 @@ CFLAGS+=-I../src
 
 LDFLAGS=-L.. -lstlink -lusb-1.0
 
-ifeq ($(CONFIG_USE_LIBSG),)
-CONFIG_USE_LIBSG=1
-endif
-
-ifneq ($(CONFIG_USE_LIBSG),0)
-CFLAGS+=-DCONFIG_USE_LIBSG=1
-LDFLAGS+=-lsgutils2
-endif
-
 SRCS=main.c
 OBJS=$(SRCS:.c=.o)
 
@@ -30,7 +13,7 @@ NAME=flash
 
 all: $(NAME)
 
-$(NAME): $(OBJS)
+$(NAME): $(OBJS) ../libstlink.a
 	$(CC) $(CFLAGS) -o $(NAME) $(OBJS) $(LDFLAGS)
 
 %.o: %.c