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
This commit is contained in:
zwelch 2009-06-02 08:29:03 +00:00
parent 1d230b88d2
commit 34b6fc3ce4
2 changed files with 9 additions and 2 deletions

View File

@ -13,7 +13,7 @@ AC_CHECK_HEADERS(elf.h)
AC_CHECK_HEADERS(dirent.h) AC_CHECK_HEADERS(dirent.h)
AC_CHECK_HEADERS(fcntl.h) AC_CHECK_HEADERS(fcntl.h)
AC_CHECK_HEADERS(ifaddrs.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(malloc.h)
AC_CHECK_HEADERS(netdb.h) AC_CHECK_HEADERS(netdb.h)
AC_CHECK_HEADERS(netinet/in.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_WIN32, test $is_win32 = yes)
AM_CONDITIONAL(IS_DARWIN, test $is_darwin = yes) AM_CONDITIONAL(IS_DARWIN, test $is_darwin = yes)
AM_CONDITIONAL(BITQ, test $build_bitq = yes) AM_CONDITIONAL(BITQ, test $build_bitq = yes)
AM_CONDITIONAL(MINIDRIVER, test $build_minidriver = yes)
AC_LANG_C AC_LANG_C
AC_PROG_CC AC_PROG_CC

View File

@ -51,6 +51,12 @@ else
ECOSBOARDFILES = ECOSBOARDFILES =
endif endif
if MINIDRIVER
DRIVERFILES =
else
DRIVERFILES = jtag_driver.c
endif
if AT91RM9200 if AT91RM9200
AT91RM9200FILES = at91rm9200.c AT91RM9200FILES = at91rm9200.c
else else
@ -111,7 +117,7 @@ endif
libjtag_la_SOURCES = \ libjtag_la_SOURCES = \
jtag.c \ jtag.c \
jtag_driver.c \ $(DRIVERFILES) \
$(BITBANGFILES) \ $(BITBANGFILES) \
$(PARPORTFILES) \ $(PARPORTFILES) \
$(DUMMYFILES) \ $(DUMMYFILES) \