X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2FMakefile.am;h=aa3155062173c0106897d21b0d3bd0c9c77eaec9;hp=e197382731be89cfce97cdde0844ee1c6bd8caae;hb=78d58dd16a276d5a3547d2f681f5062415736c85;hpb=8b4e882a1630d63bbc9840fa3f968e36b6ac3702

diff --git a/src/Makefile.am b/src/Makefile.am
index e197382731..aa31550621 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,19 +4,42 @@ openocd_SOURCES = openocd.c
 # set the include path found by configure
 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 $(all_includes)
+	-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
+SUBDIRS = helper jtag xsvf target server flash pld
+
+if IS_MINGW
+MINGWLDADD = -lwsock32
+else
+MINGWLDADD =
+endif
 
-if FTDI2232
+if FT2232_LIBFTDI
+FTDI2232LIB = -lftdi
+else
+if PRESTO_LIBFTDI
 FTDI2232LIB = -lftdi
 else
 FTDI2232LIB =
 endif
+endif
 
-if IS_CYGWIN
+if USBPROG
+LIBUSB = -lusb
+else
+LIBUSB =
+endif
+
+if IS_WIN32
 if FTD2XXDIR
 FTD2XXLDADD = @WITH_FTD2XX@/FTD2XX.lib
 else
@@ -26,15 +49,20 @@ else
 FTD2XXLDADD = -lftd2xx 
 endif
   
-if FTD2XX
+if FT2232_FTD2XX
+FTD2XXLIB = $(FTD2XXLDADD)
+else
+if PRESTO_FTD2XX
 FTD2XXLIB = $(FTD2XXLDADD)
 else
 FTD2XXLIB =
 endif
+endif
 
 openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \
 	$(top_builddir)/src/target/libtarget.a $(top_builddir)/src/jtag/libjtag.a \
 	$(top_builddir)/src/helper/libhelper.a \
 	$(top_builddir)/src/server/libserver.a $(top_builddir)/src/helper/libhelper.a \
 	$(top_builddir)/src/flash/libflash.a $(top_builddir)/src/target/libtarget.a \
-	$(FTDI2232LIB) $(FTD2XXLIB) 
+	$(top_builddir)/src/pld/libpld.a \
+	$(FTDI2232LIB) $(FTD2XXLIB) $(MINGWLDADD) $(LIBUSB)