diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2000-07-01 19:26:41 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2000-07-01 19:26:41 +0000 |
| commit | 677980338198b6fd94c7a653a5d9dcd1a34fe1ec (patch) | |
| tree | afb1acf05f9fbde3fed57f40d56b978b306303a3 | |
| parent | 944e5c61c8aa67f917e3c3bb8c4ce1cc53941f4b (diff) | |
| download | gdb-677980338198b6fd94c7a653a5d9dcd1a34fe1ec.zip gdb-677980338198b6fd94c7a653a5d9dcd1a34fe1ec.tar.gz gdb-677980338198b6fd94c7a653a5d9dcd1a34fe1ec.tar.bz2 | |
2000-07-01 H.J. Lu <hjl@gnu.org>
* Makefile.am (EXTRA_ld_new_SOURCES): Set to deffilep.y for
automake to use YLWRAP.
* Makefile.in: Rebuild.
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/Makefile.am | 3 | ||||
| -rw-r--r-- | ld/Makefile.in | 18 |
3 files changed, 19 insertions, 8 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index e3dbbea..ca14c93 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2000-07-01 H.J. Lu <hjl@gnu.org> + + * Makefile.am (EXTRA_ld_new_SOURCES): Set to deffilep.y for + automake to use YLWRAP. + * Makefile.in: Rebuild. + 2000-07-01 Alan Modra <alan@linuxcare.com.au> * Makefile.am (DEP): Fix 2000-06-22. grep after running dep.sed diff --git a/ld/Makefile.am b/ld/Makefile.am index cbb1503..6b2a8c4 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -734,6 +734,9 @@ ez8002.c: $(srcdir)/emulparams/z8002.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/z8000.sc ${GEN_DEPENDS} ${GENSCRIPTS} z8002 "$(tdir_z8002)" +# We need this for automake to use YLWRAP. +EXTRA_ld_new_SOURCES = deffilep.y + ld_new_SOURCES = ldgram.y ldlex.l lexsup.c ldlang.c mri.c ldctor.c ldmain.c \ ldwrite.c ldexp.c ldemul.c ldver.c ldmisc.c ldfile.c ldcref.c ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBIBERTY) $(INTLDEPS) diff --git a/ld/Makefile.in b/ld/Makefile.in index 662da17..4f9a310 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -382,6 +382,9 @@ POTFILES = $(CFILES) $(HFILES) $(EMULATION_FILES) GENSCRIPTS = $(SHELL) $(srcdir)/genscripts.sh ${srcdir} ${libdir} @host@ @target@ @target_alias@ "@EMULATION_LIBPATH@" "@NATIVE_LIB_DIRS@" GEN_DEPENDS = $(srcdir)/genscripts.sh stringify.sed +# We need this for automake to use YLWRAP. +EXTRA_ld_new_SOURCES = deffilep.y + ld_new_SOURCES = ldgram.y ldlex.l lexsup.c ldlang.c mri.c ldctor.c ldmain.c \ ldwrite.c ldexp.c ldemul.c ldver.c ldmisc.c ldfile.c ldcref.c @@ -420,6 +423,7 @@ ldmain.o ldwrite.o ldexp.o ldemul.o ldver.o ldmisc.o ldfile.o ldcref.o ld_new_LDFLAGS = LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LEXLIB = @LEXLIB@ +YLWRAP = $(top_srcdir)/../ylwrap CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -436,14 +440,14 @@ MANS = $(man_MANS) NROFF = nroff DIST_COMMON = README ./stamp-h.in ChangeLog Makefile.am Makefile.in \ NEWS TODO acinclude.m4 aclocal.m4 config.in configure configure.in \ -ldgram.c ldlex.c +deffilep.c ldgram.c ldlex.c DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best -SOURCES = $(ld_new_SOURCES) +SOURCES = $(ld_new_SOURCES) $(EXTRA_ld_new_SOURCES) OBJECTS = $(ld_new_OBJECTS) all: all-redirect @@ -542,10 +546,8 @@ ld-new$(EXEEXT): $(ld_new_OBJECTS) $(ld_new_DEPENDENCIES) .l.c: $(LEX) $(AM_LFLAGS) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).c $@ .y.c: - $(YACC) $(AM_YFLAGS) $(YFLAGS) $< && mv y.tab.c $*.c - if test -f y.tab.h; then \ - if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \ - else :; fi + $(SHELL) $(YLWRAP) "$(YACC)" $< y.tab.c $*.c y.tab.h $*.h -- $(AM_YFLAGS) $(YFLAGS) +deffilep.h: deffilep.c ldgram.h: ldgram.c @@ -916,7 +918,7 @@ distclean-generic: -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: - -test -z "ldlexlldgramhldgramc$(MAINTAINERCLEANFILES)" || rm -f ldlexl ldgramh ldgramc $(MAINTAINERCLEANFILES) + -test -z "ldlexldeffilephdeffilepcldgramhldgramc$(MAINTAINERCLEANFILES)" || rm -f ldlexl deffileph deffilepc ldgramh ldgramc $(MAINTAINERCLEANFILES) mostlyclean-am: mostlyclean-hdr mostlyclean-noinstPROGRAMS \ mostlyclean-compile mostlyclean-libtool \ mostlyclean-aminfo mostlyclean-tags mostlyclean-generic \ |