diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog
index 75c66bb0..4ae2539b 100644
--- a/urjtag/ChangeLog
+++ b/urjtag/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-10  Jie Zhang  <jie.zhang@analog.com>
+
+  * src/bsdl/Makefile.am (vhdl_flex.$(OBJEXT), bsdl_flex.$(OBJEXT)):
+    Add prefix libbsdl_flex_la-.  Depend on vhdl_bison.h and
+    bsdl_bison.h instead of vhdl_bison.$(OBJEXT) and
+    bsdl_bison.$(OBJEXT).
+    (bsdl_bison.$(OBJEXT)): Depend bsdl_bison.h.
+  * src/svf/Makefile.am (svf_flex.$(OBJEXT)): Add prefix
+    libsvf_flex_la-.  Depend on svf_bison.h instead of
+    svf_bison.$(OBJEXT).
+
 2010-02-10  Jie Zhang  <jie.zhang@analog.com>
 
   * src/tap/usbconn/libftdx.h (URJ_USBCONN_FTDI_MAXRECV): Define
diff --git a/urjtag/src/bsdl/Makefile.am b/urjtag/src/bsdl/Makefile.am
index 08c44449..bf8b59aa 100644
--- a/urjtag/src/bsdl/Makefile.am
+++ b/urjtag/src/bsdl/Makefile.am
@@ -56,12 +56,12 @@ libbsdl_flex_la_CFLAGS = \
 # - all files depend on bsdl_config.h which dynamically generated
 # - *_flex files must be processed after their *_bison counterparts
 #   to ensure that *_bison.h is present
-vhdl_flex.$(OBJEXT): vhdl_bison.$(OBJEXT) bsdl_config.h
+libbsdl_flex_la-vhdl_flex.$(OBJEXT): vhdl_bison.h bsdl_config.h
 vhdl_bison.$(OBJEXT): bsdl_config.h
-bsdl_flex.$(OBJEXT): bsdl_bison.$(OBJEXT) bsdl_config.h
+libbsdl_flex_la-bsdl_flex.$(OBJEXT): bsdl_bison.h bsdl_config.h
 bsdl_bison.$(OBJEXT): bsdl_config.h
 bsdl.$(OBJEXT) : bsdl_config.h
-bsdl_sem.$(OBJEXT): bsdl_config.h
+bsdl_sem.$(OBJEXT): bsdl_bison.h bsdl_config.h
 
 vhdl_bison.h: vhdl_bison.c
 bsdl_bison.h: bsdl_bison.c
diff --git a/urjtag/src/svf/Makefile.am b/urjtag/src/svf/Makefile.am
index 27e3f81f..ce6df25b 100644
--- a/urjtag/src/svf/Makefile.am
+++ b/urjtag/src/svf/Makefile.am
@@ -36,7 +36,7 @@ libsvf_la_SOURCES = \
 libsvf_flex_la_SOURCES = \
 	svf_flex.l
 
-svf_flex.$(OBJEXT) svf.$(OBJEXT): svf_bison.$(OBJEXT)
+libsvf_flex_la-svf_flex.$(OBJEXT) svf.$(OBJEXT): svf_bison.h
 
 AM_CFLAGS = $(WARNINGCFLAGS)