X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile;h=6bf02323d731c9b8d0e360c8b34bcfe812a40897;hb=5eda4566d617fedd2a9d3020ddae06b394d08a5f;hp=943302e0487fdfcb20358f82179e05d5137464db;hpb=59a7e8b47013d20bab69da14da0cda9aa635d74f;p=fw%2Fstlink

diff --git a/Makefile b/Makefile
index 943302e..6bf0232 100644
--- 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=-L. -lstlink -lusb-1.0
 
-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
@@ -57,15 +42,13 @@ clean:
 	rm -rf $(LIBRARY)
 	rm -rf test_usb*
 	rm -rf test_sg*
-
-distclean: clean
 	$(MAKE) -C flash clean
 	$(MAKE) -C gdbserver clean
 	
 flash:
-	$(MAKE) -C flash CONFIG_USE_LIBSG="$(CONFIG_USE_LIBSG)" 
+	$(MAKE) -C flash
 
 gdbserver:
-	$(MAKE) -C gdbserver
+	$(MAKE) -C gdbserver CONFIG_USE_LIBSG="$(CONFIG_USE_LIBSG)"
 
 .PHONY: clean all flash gdbserver