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

[fw/stlink] / Makefile

diff --git a/Makefile b/Makefile
index a6545e83b64b54141b26ba3ea5ce126118e2a570..646dde12df5e84ac4799af48c378d4b8dabda8ed 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,21 @@
-
+# make ... for both stlink v1 and stlink v2 support
+##
 VPATH=src
 
-SOURCES_LIB=stlink-common.c stlink-usb.c stlink-sg.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_sg
+LDFLAGS=-lusb-1.0 -L. -lstlink
 
 CFLAGS+=-g
-CFLAGS+=-DCONFIG_USE_LIBUSB
-CFLAGS+=-DCONFIG_USE_LIBSG
-CFLAGS+=-DDEBUG
+CFLAGS+=-DDEBUG=1
 CFLAGS+=-std=gnu99
 CFLAGS+=-Wall -Wextra
 
-LDFLAGS=-lstlink -lusb-1.0 -lsgutils2 -L.
 
 LIBRARY=libstlink.a
 
-all:  $(LIBRARY) flash gdbserver test_usb test_sg 
+all:  $(LIBRARY) flash gdbserver $(TEST_PROGRAMS)
 
 $(LIBRARY): $(OBJS_LIB)
        @echo "objs are $(OBJS_LIB)"