Dirk Behme <dirk.behme@googlemail.com>

[openocd] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 3080839c747c3cbd15e92a98e3762e78f4239227..6a9f62a8ee8c5061a620f3284ffa216eff4f78c9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,6 +6,7 @@ else
 MAINFILE = main.c
 endif
 
+
 openocd_SOURCES = $(MAINFILE) openocd.c
 
 # set the include path found by configure
@@ -46,9 +47,13 @@ else
 if JLINK
 LIBUSB = -lusb
 else
+if RLINK
+LIBUSB = -lusb
+else
 LIBUSB =
 endif
 endif
+endif
 
 if IS_WIN32
 if FTD2XXDIR
@@ -78,6 +83,13 @@ openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \
        $(top_builddir)/src/pld/libpld.a \
        $(FTDI2232LIB) $(FTD2XXLIB) $(MINGWLDADD) $(LIBUSB)
 
+
+if HTTPD
+openocd_LDADD += -lmicrohttpd
+endif
+
+
+
 nobase_dist_pkglib_DATA = \
        tcl/bitsbytes.tcl                       \
        tcl/chip/atmel/at91/aic.tcl             \
@@ -93,6 +105,7 @@ nobase_dist_pkglib_DATA = \
        tcl/cpu/arm/arm920.tcl                  \
        tcl/cpu/arm/arm946.tcl                  \
        tcl/cpu/arm/arm966.tcl                  \
+       tcl/cpu/arm/cortex_m3.tcl               \
        tcl/memory.tcl                          \
        tcl/mmr_helpers.tcl                     \
        tcl/readable.tcl