X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=c78e81c801fb48324a30578460b0e21104b1ab3a;hb=4be685c6167e8ac340cd383f0a0a61faaa45f3f8;hp=8375683d07e79dbfec6e16669df07d2512e00d36;hpb=fbbce951402bc08367786f2ba2ce3af549d0d5a5;p=openocd.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 8375683d07..c78e81c801 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,11 +15,7 @@ SUBDIRS = \
 lib_LTLIBRARIES = libopenocd.la
 bin_PROGRAMS = openocd
 
-if ECOSBOARD
-MAINFILE = ecosboard.c
-else
 MAINFILE = main.c
-endif
 
 openocd_SOURCES = $(MAINFILE)
 openocd_LDADD = libopenocd.la
@@ -81,26 +77,13 @@ endif
 endif
 endif
 
-if USBPROG
-LIBUSB = -lusb
-else
-if JLINK
-LIBUSB = -lusb
-else
-if RLINK
-LIBUSB = -lusb
-else
-if ULINK
-LIBUSB = -lusb
-else
-if VSLLINK
-LIBUSB = -lusb
-else
 LIBUSB =
+if USE_LIBUSB1
+LIBUSB += -lusb-1.0
 endif
-endif
-endif
-endif
+
+if USE_LIBUSB0
+LIBUSB += -lusb
 endif
 
 libopenocd_la_LIBADD = \