From 0fd2feb82d9f412e6b5b28272da08ad6491c43eb Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Thu, 3 Sep 2009 22:11:21 +0000 Subject: [PATCH] Fix itbl-parse.h dependencies in gas. gas/: * Makefile.am (itbl-lex.o): Depend on itbl-parse.h. (itbl-ops.o, itbl-tops.o): Likewise. (itbl-parse.h): Use separate rule. * Makefile.in: Regenerate. --- gas/ChangeLog | 7 +++++++ gas/Makefile.am | 10 +++++++--- gas/Makefile.in | 10 +++++++--- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 6075397ec..b362bb8c6 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,10 @@ +2009-09-03 Ralf Wildenhues + + * Makefile.am (itbl-lex.o): Depend on itbl-parse.h. + (itbl-ops.o, itbl-tops.o): Likewise. + (itbl-parse.h): Use separate rule. + * Makefile.in: Regenerate. + 2009-09-03 Jie Zhang * config/tc-bfin.c (md_parse_option): Call as_fatal for bad diff --git a/gas/Makefile.am b/gas/Makefile.am index a76860f93..1f78c7106 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -627,7 +627,7 @@ endif # Disable -Werror, if it has been enabled, since old versions of bison/ # yacc will produce working code which contain compile time warnings. -itbl-lex.o: itbl-lex.c +itbl-lex.o: itbl-lex.c itbl-parse.h if am__fastdepCC $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f itbl-lex.c || echo $(srcdir)/`itbl-lex.c $(NO_WERROR) mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @@ -653,16 +653,20 @@ endif $(COMPILE) -c `test -f itbl-parse.c || echo $(srcdir)/`itbl-parse.c $(NO_WERROR) endif -itbl-parse.c itbl-parse.h: $(srcdir)/itbl-parse.y +itbl-parse.c: $(srcdir)/itbl-parse.y $(SHELL) $(YLWRAP) $(srcdir)/itbl-parse.y y.tab.c itbl-parse.c y.tab.h itbl-parse.h -- $(YACCCOMPILE) -d +itbl-parse.h: itbl-parse.c ; @true + +itbl-ops.o: itbl-parse.h + # stand-alone itbl assembler & disassembler EXTRA_PROGRAMS = itbl-test itbl_test_SOURCES = itbl-parse.y itbl-lex.l itbl_test_LDADD = itbl-tops.o itbl-test.o $(GASLIBS) @LEXLIB@ -itbl-tops.o: itbl-ops.c +itbl-tops.o: itbl-ops.c itbl-parse.h if am__fastdepCC $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -o $@ -c -DSTAND_ALONE $(srcdir)/itbl-ops.c mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po diff --git a/gas/Makefile.in b/gas/Makefile.in index 321788ea2..f473694d7 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -2518,7 +2518,7 @@ bfin-lex.o: bfin-lex.c # Disable -Werror, if it has been enabled, since old versions of bison/ # yacc will produce working code which contain compile time warnings. -itbl-lex.o: itbl-lex.c +itbl-lex.o: itbl-lex.c itbl-parse.h @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f itbl-lex.c || echo $(srcdir)/`itbl-lex.c $(NO_WERROR) @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='itbl-lex.c' object='$@' libtool=no @AMDEPBACKSLASH@ @@ -2534,10 +2534,14 @@ itbl-parse.o: itbl-parse.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `test -f itbl-parse.c || echo $(srcdir)/`itbl-parse.c $(NO_WERROR) -itbl-parse.c itbl-parse.h: $(srcdir)/itbl-parse.y +itbl-parse.c: $(srcdir)/itbl-parse.y $(SHELL) $(YLWRAP) $(srcdir)/itbl-parse.y y.tab.c itbl-parse.c y.tab.h itbl-parse.h -- $(YACCCOMPILE) -d -itbl-tops.o: itbl-ops.c +itbl-parse.h: itbl-parse.c ; @true + +itbl-ops.o: itbl-parse.h + +itbl-tops.o: itbl-ops.c itbl-parse.h @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -o $@ -c -DSTAND_ALONE $(srcdir)/itbl-ops.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='itbl-ops.c' object='$@' libtool=no @AMDEPBACKSLASH@ -- 2.11.4.GIT