projects
/
fw
/
stlink
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use pkg-config to find libusb CFLAGS and LDFLAGS.
[fw/stlink]
/
flash
/
Makefile
diff --git
a/flash/Makefile
b/flash/Makefile
index 9fa67435c4b163afed58e5e11c2a0dce4d9bb86d..4914587179b287eb3d4560c06f770313cd955912 100644
(file)
--- a/
flash/Makefile
+++ b/
flash/Makefile
@@
-1,27
+1,14
@@
-# make ... for both libusb and libsg
-#
-# make CONFIG_USE_LIBSG=0 ...
-# for just libusb
-#
-CC=gcc
-
CFLAGS+=-g
CFLAGS+=-g
-CFLAGS+=-DCONFIG_USE_LIBUSB=1
CFLAGS+=-DDEBUG
CFLAGS+=-std=gnu99
CFLAGS+=-Wall -Wextra
CFLAGS+=-I../src
CFLAGS+=-DDEBUG
CFLAGS+=-std=gnu99
CFLAGS+=-Wall -Wextra
CFLAGS+=-I../src
-LDFLAGS=-L.. -lstlink -lusb-1.0
-
-ifeq ($(CONFIG_USE_LIBSG),)
-CONFIG_USE_LIBSG=1
-endif
+LDFLAGS=-L.. -lstlink
-ifneq ($(CONFIG_USE_LIBSG),0)
-CFLAGS+=-DCONFIG_USE_LIBSG=1
-LDFLAGS+=-lsgutils2
-endif
+# libusb location
+LDFLAGS+=`pkg-config --libs libusb-1.0`
+CFLAGS+=`pkg-config --cflags libusb-1.0`
SRCS=main.c
OBJS=$(SRCS:.c=.o)
SRCS=main.c
OBJS=$(SRCS:.c=.o)
@@
-30,7
+17,7
@@
NAME=flash
all: $(NAME)
all: $(NAME)
-$(NAME): $(OBJS)
+$(NAME): $(OBJS)
../libstlink.a
$(CC) $(CFLAGS) -o $(NAME) $(OBJS) $(LDFLAGS)
%.o: %.c
$(CC) $(CFLAGS) -o $(NAME) $(OBJS) $(LDFLAGS)
%.o: %.c