[Openocd-svn] r2000 - in trunk: . src/jtag

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-02 10:29:03 +0200 (Tue, 02 Jun 2009)
New Revision: 2000

Modified:
   trunk/configure.in
   trunk/src/jtag/Makefile.am
Log:
Only include jtag_driver.c in the build when minidriver is not in use.

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2009-06-02 08:04:21 UTC (rev 1999)
+++ trunk/configure.in	2009-06-02 08:29:03 UTC (rev 2000)
@@ -13,7 +13,7 @@
 AC_CHECK_HEADERS(dirent.h)
 AC_CHECK_HEADERS(fcntl.h)
 AC_CHECK_HEADERS(ifaddrs.h)
-AC_CHECK_HEADERS(jtag_minidriver.h)
+AC_CHECK_HEADERS(jtag_minidriver.h,[build_minidriver=yes],[build_minidriver=no])
 AC_CHECK_HEADERS(malloc.h)
 AC_CHECK_HEADERS(netdb.h)
 AC_CHECK_HEADERS(netinet/in.h)
@@ -857,6 +857,7 @@
 AM_CONDITIONAL(IS_WIN32, test $is_win32 = yes)
 AM_CONDITIONAL(IS_DARWIN, test $is_darwin = yes)
 AM_CONDITIONAL(BITQ, test $build_bitq = yes)
+AM_CONDITIONAL(MINIDRIVER, test $build_minidriver = yes)
 
 AC_LANG_C
 AC_PROG_CC

Modified: trunk/src/jtag/Makefile.am
===================================================================
--- trunk/src/jtag/Makefile.am	2009-06-02 08:04:21 UTC (rev 1999)
+++ trunk/src/jtag/Makefile.am	2009-06-02 08:29:03 UTC (rev 2000)
@@ -51,6 +51,12 @@
 ECOSBOARDFILES =
 endif
 
+if MINIDRIVER
+DRIVERFILES =
+else
+DRIVERFILES = jtag_driver.c
+endif
+
 if AT91RM9200
 AT91RM9200FILES = at91rm9200.c
 else
@@ -111,7 +117,7 @@
 
 libjtag_la_SOURCES = \
 	jtag.c \
-	jtag_driver.c \
+	$(DRIVERFILES) \
 	$(BITBANGFILES) \
 	$(PARPORTFILES) \
 	$(DUMMYFILES) \