projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Let the application disable the link cancel dialog
[fw/altos]
/
ao-tools
/
ao-stmload
/
Makefile.am
diff --git
a/ao-tools/ao-stmload/Makefile.am
b/ao-tools/ao-stmload/Makefile.am
index 5aea7db4ab48ceeb4a3c31e33c34f2279d2474c7..45eb6216787f5afe2d50e68f497eb9b34744c914 100644
(file)
--- a/
ao-tools/ao-stmload/Makefile.am
+++ b/
ao-tools/ao-stmload/Makefile.am
@@
-2,13
+2,14
@@
if LIBSTLINK
bin_PROGRAMS=ao-stmload
bin_PROGRAMS=ao-stmload
-LIBSTLINKDIR=/local/src/stlink
+AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(STLINK_CFLAGS) $(LIBUSB_CFLAGS)
+AO_STMLOAD_LIBS=$(top_builddir)/ao-tools/lib/libao-tools.a
-AM_CFLAGS=$(LIBSTLINK_CFLAGS) $(LIBUSB_CFLAGS) -I../lib
+ao_stmload_DEPENDENCIES = $(AO_STMLOAD_LIBS)
-ao_stmload_LDADD=$(
LIB
STLINK_LIBS) $(LIBUSB_LIBS) -lelf
+ao_stmload_LDADD=$(
AO_STMLOAD_LIBS) $(
STLINK_LIBS) $(LIBUSB_LIBS) -lelf
-ao_stmload_SOURCES=ao-stmload.c
+ao_stmload_SOURCES=ao-stmload.c
ao-stmload.h
man_MANS = ao-stmload.1
man_MANS = ao-stmload.1