From 7e41967244f40444b201718d553503b957159e34 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 12 Jun 1998 23:36:05 +0000 Subject: [PATCH] * Makefile.am (HFILES): Remove config.h. (EMULATION_OFILES, POTFILES): Move patch of May 14 from Makefile.in to Makefile.am. (earmcoff.c): Depend upon armcoff.em, not generic.em. * po/Make-in (all-yes): Correct misspelling in $(PACKAGE). ($(srcdir)/$(PACKAGE).pot): Pass -C to $(XGETTEXT). * Makefile.in, po/POTFILES.in, po/ld.pot: Rebuild. --- ld/ChangeLog | 10 ++++++++++ ld/Makefile.am | 14 ++++++++++---- ld/Makefile.in | 14 ++++++++++---- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 68e4d100b7..23c80ba15d 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,13 @@ +Fri Jun 12 19:33:17 1998 Ian Lance Taylor + + * Makefile.am (HFILES): Remove config.h. + (EMULATION_OFILES, POTFILES): Move patch of May 14 from + Makefile.in to Makefile.am. + (earmcoff.c): Depend upon armcoff.em, not generic.em. + * po/Make-in (all-yes): Correct misspelling in $(PACKAGE). + ($(srcdir)/$(PACKAGE).pot): Pass -C to $(XGETTEXT). + * Makefile.in, po/POTFILES.in, po/ld.pot: Rebuild. + Fri Jun 12 13:43:17 1998 Tom Tromey * po/Make-in (all-yes): If maintainer mode, depend on .pot file. diff --git a/ld/Makefile.am b/ld/Makefile.am index a2ef39fc80..888eccf6d7 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -208,7 +208,7 @@ CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c \ ldmain.c ldmisc.c ldver.c ldwrite.c lexsup.c \ mri.c ldcref.c -HFILES = config.h ld.h ldctor.h ldemul.h ldexp.h ldfile.h \ +HFILES = ld.h ldctor.h ldemul.h ldexp.h ldfile.h \ ldlang.h ldlex.h ldmain.h ldmisc.h ldver.h \ ldwrite.h mri.h @@ -221,7 +221,12 @@ OFILES = ldgram.o ldlex.o lexsup.o ldlang.o mri.o ldctor.o ldmain.o \ STAGESTUFF = *.o ldscripts/* e*.c -POTFILES = $(CFILES) $(HFILES) +# At the moment this is just a list of those emulation template files +# that contain internationalised strings. +EMULATION_FILES = emultempl/pe.em emultempl/armcoff.em + +POTFILES = $(CFILES) $(HFILES) $(EMULATION_FILES) + po/POTFILES.in: @MAINT@ Makefile for file in $(POTFILES); do echo $$file; done | sort > tmp \ && mv tmp $(srcdir)/po/POTFILES.in @@ -272,7 +277,7 @@ earmaoutl.c: $(srcdir)/emulparams/armaoutl.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS} ${GENSCRIPTS} armaoutl "$(tdir_armaoutl)" earmcoff.c: $(srcdir)/emulparams/armcoff.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armcoff.sc ${GEN_DEPENDS} + $(srcdir)/emultempl/armcoff.em $(srcdir)/scripttempl/armcoff.sc ${GEN_DEPENDS} ${GENSCRIPTS} armcoff "$(tdir_armcoff)" earmpe.c: $(srcdir)/emulparams/armpe.sh \ $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS} @@ -603,7 +608,8 @@ check-DEJAGNU: site.exp CXX="$(CXX_FOR_TARGET)" CXXFLAGS="$(CXXFLAGS)" \ CC_FOR_HOST="$(CC)" CFLAGS_FOR_HOST="$(CFLAGS)" \ OFILES="$(OFILES)" BFDLIB="$(TESTBFDLIB)" \ - LIBIBERTY="$(LIBIBERTY)" HOSTING_EMU="$(HOSTING_EMU)" \ + LIBIBERTY="$(LIBIBERTY) $(INTLLIBS)" \ + HOSTING_EMU="$(HOSTING_EMU)" \ HOSTING_CRT0="$(HOSTING_CRT0)" HOSTING_LIBS="$(HOSTING_LIBS)" \ $(RUNTESTFLAGS); \ else echo "WARNING: could not find \`runtest'" 1>&2; :;\ diff --git a/ld/Makefile.in b/ld/Makefile.in index a11292beea..564dfe0c9c 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -279,7 +279,7 @@ CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c \ ldmain.c ldmisc.c ldver.c ldwrite.c lexsup.c \ mri.c ldcref.c -HFILES = config.h ld.h ldctor.h ldemul.h ldexp.h ldfile.h \ +HFILES = ld.h ldctor.h ldemul.h ldexp.h ldfile.h \ ldlang.h ldlex.h ldmain.h ldmisc.h ldver.h \ ldwrite.h mri.h @@ -292,7 +292,11 @@ OFILES = ldgram.o ldlex.o lexsup.o ldlang.o mri.o ldctor.o ldmain.o \ STAGESTUFF = *.o ldscripts/* e*.c -POTFILES = $(CFILES) $(HFILES) +# At the moment this is just a list of those emulation template files +# that contain internationalised strings. +EMULATION_FILES = emultempl/pe.em emultempl/armcoff.em + +POTFILES = $(CFILES) $(HFILES) $(EMULATION_FILES) # These all start with e so 'make clean' can find them. @@ -845,6 +849,7 @@ install uninstall all installdirs mostlyclean-generic distclean-generic \ clean-generic maintainer-clean-generic clean mostlyclean distclean \ maintainer-clean + po/POTFILES.in: @MAINT@ Makefile for file in $(POTFILES); do echo $$file; done | sort > tmp \ && mv tmp $(srcdir)/po/POTFILES.in @@ -890,7 +895,7 @@ earmaoutl.c: $(srcdir)/emulparams/armaoutl.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS} ${GENSCRIPTS} armaoutl "$(tdir_armaoutl)" earmcoff.c: $(srcdir)/emulparams/armcoff.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armcoff.sc ${GEN_DEPENDS} + $(srcdir)/emultempl/armcoff.em $(srcdir)/scripttempl/armcoff.sc ${GEN_DEPENDS} ${GENSCRIPTS} armcoff "$(tdir_armcoff)" earmpe.c: $(srcdir)/emulparams/armpe.sh \ $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS} @@ -1213,7 +1218,8 @@ check-DEJAGNU: site.exp CXX="$(CXX_FOR_TARGET)" CXXFLAGS="$(CXXFLAGS)" \ CC_FOR_HOST="$(CC)" CFLAGS_FOR_HOST="$(CFLAGS)" \ OFILES="$(OFILES)" BFDLIB="$(TESTBFDLIB)" \ - LIBIBERTY="$(LIBIBERTY)" HOSTING_EMU="$(HOSTING_EMU)" \ + LIBIBERTY="$(LIBIBERTY) $(INTLLIBS)" \ + HOSTING_EMU="$(HOSTING_EMU)" \ HOSTING_CRT0="$(HOSTING_CRT0)" HOSTING_LIBS="$(HOSTING_LIBS)" \ $(RUNTESTFLAGS); \ else echo "WARNING: could not find \`runtest'" 1>&2; :;\ -- 2.34.1