projects
/
fw
/
stlink
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add explicit dependancy on the stlink archive
[fw/stlink]
/
flash
/
Makefile
diff --git
a/flash/Makefile
b/flash/Makefile
index 8a30b4113a6bcebf88951810e7d83129e45f4f7d..cb7dcd2c27491ed9ac0daa5c4891acae3f23b160 100644
(file)
--- a/
flash/Makefile
+++ b/
flash/Makefile
@@
-1,27
+1,10
@@
-# 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=-lusb-1.0 -L.. -lstlink
-
-ifeq ($(CONFIG_USE_LIBSG),)
-CONFIG_USE_LIBSG=1
-endif
-
-ifneq ($(CONFIG_USE_LIBSG),0)
-CFLAGS+=-DCONFIG_USE_LIBSG=1
-LDFLAGS+=-lsgutils2
-endif
+LDFLAGS=-L.. -lstlink -lusb-1.0
SRCS=main.c
OBJS=$(SRCS:.c=.o)
SRCS=main.c
OBJS=$(SRCS:.c=.o)
@@
-30,7
+13,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