From cb2130f557508f9ec348322a644d5c57c13bd98f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnim=20L=C3=A4uger?= Date: Wed, 15 Jul 2009 12:50:33 +0000 Subject: [PATCH] first issue of [ 2807343 ] urjtag dependencies missing autoconf checks git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1657 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- jtag/ChangeLog | 5 +++++ jtag/configure.ac | 28 ++++++++++++++++++++++++++-- jtag/src/Makefile.am | 2 ++ urjtag/ChangeLog | 7 +++++++ urjtag/Makefile.am | 7 ++++++- urjtag/configure.ac | 28 ++++++++++++++++++++++++++-- 6 files changed, 72 insertions(+), 5 deletions(-) diff --git a/jtag/ChangeLog b/jtag/ChangeLog index 00be59c5..58fc4a50 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,5 +1,10 @@ 2009-07-15 Arnim Laeuger + * configure.ac, src/Makefile.am: first issue of + [ 2807343 ] urjtag dependencies missing autoconf checks + disabled SVF or disabled BSDL prevents potfile creation + when generated flex/bison files are missing + * src/flash/amd.c: [ 2806917 ] Atmel AT49BV322D flash support (MURANAKA Masaki) Work around flash chips that support multi byte write mode with a different programming algorithm. diff --git a/jtag/configure.ac b/jtag/configure.ac index 48e36701..f017b2d7 100644 --- a/jtag/configure.ac +++ b/jtag/configure.ac @@ -334,7 +334,7 @@ AS_IF([test "$LEX" = flex], [ dnl If the transformed svf_flex.c is already existing, it doesn't matter dnl that flex is too old for building the lexer. AS_IF([test "x$svf_lexer" = xfalse], [ - AS_IF([test -r src/svf/svf_flex.c], [ + AS_IF([test -r src/svf/svf_bison.h], [ svf_lexer=true ]) ]) @@ -353,13 +353,22 @@ AS_IF([test "x$svf" = xtrue], [ AC_DEFINE(ENABLE_SVF, 1, [define if SVF player is enabled]) ],[ AM_CONDITIONAL(ENABLE_SVF, false) + + # SVF is disabled, but the generated files are still required for + # POTFILES. They simply have to exist as empty files. + AS_IF([test ! -r src/svf/svf_flex.c], [ + touch src/svf/svf_flex.c + ]) + AS_IF([test ! -r src/svf/svf_bison.c], [ + touch src/svf/svf_bison.c + ]) ]) dnl If the transformed bsdl_flex.c is already existing, it doesn't matter dnl that flex is too old for building the lexer. AS_IF([test "x$bsdl_lexer" = xfalse], [ - AS_IF([test -r src/bsdl/bsdl_flex.c], [ + AS_IF([test -r src/bsdl/bsdl_bison.h], [ bsdl_lexer=true ]) ]) @@ -378,6 +387,21 @@ AS_IF([test "x$bsdl" = xtrue], [ AC_DEFINE(ENABLE_BSDL, 1, [define if BSDL subsystem is enabled]) ],[ AM_CONDITIONAL(ENABLE_BSDL, false) + + # BSDL is disabled, but the generated files are still required for + # POTFILES. They simply have to exist as empty files. + AS_IF([test ! -r src/bsdl/vhdl_flex.c], [ + touch src/bsdl/vhdl_flex.c + ]) + AS_IF([test ! -r src/bsdl/vhdl_bison.c], [ + touch src/bsdl/vhdl_bison.c + ]) + AS_IF([test ! -r src/bsdl/bsdl_flex.c], [ + touch src/bsdl/bsdl_flex.c + ]) + AS_IF([test ! -r src/bsdl/bsdl_bison.c], [ + touch src/bsdl/bsdl_bison.c + ]) ]) dnl Enable experimental brute-force JEDEC flash autodetection? diff --git a/jtag/src/Makefile.am b/jtag/src/Makefile.am index 44897b08..b9c33346 100644 --- a/jtag/src/Makefile.am +++ b/jtag/src/Makefile.am @@ -42,8 +42,10 @@ endif bin_PROGRAMS = \ jtag +if ENABLE_BSDL dist_bin_SCRIPTS = \ bsdl2jtag +endif jtag_SOURCES = \ jtag.c diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog index 76cb4396..8370a9cf 100644 --- a/urjtag/ChangeLog +++ b/urjtag/ChangeLog @@ -1,3 +1,10 @@ +2009-07-15 Arnim Laeuger + + * configure.ac, Makefile.am: first issue of + [ 2807343 ] urjtag dependencies missing autoconf checks + disabled SVF or disabled BSDL prevents potfile creation + when generated flex/bison files are missing + 2009-07-15 Arnim * src/flash/amd.c: [ 2806917 ] Atmel AT49BV322D flash support (MURANAKA Masaki) diff --git a/urjtag/Makefile.am b/urjtag/Makefile.am index 29a459f5..673330d4 100644 --- a/urjtag/Makefile.am +++ b/urjtag/Makefile.am @@ -32,10 +32,15 @@ SUBDIRS = \ if ENABLE_APPS SUBDIRS += \ - src/apps/jtag \ + src/apps/jtag + +if ENABLE_BSDL +SUBDIRS += \ src/apps/bsdl2jtag endif +endif + DIST_SUBDIRS = \ $(SUBDIRS) diff --git a/urjtag/configure.ac b/urjtag/configure.ac index f9adcec9..72fed018 100644 --- a/urjtag/configure.ac +++ b/urjtag/configure.ac @@ -376,7 +376,7 @@ AS_IF([test "$LEX" = flex], [ dnl If the transformed svf_flex.c is already existing, it doesn't matter dnl that flex is too old for building the lexer. AS_IF([test "x$svf_lexer" = xfalse], [ - AS_IF([test -r src/svf/svf_flex.c], [ + AS_IF([test -r src/svf/svf_bison.h], [ svf_lexer=true ]) ]) @@ -395,13 +395,22 @@ AS_IF([test "x$svf" = xtrue], [ AC_DEFINE(ENABLE_SVF, 1, [define if SVF player is enabled]) ],[ AM_CONDITIONAL(ENABLE_SVF, false) + + # SVF is disabled, but the generated files are still required for + # POTFILES. They simply have to exist as empty files. + AS_IF([test ! -r src/svf/svf_flex.c], [ + touch src/svf/svf_flex.c + ]) + AS_IF([test ! -r src/svf/svf_bison.c], [ + touch src/svf/svf_bison.c + ]) ]) dnl If the transformed bsdl_flex.c is already existing, it doesn't matter dnl that flex is too old for building the lexer. AS_IF([test "x$bsdl_lexer" = xfalse], [ - AS_IF([test -r src/bsdl/bsdl_flex.c], [ + AS_IF([test -r src/bsdl/bsdl_bison.h], [ bsdl_lexer=true ]) ]) @@ -420,6 +429,21 @@ AS_IF([test "x$bsdl" = xtrue], [ AC_DEFINE(ENABLE_BSDL, 1, [define if BSDL subsystem is enabled]) ],[ AM_CONDITIONAL(ENABLE_BSDL, false) + + # BSDL is disabled, but the generated files are still required for + # POTFILES. They simply have to exist as empty files. + AS_IF([test ! -r src/bsdl/vhdl_flex.c], [ + touch src/bsdl/vhdl_flex.c + ]) + AS_IF([test ! -r src/bsdl/vhdl_bison.c], [ + touch src/bsdl/vhdl_bison.c + ]) + AS_IF([test ! -r src/bsdl/bsdl_flex.c], [ + touch src/bsdl/bsdl_flex.c + ]) + AS_IF([test ! -r src/bsdl/bsdl_bison.c], [ + touch src/bsdl/bsdl_bison.c + ]) ]) dnl Enable experimental brute-force JEDEC flash autodetection?