projects
/
fw
/
stlink
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #52 from UweBonnes/master
[fw/stlink]
/
Makefile
diff --git
a/Makefile
b/Makefile
index c5bb1d9a1f082db033aea7d5da793578475537c2..4bb0608b1d2ca5317c3939713d8e7bbdbb8112d8 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,28
+1,17
@@
-# 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
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)
OBJS_LIB=$(SOURCES_LIB:.c=.o)
-TEST_PROGRAMS=test_usb
-LDFLAGS=-
lusb-1.0 -L. -lstlink
+TEST_PROGRAMS=test_usb
test_sg
+LDFLAGS=-
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
+# libusb location
+LDFLAGS+=`pkg-config --libs libusb-1.0`
+CFLAGS+=`pkg-config --cflags libusb-1.0`
CFLAGS+=-g
CFLAGS+=-g
-CFLAGS+=-DCONFIG_USE_LIBUSB=1
CFLAGS+=-DDEBUG=1
CFLAGS+=-std=gnu99
CFLAGS+=-Wall -Wextra
CFLAGS+=-DDEBUG=1
CFLAGS+=-std=gnu99
CFLAGS+=-Wall -Wextra
@@
-57,15
+46,13
@@
clean:
rm -rf $(LIBRARY)
rm -rf test_usb*
rm -rf test_sg*
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 clean
$(MAKE) -C gdbserver clean
flash:
- $(MAKE) -C flash
CONFIG_USE_LIBSG="$(CONFIG_USE_LIBSG)"
+ $(MAKE) -C flash
gdbserver:
gdbserver:
- $(MAKE) -C gdbserver
+ $(MAKE) -C gdbserver
CONFIG_USE_LIBSG="$(CONFIG_USE_LIBSG)"
.PHONY: clean all flash gdbserver
.PHONY: clean all flash gdbserver