On Sat, Jun 11, 2011 at 11:46 PM, Mike Frysinger <[email protected]> wrote:
> On Saturday, June 11, 2011 23:32:07 Jie Zhang wrote:
>> On Sat, Jun 11, 2011 at 9:44 PM, Mike Frysinger <[email protected]> wrote:
>> > On Saturday, June 11, 2011 21:28:30 Jie Zhang wrote:
>> >> On Sat, Jun 11, 2011 at 7:20 PM, Mike Frysinger wrote:
>> >> > --- Makefile.am (revision 1907)
>> >> > +++ Makefile.am (working copy)
>> >> > @@ -55,12 +55,8 @@ 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
>> >> > -libbsdl_flex_la-vhdl_flex.$(OBJEXT): vhdl_bison.h bsdl_config.h
>> >> > -vhdl_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_bison.h bsdl_config.h
>> >> > +$(libbsdl_la_OBJECTS) $(libbsdl_flex_la_OBJECTS): \
>> >> > + bsdl_bison.h bsdl_config.h vhdl_bison.h
>> >> >
>> >> > vhdl_bison.h: vhdl_bison.c
>> >> > bsdl_bison.h: bsdl_bison.c
>> >>
>> >> Will this introduce some unnecessary dependencies?
>> >
>> > probably, but i dont think it matters
>>
>> I think overriding OBJEXT is a little better. At least we will have
>> accurate dependencies.
>
> that was removed because it was breaking things (and why i made the previously
> mentioned commit in the first place). it cannot be readded.
>
I saw the log of that commit was "drop OBJEXT override from bison
subdirs as it doesn't seem to be needed". It didn't mention it was for
fixing some issue. Finally I found what that commit was for from the
mailing list.
Attached is a patch which should keep the dependencies accurate
without reintroducing the issue the user reported: "remove *.lo
twice". The idea comes from BFD.
Regards,
Jie
2011-06-12 Jie Zhang <[email protected]>
* src/bsdl/Makefile.am (libbsdl_flex_la_CFLAGS): Remove.
(libbsdl_flex_la-vhdl_flex.$(OBJEXT)): Remove.
(vhdl_bison.$(OBJEXT)): Remove.
(libbsdl_flex_la-bsdl_flex.$(OBJEXT)): Remove.
(bsdl_bison.$(OBJEXT)): Remove.
(bsdl.$(OBJEXT)): Remove.
(bsdl_sem.$(OBJEXT)): Remove.
(vhdl_flex.lo): New target.
(vhdl_bison.lo): New target.
(bsdl_flex.lo): New target.
(bsdl_bison.lo): New target.
(bsdl.lo): New target.
(bsdl_sem.lo): New target.
* src/svf/Makefile.am (libsvf_flex_la_CFLAGS): Remove.
(libsvf_flex_la-svf_flex.$(OBJEXT) svf.$(OBJEXT)): Remove.
(svf_flex.lo): New target.
(svf.lo): New target.
Index: src/bsdl/Makefile.am
===================================================================
--- src/bsdl/Makefile.am (revision 1908)
+++ src/bsdl/Makefile.am (working copy)
@@ -47,20 +47,87 @@
AM_CFLAGS = $(WARNINGCFLAGS)
-libbsdl_flex_la_CFLAGS = \
- $(AM_CFLAGS) \
- -Wno-error
-
# additional dependencies
# - 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
-libbsdl_flex_la-vhdl_flex.$(OBJEXT): vhdl_bison.h bsdl_config.h
-vhdl_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_bison.h bsdl_config.h
+vhdl_flex.lo: vhdl_flex.c vhdl_bison.h bsdl_config.h
+if am__fastdepCC
+ $(AM_V_CC)$(LTCOMPILE) -Wno-error -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+else
+ $(AM_V_CC) @AM_BACKSLASH@
+if AMDEP
+ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif
+ $(LTCOMPILE) -Wno-error -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+endif
+
+vhdl_bison.lo: vhdl_bison.c bsdl_config.h
+if am__fastdepCC
+ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+else
+ $(AM_V_CC) @AM_BACKSLASH@
+if AMDEP
+ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif
+ $(LTCOMPILE) -c -o $@ $<
+endif
+
+bsdl_flex.lo: bsdl_flex.c bsdl_bison.h bsdl_config.h
+if am__fastdepCC
+ $(AM_V_CC)$(LTCOMPILE) -Wno-error -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+else
+ $(AM_V_CC) @AM_BACKSLASH@
+if AMDEP
+ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif
+ $(LTCOMPILE) -Wno-error -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+endif
+
+bsdl_bison.lo: bsdl_bison.c bsdl_config.h
+if am__fastdepCC
+ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+else
+ $(AM_V_CC) @AM_BACKSLASH@
+if AMDEP
+ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif
+ $(LTCOMPILE) -c -o $@ $<
+endif
+
+bsdl.lo: bsdl.c bsdl_config.h
+if am__fastdepCC
+ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+else
+ $(AM_V_CC) @AM_BACKSLASH@
+if AMDEP
+ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif
+ $(LTCOMPILE) -c -o $@ $<
+endif
+
+bsdl_sem.lo: bsdl_sem.c bsdl_bison.h bsdl_config.h
+if am__fastdepCC
+ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+else
+ $(AM_V_CC) @AM_BACKSLASH@
+if AMDEP
+ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif
+ $(LTCOMPILE) -c -o $@ $<
+endif
vhdl_bison.h: vhdl_bison.c
bsdl_bison.h: bsdl_bison.c
Index: src/svf/Makefile.am
===================================================================
--- src/svf/Makefile.am (revision 1908)
+++ src/svf/Makefile.am (working copy)
@@ -35,13 +35,34 @@
libsvf_flex_la_SOURCES = \
svf_flex.l
-libsvf_flex_la-svf_flex.$(OBJEXT) svf.$(OBJEXT): svf_bison.h
-
AM_CFLAGS = $(WARNINGCFLAGS)
-libsvf_flex_la_CFLAGS = \
- $(AM_CFLAGS) \
- -Wno-error
+
+svf_flex.lo: svf_flex.c svf_bison.h
+if am__fastdepCC
+ $(AM_V_CC)$(LTCOMPILE) -Wno-error -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+else
+ $(AM_V_CC) @AM_BACKSLASH@
+if AMDEP
+ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif
+ $(LTCOMPILE) -Wno-error -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+endif
+
+svf.lo: svf.c svf_bison.h
+if am__fastdepCC
+ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+else
+ $(AM_V_CC) @AM_BACKSLASH@
+if AMDEP
+ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif
+ $(LTCOMPILE) -c -o $@ $<
+endif
svf_bison.h: svf_bison.c
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
UrJTAG-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/urjtag-development
