usbtoxxx: remove warning by reducing scope of variable

[fw/openocd] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index e3adaad843ecddcfbedd0a1112c61ef65fa26daa..8375683d07e79dbfec6e16669df07d2512e00d36 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,6 +30,10 @@ else
 openocd_LDADD += -ljim
 endif
 
+if ULINK
+openocd_LDADD += -lm
+endif
+
 libopenocd_la_SOURCES = \
        hello.c \
        openocd.c \
@@ -45,10 +49,11 @@ libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\"
 # guess-rev.sh returns either a repository version ID or "-snapshot"
 if RELEASE
 libopenocd_la_CPPFLAGS += -DRELSTR=\"\"
+libopenocd_la_CPPFLAGS += -DGITVERSION=\"\"
 else
 libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
-endif
 libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\"
+endif
 
 # add default CPPFLAGS
 libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)
@@ -85,6 +90,9 @@ else
 if RLINK
 LIBUSB = -lusb
 else
+if ULINK
+LIBUSB = -lusb
+else
 if VSLLINK
 LIBUSB = -lusb
 else
@@ -93,6 +101,7 @@ endif
 endif
 endif
 endif
+endif
 
 libopenocd_la_LIBADD = \
        $(top_builddir)/src/xsvf/libxsvf.la \