X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=3413ba953f5e39638df1bf235e261c94b429ea79;hb=edfb677d3466a0d88fe9bd5ec1d8785a41b6bc4e;hp=3a92fffee3c43bd426a6f22c1001449fef026d7e;hpb=b302344779941f36129f1c09c24c5bbc414c4744;p=openocd.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 3a92fffee3..3413ba953f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,14 +12,10 @@ SUBDIRS = \
 	server \
 	rtos
 
-lib_LTLIBRARIES = libopenocd.la
+noinst_LTLIBRARIES = libopenocd.la
 bin_PROGRAMS = openocd
 
-if ECOSBOARD
-MAINFILE = ecosboard.c
-else
 MAINFILE = main.c
-endif
 
 openocd_SOURCES = $(MAINFILE)
 openocd_LDADD = libopenocd.la
@@ -70,24 +66,20 @@ endif
 if FT2232_LIBFTDI
 FTDI2232LIB = -lftdi -lusb
 else
-if USB_BLASTER_LIBFTDI
-FTDI2232LIB = -lftdi -lusb
-else
 if PRESTO_LIBFTDI
 FTDI2232LIB = -lftdi -lusb
 else
 FTDI2232LIB =
 endif
 endif
-endif
 
 LIBUSB =
 if USE_LIBUSB1
-LIBUSB += -lusb-1.0
+LIBUSB += $(LIBUSB1_LIBS)
 endif
 
 if USE_LIBUSB0
-LIBUSB += -lusb
+LIBUSB += $(LIBUSB0_LIBS)
 endif
 
 libopenocd_la_LIBADD = \