Merge branch 'master' of github.com:karlp/stlink

[fw/stlink] / flash / Makefile

diff --git a/flash/Makefile b/flash/Makefile
index 8a30b4113a6bcebf88951810e7d83129e45f4f7d..dc16b62a927ae63be25e383e71e5676f758b8831 100644 (file)
--- a/flash/Makefile
+++ b/flash/Makefile
@@ -1,10 +1,3 @@
-# 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
@@ -12,16 +5,7 @@ CFLAGS+=-std=gnu99
 CFLAGS+=-Wall -Wextra
 CFLAGS+=-I../src
 
-LDFLAGS=-lusb-1.0 -L.. -lstlink 
-
-ifeq ($(CONFIG_USE_LIBSG),)
-CONFIG_USE_LIBSG=1
-endif
-
-ifneq ($(CONFIG_USE_LIBSG),0)
-CFLAGS+=-DCONFIG_USE_LIBSG=1
-LDFLAGS+=-lsgutils2
-endif
+LDFLAGS=-L.. -lstlink -lusb-1.0
 
 SRCS=main.c
 OBJS=$(SRCS:.c=.o)