Only include jtag_driver.c in the build when minidriver is not in use.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2000 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/configure.in b/configure.in
index 555874b2e27f081cbfb48d4c86b4d68cf5ea7d4e..451e9de5d734bdd688819c1ce533be9e674ab71e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -13,7 +13,7 @@ AC_CHECK_HEADERS(elf.h)
 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_MINGW, test $is_mingw = yes)
 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

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 58110ff4166e5221a6c17628c8addd08f011210e..c2d98033309200a4046a555227a230562de12abf 100644 (file)
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -51,6 +51,12 @@ else
 ECOSBOARDFILES =
 endif
 
+if MINIDRIVER
+DRIVERFILES =
+else
+DRIVERFILES = jtag_driver.c
+endif
+
 if AT91RM9200
 AT91RM9200FILES = at91rm9200.c
 else
@@ -111,7 +117,7 @@ endif
 
 libjtag_la_SOURCES = \
        jtag.c \
-       jtag_driver.c \
+       $(DRIVERFILES) \
        $(BITBANGFILES) \
        $(PARPORTFILES) \
        $(DUMMYFILES) \