diff options
| author | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-02 08:29:03 +0000 |
|---|---|---|
| committer | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-02 08:29:03 +0000 |
| commit | 34b6fc3ce4f8f0792032b83dea9973d8a637a888 (patch) | |
| tree | ac4bcfe78be5097e635b2428ba8f2c611ab79584 | |
| parent | 1d230b88d2079e4303816452b04d00da5a94756f (diff) | |
| download | openocd_libswd-34b6fc3ce4f8f0792032b83dea9973d8a637a888.tar.gz openocd_libswd-34b6fc3ce4f8f0792032b83dea9973d8a637a888.tar.bz2 openocd_libswd-34b6fc3ce4f8f0792032b83dea9973d8a637a888.tar.xz openocd_libswd-34b6fc3ce4f8f0792032b83dea9973d8a637a888.zip | |
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
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | src/jtag/Makefile.am | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 555874b2..451e9de5 100644 --- 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 58110ff4..c2d98033 100644 --- 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) \ |