summaryrefslogtreecommitdiff
path: root/ao-tools/ao-stmload
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-12-08 11:07:46 -0800
committerKeith Packard <keithp@keithp.com>2013-12-08 11:07:46 -0800
commitebb36d56c732ffe9cdb8d2ea53d00e1d4ece8f97 (patch)
tree46b321232b9b56cb77d538c49293073d20bdd241 /ao-tools/ao-stmload
parent5fd0dc6f69e7614ba71bbc215b32260a11595af3 (diff)
ao-tools: Allow building without stlink and readline
This adds --without-stlink and --without-readline options to configure to disable these features, and adjusts the build process and code to handle that. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'ao-tools/ao-stmload')
-rw-r--r--ao-tools/ao-stmload/Makefile.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/ao-tools/ao-stmload/Makefile.am b/ao-tools/ao-stmload/Makefile.am
index 9ed286cc..45eb6216 100644
--- a/ao-tools/ao-stmload/Makefile.am
+++ b/ao-tools/ao-stmload/Makefile.am
@@ -2,14 +2,12 @@ if LIBSTLINK
bin_PROGRAMS=ao-stmload
-LIBSTLINKDIR=/local/src/stlink
-
-AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(LIBSTLINK_CFLAGS) $(LIBUSB_CFLAGS)
+AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(STLINK_CFLAGS) $(LIBUSB_CFLAGS)
AO_STMLOAD_LIBS=$(top_builddir)/ao-tools/lib/libao-tools.a
ao_stmload_DEPENDENCIES = $(AO_STMLOAD_LIBS)
-ao_stmload_LDADD=$(AO_STMLOAD_LIBS) $(LIBSTLINK_LIBS) $(LIBUSB_LIBS) -lelf
+ao_stmload_LDADD=$(AO_STMLOAD_LIBS) $(STLINK_LIBS) $(LIBUSB_LIBS) -lelf
ao_stmload_SOURCES=ao-stmload.c ao-stmload.h