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

diff --git a/Makefile b/Makefile
index 4cf2775..6bf0232 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +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=-L. -lstlink -lusb-1.0
 
-CFLAGS+=-DCONFIG_USE_LIBUSB
-#CFLAGS+=-DCONFIG_USE_LIBSG
-CFLAGS+= -std=gnu99
+CFLAGS+=-g
+CFLAGS+=-DDEBUG=1
+CFLAGS+=-std=gnu99
 CFLAGS+=-Wall -Wextra
 
-LDFLAGS=-lstlink -lusb-1.0 -L.
 
 LIBRARY=libstlink.a
 
-all:  $(LIBRARY) test_usb #test_sg 
+all:  $(LIBRARY) flash gdbserver $(TEST_PROGRAMS)
 
 $(LIBRARY): $(OBJS_LIB)
 	@echo "objs are $(OBJS_LIB)"
@@ -23,7 +25,7 @@ $(LIBRARY): $(OBJS_LIB)
 
 test_sg: test_sg.o $(LIBRARY)
 	@echo "building test_sg"
-	$(CC) $(LDFLAGS) -o $@
+	$(CC) test_sg.o $(LDFLAGS) -o $@
 
 test_usb: test_usb.o $(LIBRARY)
 	@echo "building test_usb"
@@ -40,5 +42,13 @@ clean:
 	rm -rf $(LIBRARY)
 	rm -rf test_usb*
 	rm -rf test_sg*
+	$(MAKE) -C flash clean
+	$(MAKE) -C gdbserver clean
 	
-.PHONY: clean all
+flash:
+	$(MAKE) -C flash
+
+gdbserver:
+	$(MAKE) -C gdbserver CONFIG_USE_LIBSG="$(CONFIG_USE_LIBSG)"
+
+.PHONY: clean all flash gdbserver