diff options
| author | Ian Lance Taylor <ian@airs.com> | 1997-08-04 19:32:56 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 1997-08-04 19:32:56 +0000 |
| commit | bf2a3cb1af5100a9bc0d4b574891aaaf82dbbad9 (patch) | |
| tree | ee991cfbc0b7e0185b8165d0f4d50e2d64a5243c /binutils/Makefile.in | |
| parent | 0426955144915aaff23fd800780b44ce279309f7 (diff) | |
| download | gdb-bf2a3cb1af5100a9bc0d4b574891aaaf82dbbad9.zip gdb-bf2a3cb1af5100a9bc0d4b574891aaaf82dbbad9.tar.gz gdb-bf2a3cb1af5100a9bc0d4b574891aaaf82dbbad9.tar.bz2 | |
* Makefile.am (TOOL_PROGS): Use an explicit $(EXEEXT).
(install-exec-local): When handling $(noinst_PROGRAMS), only use
$(EXEEXT) on the installed file. When handling $(TOOL_PROGS),
handle $(EXEEXT) correctly.
* configure.in: Add an explicit $(EXEEXT) when substituting for
the name of a program to build.
* Makefile.in, configure: Rebuild.
Diffstat (limited to 'binutils/Makefile.in')
| -rw-r--r-- | binutils/Makefile.in | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 68a9236..2d5d343 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -126,7 +126,7 @@ noinst_PROGRAMS = $(NM_PROG) $(STRIP_PROG) EXTRA_PROGRAMS = $(NLMCONV_PROG) $(SRCONV_PROG) $(DLLTOOL_PROG) $(WINDRES_PROG) # Stuff that goes in tooldir/ if appropriate -TOOL_PROGS = nm.new strip.new ar ranlib $(DLLTOOL_PROG) +TOOL_PROGS = nm.new strip.new ar$(EXEEXT) ranlib$(EXEEXT) dlltool$(EXEEXT) BASEDIR = $(srcdir)/.. BFDDIR = $(BASEDIR)/bfd @@ -236,8 +236,9 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = bin_PROGRAMS = size$(EXEEXT) objdump$(EXEEXT) ar$(EXEEXT) \ strings$(EXEEXT) ranlib$(EXEEXT) c++filt$(EXEEXT) objcopy$(EXEEXT) \ -addr2line$(EXEEXT) -noinst_PROGRAMS = nm.new$(EXEEXT) strip.new$(EXEEXT) +addr2line$(EXEEXT) @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ \ +@BUILD_WINDRES@ +noinst_PROGRAMS = nm.new strip.new PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) @@ -496,12 +497,12 @@ addr2line$(EXEEXT): $(addr2line_OBJECTS) $(addr2line_DEPENDENCIES) @rm -f addr2line$(EXEEXT) $(LINK) $(addr2line_LDFLAGS) $(addr2line_OBJECTS) $(addr2line_LDADD) $(LIBS) -nm.new$(EXEEXT): $(nm_new_OBJECTS) $(nm_new_DEPENDENCIES) - @rm -f nm.new$(EXEEXT) +nm.new: $(nm_new_OBJECTS) $(nm_new_DEPENDENCIES) + @rm -f nm.new $(LINK) $(nm_new_LDFLAGS) $(nm_new_OBJECTS) $(nm_new_LDADD) $(LIBS) -strip.new$(EXEEXT): $(strip_new_OBJECTS) $(strip_new_DEPENDENCIES) - @rm -f strip.new$(EXEEXT) +strip.new: $(strip_new_OBJECTS) $(strip_new_DEPENDENCIES) + @rm -f strip.new $(LINK) $(strip_new_LDFLAGS) $(strip_new_OBJECTS) $(strip_new_LDADD) $(LIBS) .y.c: $(SHELL) $(YLWRAP) "$(YACC)" $< y.tab.c $*.c y.tab.h $*.h -- $(YFLAGS) @@ -1003,17 +1004,17 @@ $(DEMANGLER_PROG).1: cxxfilt.man Makefile install-exec-local: $(bin_PROGRAMS) $(noinst_PROGRAMS) @list='$(noinst_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p$(EXEEXT) $(bindir)/`echo $$p|sed -e 's/.new//'|sed '$(transform)'`$(EXEEXT)"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p$(EXEEXT) $(bindir)/`echo $$p|sed -e 's/.new//'|sed '$(transform)'`$(EXEEXT); \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/.new//'|sed '$(transform)'`$(EXEEXT)"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/.new//'|sed '$(transform)'`$(EXEEXT); \ else :; fi; \ done for i in $(TOOL_PROGS); do \ if [ -f $$i ]; then \ - j=`echo $$i | sed -e 's/.new//'`; \ - rm -f $(tooldir)/bin/$$j; \ + j=`echo $$i | sed -e 's/.new//' -e 's/$(EXEEXT)//'`; \ + rm -f $(tooldir)/bin/$$j$(EXEEXT); \ k=`echo $$j | sed '$(transform)'`; \ - ln $(bindir)/$$k $(tooldir)/bin/$$j >/dev/null 2>/dev/null \ - || $(INSTALL_PROGRAM) $$i $(tooldir)/bin/$$j; \ + ln $(bindir)/$$k$(EXEEXT) $(tooldir)/bin/$$j$(EXEEXT) >/dev/null 2>/dev/null \ + || $(INSTALL_PROGRAM) $$i $(tooldir)/bin/$$j$(EXEEXT); \ else true; \ fi; \ done |