From aabbdc31eae216e338a16d094768a385bfc34579 Mon Sep 17 00:00:00 2001 From: Jie Zhang Date: Wed, 10 Feb 2010 08:09:28 +0000 Subject: [PATCH] Fix parallel build issue. git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1776 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- urjtag/ChangeLog | 11 +++++++++++ urjtag/src/bsdl/Makefile.am | 6 +++--- urjtag/src/svf/Makefile.am | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) 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 + + * 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 * 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)