X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=aa3155062173c0106897d21b0d3bd0c9c77eaec9;hb=01dd733dadc3508ba8f3abf8de87248c835891df;hp=c8e7c81d3f02ae9257d4dbab3346b4e1372f3cd6;hpb=1429d2c659ab9b84dee673e7697da7eab44a8f90;p=openocd.git

diff --git a/src/Makefile.am b/src/Makefile.am
index c8e7c81d3f..aa31550621 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,6 +6,13 @@ INCLUDES = -I$(top_srcdir)/src/helper \
 	-I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/target -I$(top_srcdir)/src/xsvf -I$(top_srcdir)/src/server \
 	-I$(top_srcdir)/src/flash -I$(top_srcdir)/src/pld $(all_includes)
 
+# pass path to prefix path
+openocd_CPPFLAGS = \
+ -DPKGLIBDIR=\"$(pkglibdir)\" \
+ -DPKGBLDDATE=\"`date +%F-%R`\" \
+ -DPKGBLDREV=\"`$(top_srcdir)/guess-rev.sh`\" \
+ @CPPFLAGS@
+
 # the library search path.
 openocd_LDFLAGS = $(all_libraries) 
 SUBDIRS = helper jtag xsvf target server flash pld
@@ -19,8 +26,12 @@ endif
 if FT2232_LIBFTDI
 FTDI2232LIB = -lftdi
 else
+if PRESTO_LIBFTDI
+FTDI2232LIB = -lftdi
+else
 FTDI2232LIB =
 endif
+endif
 
 if USBPROG
 LIBUSB = -lusb
@@ -41,7 +52,7 @@ endif
 if FT2232_FTD2XX
 FTD2XXLIB = $(FTD2XXLDADD)
 else
-if PRESTO
+if PRESTO_FTD2XX
 FTD2XXLIB = $(FTD2XXLDADD)
 else
 FTD2XXLIB =