From: Karl Palsson <karlp@tweak.net.au>
Date: Fri, 11 Nov 2011 22:59:44 +0000 (+0000)
Subject: Merge branch 'master' of github.com:karlp/stlink
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=6cc33751512afaae0c8e9f116ea7370471888259;p=fw%2Fstlink

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

6cc33751512afaae0c8e9f116ea7370471888259
diff --cc flash/Makefile
index 9fa6743,6e16754..dc16b62
--- a/flash/Makefile
+++ b/flash/Makefile
@@@ -12,17 -5,8 +5,8 @@@ CFLAGS+=-std=gnu9
  CFLAGS+=-Wall -Wextra
  CFLAGS+=-I../src
  
 -LDFLAGS=-lusb-1.0 -L.. -lstlink 
 +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)
  
diff --cc gdbserver/Makefile
index a10a0d8,e73103d..c0b927e
--- a/gdbserver/Makefile
+++ b/gdbserver/Makefile
@@@ -9,17 -3,8 +3,8 @@@ OBJS = gdb-remote.o gdb-server.
  
  CFLAGS+=-g -Wall -Werror -std=gnu99 -I../src
  CFLAGS+=-DCONFIG_USE_LIBUSB=1
 -LDFLAGS=-lusb-1.0 -L.. -lstlink 
 +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
- 
  all: $(PRG)
  
  $(PRG): $(OBJS)