From ee09ab7f8904ab286d37a9aec53ab56a828f7227 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 25 Mar 1998 18:06:21 +0000 Subject: [PATCH] Based on patch from H.J. Lu : * Makefile.am (DISTSTUFF): New variable. (diststuff): New target. (DISTCLEANFILES): New variable. * Makefile.in: Rebuild. --- binutils/ChangeLog | 8 +++ binutils/Makefile.am | 48 +++++++------ binutils/Makefile.in | 166 ++++++++++++++++++++++++++----------------- 3 files changed, 135 insertions(+), 87 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index a2a0d7855d..a76e836e76 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,11 @@ +Wed Mar 25 13:05:39 1998 Ian Lance Taylor + + Based on patch from H.J. Lu : + * Makefile.am (DISTSTUFF): New variable. + (diststuff): New target. + (DISTCLEANFILES): New variable. + * Makefile.in: Rebuild. + Tue Mar 24 19:33:08 1998 Ian Lance Taylor * rclex.l: Accept { and } as synonyms for BEGIN and END. diff --git a/binutils/Makefile.am b/binutils/Makefile.am index b5fcd5fc68..b16ba84757 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -1,10 +1,14 @@ ## Process this file with automake to generate Makefile.in -AUTOMAKE_OPTIONS = dejagnu +AUTOMAKE_OPTIONS = cygnus dejagnu tooldir = $(exec_prefix)/$(target_alias) +## These aren't set by automake, because they appear in +## bfd/acinclude.m4, which is included by binutils/acinclude.m4, and +## thus is not seen by automake. CC_FOR_BUILD = @CC_FOR_BUILD@ +EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ YACC = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo bison -y ; fi` YFLAGS = -d @@ -42,9 +46,7 @@ man_MANS = ar.1 nm.1 objdump.1 ranlib.1 size.1 strings.1 strip.1 objcopy.1 \ PROGS = $(SIZE_PROG) $(OBJDUMP_PROG) $(NM_PROG) $(AR_PROG) $(STRINGS_PROG) $(STRIP_PROG) $(RANLIB_PROG) $(DEMANGLER_PROG) $(OBJCOPY_PROG) $(ADDR2LINE_PROG) @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ -bin_PROGRAMS = $(SIZE_PROG) $(OBJDUMP_PROG) $(AR_PROG) $(STRINGS_PROG) \ - $(RANLIB_PROG) $(DEMANGLER_PROG) $(OBJCOPY_PROG) $(ADDR2LINE_PROG) \ - @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ +bin_PROGRAMS = $(SIZE_PROG) $(OBJDUMP_PROG) $(AR_PROG) $(STRINGS_PROG) $(RANLIB_PROG) $(DEMANGLER_PROG) $(OBJCOPY_PROG) $(ADDR2LINE_PROG) @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ ## We need a special rule to install the programs which are built with -new noinst_PROGRAMS = $(NM_PROG) $(STRIP_PROG) @@ -108,7 +110,7 @@ CC_FOR_TARGET = ` \ if [ "@host@" = "@target@" ] ; then \ echo $(CC); \ else \ - echo gcc | sed '$(program_transform_name)'; \ + echo gcc | sed '$(transform)'; \ fi; \ fi` @@ -156,12 +158,6 @@ stamp-under: Makefile $(SHELL) $(srcdir)/../move-if-change underscore.t underscore.c touch stamp-under -version.o: version.c Makefile - $(COMPILE) -c -DVERSION='"$(VERSION)"' $(srcdir)/version.c - -bucomm.o: bucomm.c Makefile - $(COMPILE) -c -DTARGET='"@target@"' $(srcdir)/bucomm.c - cplus-dem.o: $(BASEDIR)/libiberty/cplus-dem.c $(INCDIR)/getopt.h $(COMPILE) -c -DMAIN -DVERSION='"$(VERSION)"' $(BASEDIR)/libiberty/cplus-dem.c @@ -194,15 +190,15 @@ addr2line_SOURCES = addr2line.c $(BULIBS) # -rm -f $(STRIP_PROG) # -ln $(OBJCOPY_PROG) $(STRIP_PROG) -sysroff.c: sysinfo sysroff.info - ./sysinfo -c <$(srcdir)/sysroff.info >sysroff.c - ./sysinfo -i <$(srcdir)/sysroff.info >>sysroff.c - ./sysinfo -g <$(srcdir)/sysroff.info >>sysroff.c +sysroff.c: sysinfo$(EXEEXT_FOR_BUILD) sysroff.info + ./sysinfo$(EXEEXT_FOR_BUILD) -c <$(srcdir)/sysroff.info >sysroff.c + ./sysinfo$(EXEEXT_FOR_BUILD) -i <$(srcdir)/sysroff.info >>sysroff.c + ./sysinfo$(EXEEXT_FOR_BUILD) -g <$(srcdir)/sysroff.info >>sysroff.c -sysroff.h: sysinfo sysroff.info - ./sysinfo -d <$(srcdir)/sysroff.info >sysroff.h +sysroff.h: sysinfo$(EXEEXT_FOR_BUILD) sysroff.info + ./sysinfo$(EXEEXT_FOR_BUILD) -d <$(srcdir)/sysroff.info >sysroff.h -sysinfo: sysinfo.o syslex.o +sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o $(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) -o $@ sysinfo.o syslex.o syslex.o: syslex.c sysinfo.h @@ -234,7 +230,7 @@ sysdump_SOURCES = sysdump.c $(BULIBS) # coff/sym.h and coff/ecoff.h won't be found by the automatic dependency # scripts, since they are only included conditionally. nlmconv.o: nlmconv.c $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h - ldname=`echo ld | sed '$(program_transform_name)'`; \ + ldname=`echo ld | sed '$(transform)'`; \ $(COMPILE) -c -DLD_NAME="\"$${ldname}\"" @NLMCONV_DEFS@ $(srcdir)/nlmconv.c nlmconv_SOURCES = nlmconv.c nlmheader.y $(BULIBS) @@ -243,6 +239,14 @@ windres_SOURCES = windres.c resrc.c rescoff.c resbin.c rcparse.y rclex.l \ $(BULIBS) windres_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ +DISTSTUFF = arparse.c arparse.h arlex.c nlmheader.c sysinfo.c sysinfo.h \ + syslex.c deflex.c +diststuff: $(DISTSTUFF) info + +# FIXME: Shouldn't automake take care of the first four .h files anyhow? +DISTCLEANFILES = defparse.h arparse.h rcparse.h nlmheader.h \ + stamp-under sysinfo underscore.c sysroff.c sysroff.h + # Targets to rebuild dependencies in this Makefile. # Have to get rid of .dep1 here so that "$?" later includes all of $(CFILES). .dep: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h @@ -311,8 +315,10 @@ install-exec-local: $(bin_PROGRAMS) $(noinst_PROGRAMS) j=`echo $$i | sed -e 's/-new//'`; \ rm -f $(tooldir)/bin/$$j$(EXEEXT); \ k=`echo $$j | sed '$(transform)'`; \ - ln $(bindir)/$$k$(EXEEXT) $(tooldir)/bin/$$j$(EXEEXT) >/dev/null 2>/dev/null \ - || $(INSTALL_PROGRAM) $$i$(EXEEXT) $(tooldir)/bin/$$j$(EXEEXT); \ + if [ "$(bindir)/$$k$(EXEEXT)" != "$(tooldir)/bin/$$j$(EXEEXT)" ]; then \ + ln $(bindir)/$$k$(EXEEXT) $(tooldir)/bin/$$j$(EXEEXT) >/dev/null 2>/dev/null \ + || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXEEXT) $(tooldir)/bin/$$j$(EXEEXT); \ + fi; \ else true; \ fi; \ done diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 167d2768b8..527093f36c 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2e from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. SHELL = @SHELL@ @@ -43,12 +49,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : build_alias = @build_alias@ build_triplet = @build@ host_alias = @host_alias@ @@ -70,12 +76,13 @@ LN_S = @LN_S@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NLMCONV_DEFS = @NLMCONV_DEFS@ +NM = @NM@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ UNDERSCORE = @UNDERSCORE@ VERSION = @VERSION@ -AUTOMAKE_OPTIONS = dejagnu +AUTOMAKE_OPTIONS = cygnus dejagnu tooldir = $(exec_prefix)/$(target_alias) @@ -228,6 +235,13 @@ windres_SOURCES = windres.c resrc.c rescoff.c resbin.c rcparse.y rclex.l \ $(BULIBS) windres_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@ +DISTSTUFF = arparse.c arparse.h arlex.c nlmheader.c sysinfo.c sysinfo.h \ + syslex.c deflex.c + +# FIXME: Shouldn't automake take care of the first four .h files anyhow? +DISTCLEANFILES = defparse.h arparse.h rcparse.h nlmheader.h \ + stamp-under sysinfo underscore.c sysroff.c sysroff.h + CLEANFILES = dep.sed .dep .dep1 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs @@ -344,7 +358,7 @@ OBJECTS = $(nlmconv_OBJECTS) $(srconv_OBJECTS) $(sysdump_OBJECTS) $(coffdump_OBJ default: all .SUFFIXES: -.SUFFIXES: .S .c .dvi .h .info .l .lo .o .ps .s .texi .texinfo .y +.SUFFIXES: .S .c .dvi .info .l .lo .o .ps .s .texi .texinfo .y $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile @@ -360,7 +374,8 @@ config.status: $(srcdir)/configure $(srcdir)/configure: @MAINT@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) -config.h: stamp-h ; @: +config.h: stamp-h + @: stamp-h: $(srcdir)/config.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES= CONFIG_HEADERS=config.h:config.in \ @@ -376,14 +391,14 @@ mostlyclean-hdr: clean-hdr: distclean-hdr: - rm -f config.h + -rm -f config.h maintainer-clean-hdr: mostlyclean-binPROGRAMS: clean-binPROGRAMS: - test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) distclean-binPROGRAMS: @@ -408,35 +423,34 @@ uninstall-binPROGRAMS: mostlyclean-noinstPROGRAMS: clean-noinstPROGRAMS: - test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) distclean-noinstPROGRAMS: maintainer-clean-noinstPROGRAMS: +.c.o: + $(COMPILE) -c $< + .s.o: $(COMPILE) -c $< .S.o: $(COMPILE) -c $< -.c.o: - $(COMPILE) -c $< - mostlyclean-compile: - rm -f *.o core + -rm -f *.o core *.core clean-compile: distclean-compile: - rm -f *.tab.c + -rm -f *.tab.c maintainer-clean-compile: .c.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< -# These are just copies of the above rule. .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -444,10 +458,10 @@ maintainer-clean-compile: $(LIBTOOL) --mode=compile $(COMPILE) -c $< mostlyclean-libtool: - rm -f *.lo + -rm -f *.lo clean-libtool: - rm -rf .libs + -rm -rf .libs _libs distclean-libtool: @@ -518,8 +532,11 @@ strip-new$(EXEEXT): $(strip_new_OBJECTS) $(strip_new_DEPENDENCIES) $(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) -.y.h: - $(SHELL) $(YLWRAP) "$(YACC)" $< y.tab.c $*.c y.tab.h $*.h -- $(YFLAGS) +defparse.h: defparse.c +arparse.h: arparse.c +rcparse.h: rcparse.c +nlmheader.h: nlmheader.c + .l.c: $(SHELL) $(YLWRAP) "$(LEX)" $< $(LEX_OUTPUT_ROOT).c $@ -- $(LFLAGS) @@ -581,7 +598,8 @@ uninstall-info: ii=yes; \ else ii=; fi; \ for file in $(INFO_DEPS); do \ - test -z $ii || install-info --info-dir=$(infodir) --remove $$file; \ + test -z "$ii" \ + || install-info --info-dir=$(infodir) --remove $$file; \ done $(NORMAL_UNINSTALL) for file in $(INFO_DEPS); do \ @@ -599,17 +617,23 @@ dist-info: $(INFO_DEPS) done mostlyclean-aminfo: - rm -f binutils.aux binutils.cp binutils.cps binutils.dvi binutils.fn \ - binutils.fns binutils.ky binutils.log binutils.pg \ - binutils.toc binutils.tp binutils.tps binutils.vr \ - binutils.vrs binutils.op binutils.tr binutils.cv + -rm -f binutils.aux binutils.cp binutils.cps binutils.dvi binutils.fn \ + binutils.fns binutils.ky binutils.kys binutils.ps \ + binutils.log binutils.pg binutils.toc binutils.tp \ + binutils.tps binutils.vr binutils.vrs binutils.op binutils.tr \ + binutils.cv binutils.cn clean-aminfo: distclean-aminfo: maintainer-clean-aminfo: - for i in $(INFO_DEPS); do rm -f `eval echo $$i*`; done + for i in $(INFO_DEPS); do \ + rm -f $$i; \ + if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \ + rm -f $$i-[0-9]*; \ + fi; \ + done clean-info: mostlyclean-aminfo install-man: $(MANS) $(NORMAL_INSTALL) @@ -683,47 +707,52 @@ install-man: $(MANS) uninstall-man: $(NORMAL_UNINSTALL) - inst=`echo "ar" | sed '$(transform)'`.1; \ + -inst=`echo "ar" | sed '$(transform)'`.1; \ rm -f $(mandir)/man1/$$inst - inst=`echo "nlmconv" | sed '$(transform)'`.1; \ + -inst=`echo "nlmconv" | sed '$(transform)'`.1; \ rm -f $(mandir)/man1/$$inst - inst=`echo "$(DEMANGLER_PROG)" | sed '$(transform)'`.1; \ + -inst=`echo "$(DEMANGLER_PROG)" | sed '$(transform)'`.1; \ rm -f $(mandir)/man1/$$inst - inst=`echo "nm" | sed '$(transform)'`.1; \ + -inst=`echo "nm" | sed '$(transform)'`.1; \ rm -f $(mandir)/man1/$$inst - inst=`echo "objdump" | sed '$(transform)'`.1; \ + -inst=`echo "objdump" | sed '$(transform)'`.1; \ rm -f $(mandir)/man1/$$inst - inst=`echo "ranlib" | sed '$(transform)'`.1; \ + -inst=`echo "ranlib" | sed '$(transform)'`.1; \ rm -f $(mandir)/man1/$$inst - inst=`echo "size" | sed '$(transform)'`.1; \ + -inst=`echo "size" | sed '$(transform)'`.1; \ rm -f $(mandir)/man1/$$inst - inst=`echo "strings" | sed '$(transform)'`.1; \ + -inst=`echo "strings" | sed '$(transform)'`.1; \ rm -f $(mandir)/man1/$$inst - inst=`echo "strip" | sed '$(transform)'`.1; \ + -inst=`echo "strip" | sed '$(transform)'`.1; \ rm -f $(mandir)/man1/$$inst - inst=`echo "objcopy" | sed '$(transform)'`.1; \ + -inst=`echo "objcopy" | sed '$(transform)'`.1; \ rm -f $(mandir)/man1/$$inst - inst=`echo "addr2line" | sed '$(transform)'`.1; \ + -inst=`echo "addr2line" | sed '$(transform)'`.1; \ rm -f $(mandir)/man1/$$inst tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) +TAGS: $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ - test -z "$(ETAGS_ARGS)config.in$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.in $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)config.in$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.in $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -734,7 +763,7 @@ top_distdir = $(distdir) # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - rm -rf $(distdir) + -rm -rf $(distdir) GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz mkdir $(distdir)/=build mkdir $(distdir)/=inst @@ -747,20 +776,20 @@ distcheck: dist && $(MAKE) install \ && $(MAKE) installcheck \ && $(MAKE) dist - rm -rf $(distdir) + -rm -rf $(distdir) @echo "========================"; \ echo "$(distdir).tar.gz is ready for distribution"; \ echo "========================" dist: distdir -chmod -R a+r $(distdir) GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) - rm -rf $(distdir) + -rm -rf $(distdir) dist-all: distdir -chmod -R a+r $(distdir) GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) - rm -rf $(distdir) + -rm -rf $(distdir) distdir: $(DISTFILES) - rm -rf $(distdir) + -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) @for file in $(DISTFILES); do \ @@ -774,6 +803,8 @@ distdir: $(DISTFILES) RUNTESTFLAGS = DEJATOOL = $(PACKAGE) + +RUNTESTDEFAULTFLAGS = --tool $(DEJATOOL) --srcdir $$srcdir site.exp: Makefile @echo 'Making a new site.exp file...' -@rm -f site.bak @@ -795,7 +826,7 @@ site.exp: Makefile @mv $@-t site.exp info: $(INFO_DEPS) dvi: $(DVIS) -check: all +check: $(MAKE) check-DEJAGNU installcheck: install-info: install-info-am @@ -819,19 +850,19 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-hdr mostlyclean-binPROGRAMS \ mostlyclean-noinstPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-aminfo mostlyclean-tags \ @@ -844,8 +875,8 @@ clean: clean-hdr clean-binPROGRAMS clean-noinstPROGRAMS clean-compile \ distclean: distclean-hdr distclean-binPROGRAMS distclean-noinstPROGRAMS \ distclean-compile distclean-libtool distclean-aminfo \ distclean-tags distclean-generic clean - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-hdr maintainer-clean-binPROGRAMS \ maintainer-clean-noinstPROGRAMS \ @@ -854,7 +885,7 @@ maintainer-clean: maintainer-clean-hdr maintainer-clean-binPROGRAMS \ maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." - rm -f config.status + -rm -f config.status .PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \ maintainer-clean-hdr mostlyclean-binPROGRAMS distclean-binPROGRAMS \ @@ -954,6 +985,7 @@ dlltool.o:dlltool.c nlmconv.o: nlmconv.c $(INCDIR)/coff/sym.h $(INCDIR)/coff/ecoff.h ldname=`echo ld | sed '$(transform)'`; \ $(COMPILE) -c -DLD_NAME="\"$${ldname}\"" @NLMCONV_DEFS@ $(srcdir)/nlmconv.c +diststuff: $(DISTSTUFF) info # Targets to rebuild dependencies in this Makefile. # Have to get rid of .dep1 here so that "$?" later includes all of $(CFILES). @@ -1021,8 +1053,10 @@ install-exec-local: $(bin_PROGRAMS) $(noinst_PROGRAMS) j=`echo $$i | sed -e 's/-new//'`; \ rm -f $(tooldir)/bin/$$j$(EXEEXT); \ k=`echo $$j | sed '$(transform)'`; \ - ln $(bindir)/$$k$(EXEEXT) $(tooldir)/bin/$$j$(EXEEXT) >/dev/null 2>/dev/null \ - || $(INSTALL_PROGRAM) $$i$(EXEEXT) $(tooldir)/bin/$$j$(EXEEXT); \ + if [ "$(bindir)/$$k$(EXEEXT)" != "$(tooldir)/bin/$$j$(EXEEXT)" ]; then \ + ln $(bindir)/$$k$(EXEEXT) $(tooldir)/bin/$$j$(EXEEXT) >/dev/null 2>/dev/null \ + || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXEEXT) $(tooldir)/bin/$$j$(EXEEXT); \ + fi; \ else true; \ fi; \ done