From: Karl Palsson <karlp@remake.is>
Date: Fri, 11 Nov 2011 15:38:09 +0000 (+0000)
Subject: Finish removing sg-utils dependencies.
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=e9a205ff98bea6a3a902352711a3980ccd4518be;p=fw%2Fstlink

Finish removing sg-utils dependencies.

The code deps were removed, but the flags stayed in some makefiles.
---

diff --git a/flash/Makefile b/flash/Makefile
index 8a30b41..6e16754 100644
--- 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
@@ -14,15 +7,6 @@ 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
-
 SRCS=main.c
 OBJS=$(SRCS:.c=.o)
 
diff --git a/gdbserver/Makefile b/gdbserver/Makefile
index a8d1b90..e73103d 100644
--- a/gdbserver/Makefile
+++ b/gdbserver/Makefile
@@ -1,9 +1,3 @@
-# make ... for both libusb and libsg
-#
-# make CONFIG_USE_LIBSG=0 ...
-# for just libusb
-#
-
 PRG := st-util
 OBJS = gdb-remote.o gdb-server.o
 
@@ -11,15 +5,6 @@ CFLAGS+=-g -Wall -Werror -std=gnu99 -I../src
 CFLAGS+=-DCONFIG_USE_LIBUSB=1
 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
-
 all: $(PRG)
 
 $(PRG): $(OBJS)