From 1d97d67f54d6d6390b866812bc14e19b9c334ee1 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 28 Feb 2007 01:29:32 +0000 Subject: * Makefile.am (PROGS): Add BUILD_INSTALL_MISC. (bin_PROGRAMS): Replace BUILD_MISC with BUILD_INSTALL_MISC. (EXTRA_PROGRAMS): Remove bin2c. (bin2c$(EXEEXT_FOR_BUILD)): New rule. (bin2c_SOURCES): Delete. (DISTCLEANFILES): Remove sysinfo. (MOSTLYCLEANFILES): Add sysinfo$(EXEEXT_FOR_BUILD) and bin2c$(EXEEXT_FOR_BUILD). * configure.in (BUILD_MISC): Add $(EXEEXT_FOR_BUILD) to bin2c. Move embedspu to.. (BUILD_INSTALL_MISC): ..here. * Makefile.in: Regenerate. * configure: Regenerate. --- binutils/Makefile.am | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'binutils/Makefile.am') diff --git a/binutils/Makefile.am b/binutils/Makefile.am index cc4cc48..a5daea6 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -50,15 +50,15 @@ DLLWRAP_PROG=dllwrap SRCONV_PROG=srconv$(EXEEXT) sysdump$(EXEEXT) coffdump$(EXEEXT) -PROGS = $(SIZE_PROG) $(OBJDUMP_PROG) $(NM_PROG) $(AR_PROG) $(STRINGS_PROG) $(STRIP_PROG) $(RANLIB_PROG) $(DEMANGLER_PROG) $(OBJCOPY_PROG) @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ $(ADDR2LINE_PROG) $(READELF_PROG) @BUILD_DLLWRAP@ @BUILD_MISC@ +PROGS = $(SIZE_PROG) $(OBJDUMP_PROG) $(NM_PROG) $(AR_PROG) $(STRINGS_PROG) $(STRIP_PROG) $(RANLIB_PROG) $(DEMANGLER_PROG) $(OBJCOPY_PROG) @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ $(ADDR2LINE_PROG) $(READELF_PROG) @BUILD_DLLWRAP@ @BUILD_MISC@ @BUILD_INSTALL_MISC@ -bin_PROGRAMS = $(SIZE_PROG) $(OBJDUMP_PROG) $(AR_PROG) $(STRINGS_PROG) $(RANLIB_PROG) $(OBJCOPY_PROG) @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ $(ADDR2LINE_PROG) $(READELF_PROG) @BUILD_DLLWRAP@ @BUILD_MISC@ +bin_PROGRAMS = $(SIZE_PROG) $(OBJDUMP_PROG) $(AR_PROG) $(STRINGS_PROG) $(RANLIB_PROG) $(OBJCOPY_PROG) @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ $(ADDR2LINE_PROG) $(READELF_PROG) @BUILD_DLLWRAP@ @BUILD_INSTALL_MISC@ ## We need a special rule to install the programs which are built with ## -new, and to rename cxxfilt to c++filt. noinst_PROGRAMS = $(NM_PROG) $(STRIP_PROG) $(DEMANGLER_PROG) -EXTRA_PROGRAMS = $(NLMCONV_PROG) srconv sysdump coffdump $(DLLTOOL_PROG) $(WINDRES_PROG) $(DLLWRAP_PROG) bin2c +EXTRA_PROGRAMS = $(NLMCONV_PROG) srconv sysdump coffdump $(DLLTOOL_PROG) $(WINDRES_PROG) $(DLLWRAP_PROG) # Stuff that goes in tooldir/ if appropriate. TOOL_PROGS = nm-new strip-new ar ranlib dlltool objdump @@ -280,6 +280,9 @@ sysinfo.o: $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS) $(srcdir)/sysinfo.c -Wno-error ; \ fi +bin2c$(EXEEXT_FOR_BUILD): + $(CC_FOR_BUILD) -o $@ $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(srcdir)/bin2c.c $(srcdir)/version.c + embedspu: embedspu.sh sed "s@^program_transform_name=@program_transform_name=$(program_transform_name)@" < $< > $@ chmod a+x $@ @@ -340,8 +343,6 @@ windres_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ $(LIBINTL) dllwrap_SOURCES = dllwrap.c version.c dllwrap_LDADD = $(LIBIBERTY) $(LIBINTL) -bin2c_SOURCES = bin2c.c version.c - EXTRA_DIST = arparse.c arparse.h arlex.c nlmheader.c sysinfo.c sysinfo.h \ syslex.c deflex.c defparse.h defparse.c rclex.c rcparse.h rcparse.c @@ -349,8 +350,7 @@ EXTRA_DIST = arparse.c arparse.h arlex.c nlmheader.c sysinfo.c sysinfo.h \ diststuff: $(EXTRA_DIST) info all: info -DISTCLEANFILES = sysinfo sysroff.c sysroff.h \ - site.exp site.bak +DISTCLEANFILES = sysroff.c sysroff.h site.exp site.bak # Targets to rebuild dependencies in this Makefile. # Have to get rid of DEP1 here so that "$?" later includes all of $(CFILES). @@ -399,7 +399,8 @@ dep-am: DEP ### -MOSTLYCLEANFILES = sysinfo binutils.log binutils.sum abcdefgh* +MOSTLYCLEANFILES = sysinfo$(EXEEXT_FOR_BUILD) bin2c$(EXEEXT_FOR_BUILD) \ + binutils.log binutils.sum abcdefgh* mostlyclean-local: -rm -rf tmpdir -- cgit v1.1