X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=a566b4d422fdce4cfd98079a4e3fca3dd55de687;hb=c795b0d8f143a52e0b7196c6e353b381ac04f8ae;hp=ea753bbff2eb3f363dcfe947da57e1f38b163d5a;hpb=87a0119fa24fe0fc904dcf2e6569cc0b9cb580ed;p=openocd.git

diff --git a/src/Makefile.am b/src/Makefile.am
index ea753bbff2..a566b4d422 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,8 @@ noinst_HEADERS = \
 
 # set the include path found by configure
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src
+	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src
 
 libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\"
 
@@ -59,12 +60,16 @@ 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
 
 if USBPROG
 LIBUSB = -lusb