From 32118081351da7f2e122ba3f0e4bd2493cafdd28 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 30 Nov 2004 17:20:48 +0000 Subject: [PATCH] Change LOCALEDIR to $(datadir)/share. --- binutils/ChangeLog | 5 + binutils/Makefile.am | 2 +- binutils/Makefile.in | 134 ++++++++++++----- binutils/doc/Makefile.in | 8 +- gas/ChangeLog | 5 + gas/Makefile.am | 4 +- gas/Makefile.in | 4 +- gprof/ChangeLog | 5 + gprof/Makefile.am | 2 +- gprof/Makefile.in | 4 +- gprof/aclocal.m4 | 4 +- intl/ChangeLog | 4 + intl/Makefile.in | 2 +- ld/ChangeLog | 5 + ld/Makefile.am | 2 +- ld/Makefile.in | 370 +++-------------------------------------------- 16 files changed, 163 insertions(+), 397 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 352c489..d193140 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2004-11-30 Tero Niemela + + * Makefile.am: Change LOCALEDIR to $(datadir)/share. + * Makefile.in: Regenerate. + 2004-11-10 Ian Lance Taylor PR binutils/536 diff --git a/binutils/Makefile.am b/binutils/Makefile.am index 5a8677d..a47f235 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -75,7 +75,7 @@ INCLUDES = -D_GNU_SOURCE \ -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ @HDEFINES@ \ -I$(srcdir)/../intl -I../intl \ - -DLOCALEDIR="\"$(prefix)/share/locale\"" \ + -DLOCALEDIR="\"$(datadir)/locale\"" \ -Dbin_dummy_emulation=$(EMULATION_VECTOR) HFILES = \ diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 9412327..357cf5e 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -64,23 +64,68 @@ host_triplet = @host@ target_alias = @target_alias@ target_triplet = @target@ AR = @AR@ +AS = @AS@ BUILD_DLLTOOL = @BUILD_DLLTOOL@ BUILD_DLLWRAP = @BUILD_DLLWRAP@ BUILD_MISC = @BUILD_MISC@ BUILD_NLMCONV = @BUILD_NLMCONV@ BUILD_SRCONV = @BUILD_SRCONV@ BUILD_WINDRES = @BUILD_WINDRES@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CPP = @CPP@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +DATADIRNAME = @DATADIRNAME@ DEMANGLER_NAME = @DEMANGLER_NAME@ +DLLTOOL = @DLLTOOL@ DLLTOOL_DEFS = @DLLTOOL_DEFS@ EMULATION = @EMULATION@ EMULATION_VECTOR = @EMULATION_VECTOR@ EXEEXT = @EXEEXT@ +GCJ = @GCJ@ +GCJFLAGS = @GCJFLAGS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GNATBIND = @GNATBIND@ +GT_NO = @GT_NO@ +GT_YES = @GT_YES@ HDEFINES = @HDEFINES@ +INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ +INSTOBJEXT = @INSTOBJEXT@ +INTLDEPS = @INTLDEPS@ +INTLOBJS = @INTLOBJS@ LIBTOOL = @LIBTOOL@ +LN = @LN@ +LN_S = @LN_S@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ NLMCONV_DEFS = @NLMCONV_DEFS@ +OBJDUMP = @OBJDUMP@ OBJDUMP_DEFS = @OBJDUMP_DEFS@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +POFILES = @POFILES@ +POSUB = @POSUB@ RANLIB = @RANLIB@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +bfdincludedir = @bfdincludedir@ +bfdlibdir = @bfdlibdir@ +build_noncanonical = @build_noncanonical@ +build_subdir = @build_subdir@ +do_compare = @do_compare@ +host_noncanonical = @host_noncanonical@ +host_subdir = @host_subdir@ +l = @l@ +ncn_cv_ = @ncn_cv_@ +target_noncanonical = @target_noncanonical@ +target_subdir = @target_subdir@ INTLLIBS = @INTLLIBS@ @@ -151,7 +196,7 @@ INCLUDES = -D_GNU_SOURCE \ -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ @HDEFINES@ \ -I$(srcdir)/../intl -I../intl \ - -DLOCALEDIR="\"$(prefix)/share/locale\"" \ + -DLOCALEDIR="\"$(datadir)/locale\"" \ -Dbin_dummy_emulation=$(EMULATION_VECTOR) @@ -284,6 +329,7 @@ DISTCLEANFILES = sysinfo sysroff.c sysroff.h \ MOSTLYCLEANFILES = sysinfo binutils.log binutils.sum abcdefgh* CLEANFILES = dep.sed DEP DEPA DEP1 DEP2 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = @@ -299,77 +345,96 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I. CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -nlmconv_OBJECTS = nlmconv.o nlmheader.o bucomm.o version.o filemode.o +nlmconv_OBJECTS = nlmconv.$(OBJEXT) nlmheader.$(OBJEXT) \ +bucomm.$(OBJEXT) version.$(OBJEXT) filemode.$(OBJEXT) nlmconv_LDADD = $(LDADD) nlmconv_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a nlmconv_LDFLAGS = -srconv_OBJECTS = srconv.o coffgrok.o bucomm.o version.o filemode.o +srconv_OBJECTS = srconv.$(OBJEXT) coffgrok.$(OBJEXT) bucomm.$(OBJEXT) \ +version.$(OBJEXT) filemode.$(OBJEXT) srconv_LDADD = $(LDADD) srconv_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a srconv_LDFLAGS = -sysdump_OBJECTS = sysdump.o bucomm.o version.o filemode.o +sysdump_OBJECTS = sysdump.$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) \ +filemode.$(OBJEXT) sysdump_LDADD = $(LDADD) sysdump_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a sysdump_LDFLAGS = -coffdump_OBJECTS = coffdump.o coffgrok.o bucomm.o version.o filemode.o +coffdump_OBJECTS = coffdump.$(OBJEXT) coffgrok.$(OBJEXT) \ +bucomm.$(OBJEXT) version.$(OBJEXT) filemode.$(OBJEXT) coffdump_LDADD = $(LDADD) coffdump_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a coffdump_LDFLAGS = -dlltool_OBJECTS = dlltool.o defparse.o deflex.o bucomm.o version.o \ -filemode.o +dlltool_OBJECTS = dlltool.$(OBJEXT) defparse.$(OBJEXT) deflex.$(OBJEXT) \ +bucomm.$(OBJEXT) version.$(OBJEXT) filemode.$(OBJEXT) dlltool_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a dlltool_LDFLAGS = -windres_OBJECTS = windres.o resrc.o rescoff.o resbin.o rcparse.o \ -rclex.o winduni.o resres.o bucomm.o version.o filemode.o +windres_OBJECTS = windres.$(OBJEXT) resrc.$(OBJEXT) rescoff.$(OBJEXT) \ +resbin.$(OBJEXT) rcparse.$(OBJEXT) rclex.$(OBJEXT) winduni.$(OBJEXT) \ +resres.$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) filemode.$(OBJEXT) windres_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a windres_LDFLAGS = -dllwrap_OBJECTS = dllwrap.o version.o +dllwrap_OBJECTS = dllwrap.$(OBJEXT) version.$(OBJEXT) dllwrap_DEPENDENCIES = ../libiberty/libiberty.a dllwrap_LDFLAGS = -size_OBJECTS = size.o bucomm.o version.o filemode.o +size_OBJECTS = size.$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) \ +filemode.$(OBJEXT) size_LDADD = $(LDADD) size_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a size_LDFLAGS = -objdump_OBJECTS = objdump.o budemang.o prdbg.o rddbg.o debug.o stabs.o \ -ieee.o rdcoff.o bucomm.o version.o filemode.o +objdump_OBJECTS = objdump.$(OBJEXT) budemang.$(OBJEXT) prdbg.$(OBJEXT) \ +rddbg.$(OBJEXT) debug.$(OBJEXT) stabs.$(OBJEXT) ieee.$(OBJEXT) \ +rdcoff.$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) filemode.$(OBJEXT) objdump_DEPENDENCIES = ../opcodes/libopcodes.la ../bfd/libbfd.la \ ../libiberty/libiberty.a objdump_LDFLAGS = -ar_OBJECTS = arparse.o arlex.o ar.o not-ranlib.o arsup.o rename.o \ -binemul.o emul_$(EMULATION).o bucomm.o version.o filemode.o +ar_OBJECTS = arparse.$(OBJEXT) arlex.$(OBJEXT) ar.$(OBJEXT) \ +not-ranlib.$(OBJEXT) arsup.$(OBJEXT) rename.$(OBJEXT) binemul.$(OBJEXT) \ +emul_$(EMULATION).$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) \ +filemode.$(OBJEXT) ar_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a ar_LDFLAGS = -strings_OBJECTS = strings.o bucomm.o version.o filemode.o +strings_OBJECTS = strings.$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) \ +filemode.$(OBJEXT) strings_LDADD = $(LDADD) strings_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a strings_LDFLAGS = -ranlib_OBJECTS = ar.o is-ranlib.o arparse.o arlex.o arsup.o rename.o \ -binemul.o emul_$(EMULATION).o bucomm.o version.o filemode.o +ranlib_OBJECTS = ar.$(OBJEXT) is-ranlib.$(OBJEXT) arparse.$(OBJEXT) \ +arlex.$(OBJEXT) arsup.$(OBJEXT) rename.$(OBJEXT) binemul.$(OBJEXT) \ +emul_$(EMULATION).$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) \ +filemode.$(OBJEXT) ranlib_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a ranlib_LDFLAGS = -objcopy_OBJECTS = objcopy.o not-strip.o rename.o rddbg.o debug.o \ -stabs.o ieee.o rdcoff.o wrstabs.o bucomm.o version.o filemode.o +objcopy_OBJECTS = objcopy.$(OBJEXT) not-strip.$(OBJEXT) \ +rename.$(OBJEXT) rddbg.$(OBJEXT) debug.$(OBJEXT) stabs.$(OBJEXT) \ +ieee.$(OBJEXT) rdcoff.$(OBJEXT) wrstabs.$(OBJEXT) bucomm.$(OBJEXT) \ +version.$(OBJEXT) filemode.$(OBJEXT) objcopy_LDADD = $(LDADD) objcopy_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a objcopy_LDFLAGS = -addr2line_OBJECTS = addr2line.o budemang.o bucomm.o version.o \ -filemode.o +addr2line_OBJECTS = addr2line.$(OBJEXT) budemang.$(OBJEXT) \ +bucomm.$(OBJEXT) version.$(OBJEXT) filemode.$(OBJEXT) addr2line_LDADD = $(LDADD) addr2line_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a addr2line_LDFLAGS = -readelf_OBJECTS = readelf.o version.o unwind-ia64.o +readelf_OBJECTS = readelf.$(OBJEXT) version.$(OBJEXT) \ +unwind-ia64.$(OBJEXT) readelf_DEPENDENCIES = ../libiberty/libiberty.a readelf_LDFLAGS = -nm_new_OBJECTS = nm.o budemang.o bucomm.o version.o filemode.o +nm_new_OBJECTS = nm.$(OBJEXT) budemang.$(OBJEXT) bucomm.$(OBJEXT) \ +version.$(OBJEXT) filemode.$(OBJEXT) nm_new_LDADD = $(LDADD) nm_new_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a nm_new_LDFLAGS = -strip_new_OBJECTS = objcopy.o is-strip.o rename.o rddbg.o debug.o \ -stabs.o ieee.o rdcoff.o wrstabs.o bucomm.o version.o filemode.o +strip_new_OBJECTS = objcopy.$(OBJEXT) is-strip.$(OBJEXT) \ +rename.$(OBJEXT) rddbg.$(OBJEXT) debug.$(OBJEXT) stabs.$(OBJEXT) \ +ieee.$(OBJEXT) rdcoff.$(OBJEXT) wrstabs.$(OBJEXT) bucomm.$(OBJEXT) \ +version.$(OBJEXT) filemode.$(OBJEXT) strip_new_LDADD = $(LDADD) strip_new_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a strip_new_LDFLAGS = -cxxfilt_OBJECTS = cxxfilt.o bucomm.o version.o filemode.o +cxxfilt_OBJECTS = cxxfilt.$(OBJEXT) bucomm.$(OBJEXT) version.$(OBJEXT) \ +filemode.$(OBJEXT) cxxfilt_LDADD = $(LDADD) cxxfilt_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a cxxfilt_LDFLAGS = @@ -382,12 +447,9 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $ CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = README ./stamp-h.in ChangeLog Makefile.am Makefile.in \ -NEWS acinclude.m4 arlex.c arparse.c config.in configure configure.in \ -deflex.c defparse.c nlmheader.c rclex.c rcparse.c - +NEWS acinclude.m4 aclocal.m4 arlex.c arparse.c config.in configure \ +configure.in deflex.c defparse.c nlmheader.c rclex.c rcparse.c -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -398,7 +460,7 @@ OBJECTS = $(nlmconv_OBJECTS) $(srconv_OBJECTS) $(sysdump_OBJECTS) $(coffdump_OBJ all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .l .lo .o .s .y +.SUFFIXES: .S .c .l .lo .o .obj .s .y $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile @@ -479,6 +541,11 @@ maintainer-clean-noinstPROGRAMS: .c.o: $(COMPILE) -c $< +# FIXME: We should only use cygpath when building on Windows, +# and only if it is available. +.c.obj: + $(COMPILE) -c `cygpath -w $<` + .s.o: $(COMPILE) -c $< @@ -487,6 +554,7 @@ maintainer-clean-noinstPROGRAMS: mostlyclean-compile: -rm -f *.o core *.core + -rm -f *.$(OBJEXT) clean-compile: diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in index dfa5f3a..7ce979e 100644 --- a/binutils/doc/Makefile.in +++ b/binutils/doc/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -189,7 +189,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -275,7 +275,7 @@ uninstall-info: else ii=; fi; \ list='$(INFO_DEPS)'; \ for file in $$list; do \ - test -z "$$ii" \ + test -z "$ii" \ || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ done @$(NORMAL_UNINSTALL) diff --git a/gas/ChangeLog b/gas/ChangeLog index 1e3c070..80c3266 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2004-11-30 Tero Niemela + + * Makefile.am: Change LOCALEDIR to $(datadir)/share. + * Makefile.in: Regenerate. + 2004-11-29 Tomer Levi * config/tc-crx.c: Major code cleanup. Remove unused variables and functions, diff --git a/gas/Makefile.am b/gas/Makefile.am index 71956d3..f9bd1f6 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -491,13 +491,13 @@ INCDIR = $(BASEDIR)/include # Both . and srcdir are used, in that order, # so that tm.h and config.h will be found in the compilation # subdirectory rather than in the source directory. -INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config -I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR) -I$(srcdir)/../intl -I../intl -DLOCALEDIR="\"$(prefix)/share/locale\"" +INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config -I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR) -I$(srcdir)/../intl -I../intl -DLOCALEDIR="\"$(datadir)/locale\"" # This should be parallel to INCLUDES, but should replace $(srcdir) # with $${srcdir}, and should work in a subdirectory. This is used # when building dependencies, because the dependency building is done # in a subdirectory. -DEP_INCLUDES = -D_GNU_SOURCE -I.. -I$${srcdir} -I../../bfd -I$${srcdir}/config -I$${srcdir}/../include -I$${srcdir}/.. -I$${srcdir}/../bfd -I$${srcdir}/../intl -I../../intl -DLOCALEDIR="\"$(prefix)/share/locale\"" +DEP_INCLUDES = -D_GNU_SOURCE -I.. -I$${srcdir} -I../../bfd -I$${srcdir}/config -I$${srcdir}/../include -I$${srcdir}/.. -I$${srcdir}/../bfd -I$${srcdir}/../intl -I../../intl -DLOCALEDIR="\"$(datadir)/locale\"" DEP_FLAGS = -DBFD_ASSEMBLER -DOBJ_MAYBE_ELF \ -I. -I.. -I$${srcdir} -I../../bfd $(DEP_INCLUDES) diff --git a/gas/Makefile.in b/gas/Makefile.in index 4a94899..fe24efe 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -701,13 +701,13 @@ INCDIR = $(BASEDIR)/include # Both . and srcdir are used, in that order, # so that tm.h and config.h will be found in the compilation # subdirectory rather than in the source directory. -INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config -I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR) -I$(srcdir)/../intl -I../intl -DLOCALEDIR="\"$(prefix)/share/locale\"" +INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config -I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR) -I$(srcdir)/../intl -I../intl -DLOCALEDIR="\"$(datadir)/locale\"" # This should be parallel to INCLUDES, but should replace $(srcdir) # with $${srcdir}, and should work in a subdirectory. This is used # when building dependencies, because the dependency building is done # in a subdirectory. -DEP_INCLUDES = -D_GNU_SOURCE -I.. -I$${srcdir} -I../../bfd -I$${srcdir}/config -I$${srcdir}/../include -I$${srcdir}/.. -I$${srcdir}/../bfd -I$${srcdir}/../intl -I../../intl -DLOCALEDIR="\"$(prefix)/share/locale\"" +DEP_INCLUDES = -D_GNU_SOURCE -I.. -I$${srcdir} -I../../bfd -I$${srcdir}/config -I$${srcdir}/../include -I$${srcdir}/.. -I$${srcdir}/../bfd -I$${srcdir}/../intl -I../../intl -DLOCALEDIR="\"$(datadir)/locale\"" DEP_FLAGS = -DBFD_ASSEMBLER -DOBJ_MAYBE_ELF \ -I. -I.. -I$${srcdir} -I../../bfd $(DEP_INCLUDES) diff --git a/gprof/ChangeLog b/gprof/ChangeLog index 7c6448b..310a395 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,3 +1,8 @@ +2004-11-30 Tero Niemela + + * Makefile.am: Change LOCALEDIR to $(datadir)/share. + * Makefile.in: Regenerate. + 2004-09-17 Alan Modra * Makefile.in: Regenerate. diff --git a/gprof/Makefile.am b/gprof/Makefile.am index 95b03f6..a13a215 100644 --- a/gprof/Makefile.am +++ b/gprof/Makefile.am @@ -15,7 +15,7 @@ AM_CFLAGS = $(WARN_CFLAGS) MKDEP = gcc -MM -INCLUDES = -D_GNU_SOURCE -DDEBUG -I../bfd -I$(srcdir)/../include -I$(srcdir)/../bfd -I$(srcdir)/../intl -I../intl -I. -DLOCALEDIR="\"$(prefix)/share/locale\"" +INCLUDES = -D_GNU_SOURCE -DDEBUG -I../bfd -I$(srcdir)/../include -I$(srcdir)/../bfd -I$(srcdir)/../intl -I../intl -I. -DLOCALEDIR="\"$(datadir)/locale\"" bin_PROGRAMS = gprof diff --git a/gprof/Makefile.in b/gprof/Makefile.in index b02e48d..acb96f0 100644 --- a/gprof/Makefile.in +++ b/gprof/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.1 from Makefile.am. +# Makefile.in generated by automake 1.9.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -236,7 +236,7 @@ BFDDIR = $(BASEDIR)/bfd INCDIR = $(BASEDIR)/include AM_CFLAGS = $(WARN_CFLAGS) MKDEP = gcc -MM -INCLUDES = -D_GNU_SOURCE -DDEBUG -I../bfd -I$(srcdir)/../include -I$(srcdir)/../bfd -I$(srcdir)/../intl -I../intl -I. -DLOCALEDIR="\"$(prefix)/share/locale\"" +INCLUDES = -D_GNU_SOURCE -DDEBUG -I../bfd -I$(srcdir)/../include -I$(srcdir)/../bfd -I$(srcdir)/../intl -I../intl -I. -DLOCALEDIR="\"$(datadir)/locale\"" sources = basic_blocks.c call_graph.c cg_arcs.c cg_dfn.c \ cg_print.c corefile.c gmon_io.c gprof.c hertz.c hist.c source.c \ search_list.c symtab.c sym_ids.c utils.c \ diff --git a/gprof/aclocal.m4 b/gprof/aclocal.m4 index 3a37af6..46a2e01 100644 --- a/gprof/aclocal.m4 +++ b/gprof/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.9.1 -*- Autoconf -*- +# generated automatically by aclocal 1.9.2 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. @@ -40,7 +40,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.1])]) + [AM_AUTOMAKE_VERSION([1.9.2])]) # AM_AUX_DIR_EXPAND diff --git a/intl/ChangeLog b/intl/ChangeLog index 44d88e4..59dbb43 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,7 @@ +2004-11-30 Tero Niemela + + * Makefile.in: Change LOCALEDIR to $(datadir)/share. + 2002-01-21 Thomas Klausner * linux-msg.sed: Comment typo fix. diff --git a/intl/Makefile.in b/intl/Makefile.in index 09647de..bf91781 100644 --- a/intl/Makefile.in +++ b/intl/Makefile.in @@ -32,7 +32,7 @@ libdir = $(exec_prefix)/lib includedir = $(prefix)/include datadir = $(prefix)/@DATADIRNAME@ localedir = $(datadir)/locale -gnulocaledir = $(prefix)/share/locale +gnulocaledir = $(datadir)/locale gettextsrcdir = @datadir@/gettext/intl aliaspath = $(localedir):. subdir = intl diff --git a/ld/ChangeLog b/ld/ChangeLog index 0a30bb1..c644720 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2004-11-30 Tero Niemela + + * Makefile.am: Change LOCALEDIR to $(datadir)/share. + * Makefile.in: Regenerate. + 2004-11-26 Melissa Mears * emultempl/pe.em: Add --subsystem:xbox as well as diff --git a/ld/Makefile.am b/ld/Makefile.am index 096218a..8b17003 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -102,7 +102,7 @@ info_TEXINFOS = ld.texinfo noinst_TEXINFOS = ldint.texinfo man_MANS = ld.1 -INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) -I$(top_srcdir)/../intl -I../intl $(HDEFINES) $(CFLAGS) -DLOCALEDIR="\"$(prefix)/share/locale\"" +INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) -I$(top_srcdir)/../intl -I../intl $(HDEFINES) $(CFLAGS) -DLOCALEDIR="\"$(datadir)/locale\"" BFDLIB = ../bfd/libbfd.la LIBIBERTY = ../libiberty/libiberty.a diff --git a/ld/Makefile.in b/ld/Makefile.in index f20a360..5841f7b 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -167,8 +167,7 @@ MANCONF = -Dman TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl -POD2MAN = pod2man --center="GNU Development Tools" \ - --release="binutils-$(VERSION)" --section=1 +POD2MAN = pod2man --center="GNU Development Tools" --release="binutils-$(VERSION)" --section=1 #stuff for self hosting (can be overridden in config file). @@ -177,49 +176,19 @@ HOSTING_LIBS = @HOSTING_LIBS@ HOSTING_EMU = -m $(EMUL) # Setup the testing framework, if you have one -EXPECT = `if [ -f $$r/../expect/expect ] ; \ - then echo $$r/../expect/expect ; \ - else echo expect ; fi` +EXPECT = `if [ -f $$r/../expect/expect ] ; then echo $$r/../expect/expect ; else echo expect ; fi` -RUNTEST = `if [ -f $${srcroot}/../dejagnu/runtest ] ; \ - then echo $${srcroot}/../dejagnu/runtest ; \ - else echo runtest ; fi` +RUNTEST = `if [ -f $${srcroot}/../dejagnu/runtest ] ; then echo $${srcroot}/../dejagnu/runtest ; else echo runtest ; fi` RUNTESTFLAGS = -CC_FOR_TARGET = ` \ - if [ -f $$r/../gcc/xgcc ] ; then \ - if [ -f $$r/../newlib/Makefile ] ; then \ - echo $$r/../gcc/xgcc -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc; \ - else \ - echo $$r/../gcc/xgcc -B$$r/../gcc/; \ - fi; \ - else \ - if [ "@host@" = "@target@" ] ; then \ - echo $(CC); \ - else \ - echo gcc | sed '$(transform)'; \ - fi; \ - fi` +CC_FOR_TARGET = ` if [ -f $$r/../gcc/xgcc ] ; then if [ -f $$r/../newlib/Makefile ] ; then echo $$r/../gcc/xgcc -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc; else echo $$r/../gcc/xgcc -B$$r/../gcc/; fi; else if [ "@host@" = "@target@" ] ; then echo $(CC); else echo gcc | sed '$(transform)'; fi; fi` CXX = gcc -CXX_FOR_TARGET = ` \ - if [ -f $$r/../gcc/xgcc ] ; then \ - if [ -f $$r/../newlib/Makefile ] ; then \ - echo $$r/../gcc/xgcc -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc; \ - else \ - echo $$r/../gcc/xgcc -B$$r/../gcc/; \ - fi; \ - else \ - if [ "@host@" = "@target@" ] ; then \ - echo $(CXX); \ - else \ - echo gcc | sed '$(transform)'; \ - fi; \ - fi` +CXX_FOR_TARGET = ` if [ -f $$r/../gcc/xgcc ] ; then if [ -f $$r/../newlib/Makefile ] ; then echo $$r/../gcc/xgcc -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc; else echo $$r/../gcc/xgcc -B$$r/../gcc/; fi; else if [ "@host@" = "@target@" ] ; then echo $(CXX); else echo gcc | sed '$(transform)'; fi; fi` noinst_PROGRAMS = ld-new @@ -227,323 +196,30 @@ info_TEXINFOS = ld.texinfo noinst_TEXINFOS = ldint.texinfo man_MANS = ld.1 -INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) -I$(top_srcdir)/../intl -I../intl $(HDEFINES) $(CFLAGS) -DLOCALEDIR="\"$(prefix)/share/locale\"" +INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) -I$(top_srcdir)/../intl -I../intl $(HDEFINES) $(CFLAGS) -DLOCALEDIR="\"$(datadir)/locale\"" BFDLIB = ../bfd/libbfd.la LIBIBERTY = ../libiberty/libiberty.a -ALL_EMULATIONS = \ - ea29k.o \ - eaixppc.o \ - eaixrs6.o \ - ealpha.o \ - earcelf.o \ - earm_epoc_pe.o \ - earmaoutb.o \ - earmaoutl.o \ - earmcoff.o \ - earmelf.o \ - earmelfb.o \ - earmelf_fbsd.o \ - earmelf_linux.o \ - earmelf_linux_eabi.o \ - earmelfb_linux.o \ - earmelf_nbsd.o \ - earmelfb_nbsd.o \ - earmnto.o \ - earmnbsd.o \ - earmpe.o \ - earmsymbian.o \ - eavr2.o \ - eavr1.o \ - eavr3.o \ - eavr4.o \ - eavr5.o \ - ecoff_i860.o \ - ecoff_sparc.o \ - ecrisaout.o \ - ecriself.o \ - ecrislinux.o \ - ed10velf.o \ - ed30v_e.o \ - ed30v_o.o \ - ed30velf.o \ - edelta68.o \ - eelf32_dlx.o \ - eebmon29k.o \ - eelf32_i960.o \ - eelf32_i860.o \ - eelf32_sparc.o \ - eelf32b4300.o \ - eelf32cr16c.o \ - eelf32bmip.o \ - eelf32bmipn32.o \ - eelf32btsmip.o \ - eelf32crx.o \ - eelf32btsmipn32.o \ - eelf32ltsmip.o \ - eelf32ltsmipn32.o \ - eelf32ebmip.o \ - eelf32elmip.o \ - eelf32fr30.o \ - eelf32frv.o \ - eelf32i370.o \ - eelf32ip2k.o \ - eelf32iq2000.o \ - eelf32iq10.o \ - eelf32l4300.o \ - eelf32lmip.o \ - eelf32lppc.o \ - eelf32lppcnto.o \ - eelf32lppcsim.o \ - eelf32mcore.o \ - eelf32mipswindiss.o \ - eelf32openrisc.o \ - eelf32ppc.o \ - eelf32ppc_fbsd.o \ - eelf32ppclinux.o \ - eelf32ppcnto.o \ - eelf32ppcsim.o \ - eelf32ppcwindiss.o \ - eelf32vax.o \ - eelf32xstormy16.o \ - eelf32xtensa.o \ - eelf_i386.o \ - eelf_i386_be.o \ - eelf_i386_chaos.o \ - eelf_i386_fbsd.o \ - eelf_i386_ldso.o \ - eelf_s390.o \ - egld960.o \ - egld960coff.o \ - eh8300.o \ - eh8300h.o \ - eh8300s.o \ - eh8300elf.o \ - eh8300hn.o \ - eh8300sn.o \ - eh8300sx.o \ - eh8300helf.o \ - eh8300self.o \ - eh8300hnelf.o \ - eh8300snelf.o \ - eh8300sxelf.o \ - eh8300sxn.o \ - eh8300sxnelf.o \ - eh8500.o \ - eh8500b.o \ - eh8500c.o \ - eh8500m.o \ - eh8500s.o \ - ehp300bsd.o \ - ehp3hpux.o \ - ehppaelf.o \ - ehppalinux.o \ - ehppanbsd.o \ - ehppaobsd.o \ - ei386aout.o \ - ei386beos.o \ - ei386bsd.o \ - ei386coff.o \ - ei386go32.o \ - ei386linux.o \ - ei386lynx.o \ - ei386mach.o \ - ei386moss.o \ - ei386msdos.o \ - ei386nbsd.o \ - ei386nto.o \ - ei386nw.o \ - ei386pe.o \ - ei386pe_posix.o \ - elnk960.o \ - em32relf.o \ - em32rlelf.o \ - em32relf_linux.o \ - em32rlelf_linux.o \ - em68hc11elf.o \ - em68hc11elfb.o \ - em68hc12elf.o \ - em68hc12elfb.o \ - em68k4knbsd.o \ - em68kaout.o \ - em68kaux.o \ - em68kcoff.o \ - em68kelf.o \ - em68kelfnbsd.o \ - em68klinux.o \ - em68klynx.o \ - em68knbsd.o \ - em68kpsos.o \ - em88kbcs.o \ - emaxqcoff.o \ - emcorepe.o \ - emipsbig.o \ - emipsbsd.o \ - emipsidt.o \ - emipsidtl.o \ - emipslit.o \ - emipslnews.o \ - emipspe.o \ - emsp430x110.o \ - emsp430x112.o \ - emsp430x1101.o \ - emsp430x1111.o \ - emsp430x1121.o \ - emsp430x1122.o \ - emsp430x1132.o \ - emsp430x122.o \ - emsp430x123.o \ - emsp430x1222.o \ - emsp430x1232.o \ - emsp430x133.o \ - emsp430x135.o \ - emsp430x1331.o \ - emsp430x1351.o \ - emsp430x147.o \ - emsp430x148.o \ - emsp430x149.o \ - emsp430x155.o \ - emsp430x156.o \ - emsp430x157.o \ - emsp430x167.o \ - emsp430x168.o \ - emsp430x169.o \ - emsp430x1610.o \ - emsp430x1611.o \ - emsp430x1612.o \ - emsp430x311.o \ - emsp430x312.o \ - emsp430x313.o \ - emsp430x314.o \ - emsp430x315.o \ - emsp430x323.o \ - emsp430x325.o \ - emsp430x336.o \ - emsp430x337.o \ - emsp430x412.o \ - emsp430x413.o \ - emsp430x415.o \ - emsp430x417.o \ - emsp430xE423.o \ - emsp430xE425.o \ - emsp430xE427.o \ - emsp430xW423.o \ - emsp430xW425.o \ - emsp430xW427.o \ - emsp430xG437.o \ - emsp430xG438.o \ - emsp430xG439.o \ - emsp430x435.o \ - emsp430x436.o \ - emsp430x437.o \ - emsp430x447.o \ - emsp430x448.o \ - emsp430x449.o \ - enews.o \ - ens32knbsd.o \ - eor32.o \ - eor32elf.o \ - epc532macha.o \ - epdp11.o \ - epjelf.o \ - epjlelf.o \ - eppcmacos.o \ - eppcnw.o \ - eppcpe.o \ - eppclynx.o \ - eriscix.o \ - esa29200.o \ - esh.o \ - eshelf32.o \ - eshlelf32.o \ - eshelf32_linux.o \ - eshlelf32_linux.o \ - eshelf32_nbsd.o \ - eshlelf32_nbsd.o \ - eshelf.o \ - eshelf_linux.o \ - eshlelf_linux.o \ - eshelf_nbsd.o \ - eshlelf_nbsd.o \ - eshelf_nto.o \ - eshlelf_nto.o \ - eshl.o \ - eshlelf.o \ - eshlsymbian.o \ - eshpe.o \ - esparcaout.o \ - esparclinux.o \ - esparclynx.o \ - esparcnbsd.o \ - est2000.o \ - esun3.o \ - esun4.o \ - etic30aout.o \ - etic30coff.o \ - etic3xcoff.o \ - etic3xcoff_onchip.o \ - etic4xcoff.o \ - etic54xcoff.o \ - etic80coff.o \ - evanilla.o \ - evax.o \ - evaxnbsd.o \ - evsta.o \ - ew65.o \ - ez8001.o \ - eelf32frvfd.o \ - ez8002.o - - -ALL_64_EMULATIONS = \ - eelf64_aix.o \ - eelf64_ia64.o \ - eelf64_ia64_fbsd.o \ - eshelf64.o \ - eshlelf64.o \ - eshelf64_nbsd.o \ - eshlelf64_nbsd.o \ - eelf_x86_64.o \ - eelf_x86_64_fbsd.o \ - eelf64_s390.o \ - eelf64_sparc.o \ - eelf64_sparc_fbsd.o \ - eelf64alpha.o \ - eelf64alpha_fbsd.o \ - eelf64alpha_nbsd.o \ - eelf64bmip.o \ - eelf64btsmip.o \ - eelf64ltsmip.o \ - eelf64hppa.o \ - eelf64mmix.o \ - emmo.o \ - eelf64ppc.o \ - eelf64lppc.o \ - ehppa64linux.o - - -ALL_EMUL_EXTRA_OFILES = \ - deffilep.o \ - pe-dll.o - - -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 pe-dll.c - - -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 deffile.h pe-dll.h +ALL_EMULATIONS = ea29k.o eaixppc.o eaixrs6.o ealpha.o earcelf.o earm_epoc_pe.o earmaoutb.o earmaoutl.o earmcoff.o earmelf.o earmelfb.o earmelf_fbsd.o earmelf_linux.o earmelf_linux_eabi.o earmelfb_linux.o earmelf_nbsd.o earmelfb_nbsd.o earmnto.o earmnbsd.o earmpe.o earmsymbian.o eavr2.o eavr1.o eavr3.o eavr4.o eavr5.o ecoff_i860.o ecoff_sparc.o ecrisaout.o ecriself.o ecrislinux.o ed10velf.o ed30v_e.o ed30v_o.o ed30velf.o edelta68.o eelf32_dlx.o eebmon29k.o eelf32_i960.o eelf32_i860.o eelf32_sparc.o eelf32b4300.o eelf32cr16c.o eelf32bmip.o eelf32bmipn32.o eelf32btsmip.o eelf32crx.o eelf32btsmipn32.o eelf32ltsmip.o eelf32ltsmipn32.o eelf32ebmip.o eelf32elmip.o eelf32fr30.o eelf32frv.o eelf32i370.o eelf32ip2k.o eelf32iq2000.o eelf32iq10.o eelf32l4300.o eelf32lmip.o eelf32lppc.o eelf32lppcnto.o eelf32lppcsim.o eelf32mcore.o eelf32mipswindiss.o eelf32openrisc.o eelf32ppc.o eelf32ppc_fbsd.o eelf32ppclinux.o eelf32ppcnto.o eelf32ppcsim.o eelf32ppcwindiss.o eelf32vax.o eelf32xstormy16.o eelf32xtensa.o eelf_i386.o eelf_i386_be.o eelf_i386_chaos.o eelf_i386_fbsd.o eelf_i386_ldso.o eelf_s390.o egld960.o egld960coff.o eh8300.o eh8300h.o eh8300s.o eh8300elf.o eh8300hn.o eh8300sn.o eh8300sx.o eh8300helf.o eh8300self.o eh8300hnelf.o eh8300snelf.o eh8300sxelf.o eh8300sxn.o eh8300sxnelf.o eh8500.o eh8500b.o eh8500c.o eh8500m.o eh8500s.o ehp300bsd.o ehp3hpux.o ehppaelf.o ehppalinux.o ehppanbsd.o ehppaobsd.o ei386aout.o ei386beos.o ei386bsd.o ei386coff.o ei386go32.o ei386linux.o ei386lynx.o ei386mach.o ei386moss.o ei386msdos.o ei386nbsd.o ei386nto.o ei386nw.o ei386pe.o ei386pe_posix.o elnk960.o em32relf.o em32rlelf.o em32relf_linux.o em32rlelf_linux.o em68hc11elf.o em68hc11elfb.o em68hc12elf.o em68hc12elfb.o em68k4knbsd.o em68kaout.o em68kaux.o em68kcoff.o em68kelf.o em68kelfnbsd.o em68klinux.o em68klynx.o em68knbsd.o em68kpsos.o em88kbcs.o emaxqcoff.o emcorepe.o emipsbig.o emipsbsd.o emipsidt.o emipsidtl.o emipslit.o emipslnews.o emipspe.o emsp430x110.o emsp430x112.o emsp430x1101.o emsp430x1111.o emsp430x1121.o emsp430x1122.o emsp430x1132.o emsp430x122.o emsp430x123.o emsp430x1222.o emsp430x1232.o emsp430x133.o emsp430x135.o emsp430x1331.o emsp430x1351.o emsp430x147.o emsp430x148.o emsp430x149.o emsp430x155.o emsp430x156.o emsp430x157.o emsp430x167.o emsp430x168.o emsp430x169.o emsp430x1610.o emsp430x1611.o emsp430x1612.o emsp430x311.o emsp430x312.o emsp430x313.o emsp430x314.o emsp430x315.o emsp430x323.o emsp430x325.o emsp430x336.o emsp430x337.o emsp430x412.o emsp430x413.o emsp430x415.o emsp430x417.o emsp430xE423.o emsp430xE425.o emsp430xE427.o emsp430xW423.o emsp430xW425.o emsp430xW427.o emsp430xG437.o emsp430xG438.o emsp430xG439.o emsp430x435.o emsp430x436.o emsp430x437.o emsp430x447.o emsp430x448.o emsp430x449.o enews.o ens32knbsd.o eor32.o eor32elf.o epc532macha.o epdp11.o epjelf.o epjlelf.o eppcmacos.o eppcnw.o eppcpe.o eppclynx.o eriscix.o esa29200.o esh.o eshelf32.o eshlelf32.o eshelf32_linux.o eshlelf32_linux.o eshelf32_nbsd.o eshlelf32_nbsd.o eshelf.o eshelf_linux.o eshlelf_linux.o eshelf_nbsd.o eshlelf_nbsd.o eshelf_nto.o eshlelf_nto.o eshl.o eshlelf.o eshlsymbian.o eshpe.o esparcaout.o esparclinux.o esparclynx.o esparcnbsd.o est2000.o esun3.o esun4.o etic30aout.o etic30coff.o etic3xcoff.o etic3xcoff_onchip.o etic4xcoff.o etic54xcoff.o etic80coff.o evanilla.o evax.o evaxnbsd.o evsta.o ew65.o ez8001.o eelf32frvfd.o ez8002.o + + +ALL_64_EMULATIONS = eelf64_aix.o eelf64_ia64.o eelf64_ia64_fbsd.o eshelf64.o eshlelf64.o eshelf64_nbsd.o eshlelf64_nbsd.o eelf_x86_64.o eelf_x86_64_fbsd.o eelf64_s390.o eelf64_sparc.o eelf64_sparc_fbsd.o eelf64alpha.o eelf64alpha_fbsd.o eelf64alpha_nbsd.o eelf64bmip.o eelf64btsmip.o eelf64ltsmip.o eelf64hppa.o eelf64mmix.o emmo.o eelf64ppc.o eelf64lppc.o ehppa64linux.o + + +ALL_EMUL_EXTRA_OFILES = deffilep.o pe-dll.o + + +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 pe-dll.c + + +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 deffile.h pe-dll.h GENERATED_CFILES = ldgram.c ldlex.c deffilep.c GENERATED_HFILES = ldgram.h ldemul-list.h deffilep.h -OFILES = ldgram.o ldlex.o lexsup.o ldlang.o mri.o ldctor.o ldmain.o \ - ldwrite.o ldexp.o ldemul.o ldver.o ldmisc.o \ - ldfile.o ldcref.o ${EMULATION_OFILES} ${EMUL_EXTRA_OFILES} +OFILES = ldgram.o ldlex.o lexsup.o ldlang.o mri.o ldctor.o ldmain.o ldwrite.o ldexp.o ldemul.o ldver.o ldmisc.o ldfile.o ldcref.o ${EMULATION_OFILES} ${EMUL_EXTRA_OFILES} STAGESTUFF = *.o ldscripts/* e*.c @@ -562,8 +238,7 @@ 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 +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) ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBIBERTY) $(INTLLIBS) @@ -576,8 +251,7 @@ MAINTAINERCLEANFILES = ldver.texi # We want to reconfigure if configure.host or configure.tgt changes. CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host $(srcdir)/configure.tgt -MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \ - ldemul-list.h crtbegin.o crtend.o ld.log ld.sum +MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) ldemul-list.h crtbegin.o crtend.o ld.log ld.sum CLEANFILES = dep.sed DEP DEPA DEP1 DEP2 -- 2.7.4