projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/telemini'
[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 375896ea22af09343837a1474c416d9e0205cf25..4eaf699cac02de404eec0ac1114452683ee7eeb6 100644
(file)
--- a/
ao-tools/ao-stmload/Makefile.am
+++ b/
ao-tools/ao-stmload/Makefile.am
@@
-1,11
+1,18
@@
+if LIBSTLINK
+
bin_PROGRAMS=ao-stmload
LIBSTLINKDIR=/local/src/stlink
bin_PROGRAMS=ao-stmload
LIBSTLINKDIR=/local/src/stlink
-AM_CFLAGS=$(LIBSTLINK_CFLAGS) $(LIBUSB_CFLAGS) -I../lib
+AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(LIBSTLINK_CFLAGS) $(LIBUSB_CFLAGS)
+AO_STMLOAD_LIBS=$(top_builddir)/ao-tools/lib/libao-tools.a
+
+ao_stmload_DEPENDENCIES = $(AO_STMLOAD_LIBS)
-ao_stmload_LDADD=$(LIBSTLINK_LIBS) $(LIBUSB_LIBS) -lelf
+ao_stmload_LDADD=$(
AO_STMLOAD_LIBS) $(
LIBSTLINK_LIBS) $(LIBUSB_LIBS) -lelf
-ao_stmload_SOURCES=ao-stmload.c
+ao_stmload_SOURCES=ao-stmload.c
ao-elf.c ao-stmload.h ao-selfload.c
man_MANS = ao-stmload.1
man_MANS = ao-stmload.1
+
+endif