X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile;h=646dde12df5e84ac4799af48c378d4b8dabda8ed;hb=2dc7d9f4ec376f9c53dbb9a0413a0b0161378d0a;hp=c97bccf7766ef79b4de29453e33708f982754fd3;hpb=d31396111db210a9282da993656a1bb46465cfcd;p=fw%2Fstlink

diff --git a/Makefile b/Makefile
index c97bccf..646dde1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +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+=-DCONFIG_USE_LIBUSB
-CFLAGS+=-DCONFIG_USE_LIBSG
-CFLAGS+=-DDEBUG
-CFLAGS+= -std=gnu99
+CFLAGS+=-g
+CFLAGS+=-DDEBUG=1
+CFLAGS+=-std=gnu99
 CFLAGS+=-Wall -Wextra
 
-LDFLAGS=-lstlink -lusb-1.0 -lsgutils2 -L.
 
 LIBRARY=libstlink.a
 
-all:  $(LIBRARY) test_usb test_sg 
+all:  $(LIBRARY) flash gdbserver $(TEST_PROGRAMS)
 
 $(LIBRARY): $(OBJS_LIB)
 	@echo "objs are $(OBJS_LIB)"
@@ -41,5 +42,15 @@ clean:
 	rm -rf $(LIBRARY)
 	rm -rf test_usb*
 	rm -rf test_sg*
+
+distclean: clean
+	$(MAKE) -C flash clean
+	$(MAKE) -C gdbserver clean
 	
-.PHONY: clean all
+flash:
+	$(MAKE) -C flash
+
+gdbserver:
+	$(MAKE) -C gdbserver
+
+.PHONY: clean all flash gdbserver