Merge branch 'killsg' of github.com:karlp/stlink into killsg

[fw/stlink] / Makefile

diff --git a/Makefile b/Makefile
index c5bb1d9a1f082db033aea7d5da793578475537c2..646dde12df5e84ac4799af48c378d4b8dabda8ed 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,13 @@
-# make ... for both libusb and libsg
-#
-# make CONFIG_USE_LIBSG=0 ...
-# for just libusb
-#
+# make ... for both stlink v1 and stlink v2 support
+##
 VPATH=src
 
-SOURCES_LIB=stlink-common.c stlink-usb.c
+SOURCES_LIB=stlink-common.c stlink-usb.c stlink-sg.c uglylogging.c
 OBJS_LIB=$(SOURCES_LIB:.c=.o)
-TEST_PROGRAMS=test_usb
+TEST_PROGRAMS=test_usb test_sg
 LDFLAGS=-lusb-1.0 -L. -lstlink
 
-ifeq ($(CONFIG_USE_LIBSG),)
-CONFIG_USE_LIBSG=1
-endif
-
-ifneq ($(CONFIG_USE_LIBSG),0)
-SOURCES_LIB+=stlink-sg.c
-CFLAGS+=-DCONFIG_USE_LIBSG=1
-LDFLAGS+=-lsgutils2
-TEST_PROGRAMS+=test_sg
-endif
-
 CFLAGS+=-g
-CFLAGS+=-DCONFIG_USE_LIBUSB=1
 CFLAGS+=-DDEBUG=1
 CFLAGS+=-std=gnu99
 CFLAGS+=-Wall -Wextra
@@ -63,7 +48,7 @@ distclean: clean
        $(MAKE) -C gdbserver clean
        
 flash:
-       $(MAKE) -C flash CONFIG_USE_LIBSG="$(CONFIG_USE_LIBSG)" 
+       $(MAKE) -C flash
 
 gdbserver:
        $(MAKE) -C gdbserver