X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=Makefile.in;h=04b4896735bfe1a4869e3489c0d94fc894bc53c1;hb=a3e8c5b712d92489860090317327dd80d00893a6;hp=fedaabf35e445ddf61413df7f4630bd08ee11911;hpb=08168809b8a3de1898b4afb7f02b6db6d05ec92a;p=deliverable%2Fbinutils-gdb.git diff --git a/Makefile.in b/Makefile.in index fedaabf35e..04b4896735 100644 --- a/Makefile.in +++ b/Makefile.in @@ -45,8 +45,13 @@ GDB_NLM_DEPS = SHELL = /bin/sh -INSTALL = $$s/install-sh -c -INSTALL_PROGRAM = $(INSTALL) +# INSTALL_PROGRAM_ARGS is changed by configure.in to use -x for a +# cygwin32 host. +INSTALL_PROGRAM_ARGS = + +INSTALL = $(SHELL) $$s/install-sh -c +INSTALL_PROGRAM = $(INSTALL) $(INSTALL_PROGRAM_ARGS) +INSTALL_SCRIPT = $(INSTALL) INSTALL_DATA = $(INSTALL) -m 644 INSTALL_DOSREL = install-dosrel-fake @@ -62,9 +67,10 @@ HOST_CC = $(CC_FOR_BUILD) HOST_PREFIX = HOST_PREFIX_1 = loser- -# We don't specify -g -O because many compilers don't support -g -O, -# and/or -O is broken in and of itself. +# These flag values are normally overridden by the configure script. CFLAGS = -g +CXXFLAGS = -g -O2 + LIBCFLAGS = $(CFLAGS) CFLAGS_FOR_TARGET = $(CFLAGS) LDFLAGS_FOR_TARGET = @@ -79,7 +85,6 @@ CHILL_LIB = -lchill CXX = c++ # Use -O2 to stress test the compiler. -CXXFLAGS = -g -O2 LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates CXXFLAGS_FOR_TARGET = $(CXXFLAGS) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates @@ -87,8 +92,12 @@ LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates RANLIB = ranlib DLLTOOL = dlltool +WINDRES = windres NM = nm + +LD = ld + # Not plain GZIP, since gzip looks there for extra command-line options. GZIPPROG = gzip @@ -96,10 +105,18 @@ GZIPPROG = gzip DEFAULT_YACC = yacc DEFAULT_LEX = lex -# BISON: This line sed'ed to BISON = bison -y for FSF releases, don't remove. -BISON = `if [ -f $$r/byacc/byacc ] ; \ - then echo $$r/byacc/byacc ; \ - else echo ${DEFAULT_YACC} ; \ +BISON = `if [ -f $$r/bison/bison ] ; then \ + echo $$r/bison/bison -L $$s/bison/ ; \ + else \ + echo bison ; \ + fi` + +YACC = `if [ -f $$r/bison/bison ] ; then \ + echo $$r/bison/bison -y -L $$s/bison/ ; \ + elif [ -f $$r/byacc/byacc ] ; then \ + echo $$r/byacc/byacc ; \ + else \ + echo ${DEFAULT_YACC} ; \ fi` LEX = `if [ -f $$r/flex/flex ] ; \ @@ -173,7 +190,7 @@ CC_FOR_TARGET = ` \ if [ -f $$r/gcc/xgcc ] ; then \ if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \ if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \ - echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/newlib/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \ + echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/newlib/ -L$$r/$(TARGET_SUBDIR)/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \ else \ echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \ fi; \ @@ -228,8 +245,8 @@ CXX_FOR_TARGET = ` \ fi` AS_FOR_TARGET = ` \ - if [ -f $$r/gas/as.new ] ; then \ - echo $$r/gas/as.new ; \ + if [ -f $$r/gas/as-new ] ; then \ + echo $$r/gas/as-new ; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ echo $(AS); \ @@ -239,8 +256,8 @@ AS_FOR_TARGET = ` \ fi` LD_FOR_TARGET = ` \ - if [ -f $$r/ld/ld.new ] ; then \ - echo $$r/ld/ld.new ; \ + if [ -f $$r/ld/ld-new ] ; then \ + echo $$r/ld/ld-new ; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ echo $(LD); \ @@ -260,6 +277,17 @@ DLLTOOL_FOR_TARGET = ` \ fi; \ fi` +WINDRES_FOR_TARGET = ` \ + if [ -f $$r/binutils/windres ] ; then \ + echo $$r/binutils/windres ; \ + else \ + if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ + echo $(WINDRES); \ + else \ + t='$(program_transform_name)'; echo windres | sed -e 's/x/x/' $$t ; \ + fi; \ + fi` + AR_FOR_TARGET = ` \ if [ -f $$r/binutils/ar ] ; then \ echo $$r/binutils/ar ; \ @@ -283,8 +311,8 @@ RANLIB_FOR_TARGET = ` \ fi` NM_FOR_TARGET = ` \ - if [ -f $$r/binutils/nm.new ] ; then \ - echo $$r/binutils/nm.new ; \ + if [ -f $$r/binutils/nm-new ] ; then \ + echo $$r/binutils/nm-new ; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ echo $(NM); \ @@ -320,6 +348,7 @@ BASE_FLAGS_TO_PASS = \ "INSTALL=$(INSTALL)" \ "INSTALL_DATA=$(INSTALL_DATA)" \ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ + "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ "LDFLAGS=$(LDFLAGS)" \ "LEX=$(LEX)" \ "LD_FOR_TARGET=$(LD_FOR_TARGET)" \ @@ -338,7 +367,8 @@ BASE_FLAGS_TO_PASS = \ "EXPECT=$(EXPECT)" \ "RUNTEST=$(RUNTEST)" \ "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ - "YACC=$(BISON)" \ + "WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \ + "YACC=$(YACC)" \ "exec_prefix=$(exec_prefix)" \ "prefix=$(prefix)" \ "tooldir=$(tooldir)" @@ -352,9 +382,10 @@ EXTRA_HOST_FLAGS = \ 'CC=$(CC)' \ 'CXX=$(CXX)' \ 'DLLTOOL=$(DLLTOOL)' \ + 'LD=$(LD)' \ 'NM=$(NM)' \ - 'RANLIB=$(RANLIB)' - + 'RANLIB=$(RANLIB)' \ + 'WINDRES=$(WINDRES)' FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) @@ -387,7 +418,8 @@ EXTRA_TARGET_FLAGS = \ 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \ 'NM=$$(NM_FOR_TARGET)' \ 'PICFLAG=$$(PICFLAG_FOR_TARGET)' \ - 'RANLIB=$$(RANLIB_FOR_TARGET)' + 'RANLIB=$$(RANLIB_FOR_TARGET)' \ + 'WINDRES=$$(WINDRES_FOR_TARGET)' TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) @@ -408,16 +440,17 @@ EXTRA_GCC_FLAGS = \ 'HOST_PREFIX_1=$(HOST_PREFIX_1)' \ 'NM=$(NM)' \ 'RANLIB=$$(RANLIB_FOR_TARGET)' \ + 'WINDRES=$$(WINDRES_FOR_TARGET)' \ "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \ - `if test x"$(LANGUAGES)" != x; then echo "LANGUAGES=$(LANGUAGES)"; fi` \ - `if test x"$(STMP_FIXPROTO)" != x; then echo "STMP_FIXPROTO=$(STMP_FIXPROTO)"; fi` \ - `if test x"$(LIMITS_H_TEST)" != x; then echo "LIMITS_H_TEST=$(LIMITS_H_TEST)"; fi` \ - `if test x"$(LIBGCC1_TEST)" != x; then echo "LIBGCC1_TEST=$(LIBGCC1_TEST)"; fi` \ - `if test x"$(LIBGCC2_CFLAGS)" != x; then echo "LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)"; fi` \ - `if test x"$(LIBGCC2_DEBUG_CFLAGS)" != x; then echo "LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)"; fi` \ - `if test x"$(LIBGCC2_INCLUDES)" != x; then echo "LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)"; fi` \ - `if test x"$(ENQUIRE)" != x; then echo "ENQUIRE=$(ENQUIRE)"; fi` \ - `if test x"$(BOOT_CFLAGS)" != x; then echo "BOOT_CFLAGS=$(BOOT_CFLAGS)"; fi` + "`if test x'$(LANGUAGES)' != x; then echo 'LANGUAGES=$(LANGUAGES)'; else echo 'XFOO=bar'; fi`" \ + "`if test x'$(STMP_FIXPROTO)' != x; then echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)'; else echo 'XFOO=bar'; fi`" \ + "`if test x'$(LIMITS_H_TEST)' != x; then echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)'; else echo 'XFOO=bar'; fi`" \ + "`if test x'$(LIBGCC1_TEST)' != x; then echo 'LIBGCC1_TEST=$(LIBGCC1_TEST)'; else echo 'XFOO=bar'; fi`" \ + "`if test x'$(LIBGCC2_CFLAGS)' != x; then echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)'; else echo 'XFOO=bar'; fi`" \ + "`if test x'$(LIBGCC2_DEBUG_CFLAGS)' != x; then echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)'; else echo 'XFOO=bar'; fi`" \ + "`if test x'$(LIBGCC2_INCLUDES)' != x; then echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)'; else echo 'XFOO=bar'; fi`" \ + "`if test x'$(ENQUIRE)' != x; then echo 'ENQUIRE=$(ENQUIRE)'; else echo 'XFOO=bar'; fi`" \ + "`if test x'$(BOOT_CFLAGS)' != x; then echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)'; else echo 'XFOO=bar'; fi`" GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) @@ -430,6 +463,7 @@ ALL_MODULES = \ all-bash \ all-bfd \ all-binutils \ + all-bison \ all-byacc \ all-cvs \ all-db \ @@ -456,6 +490,9 @@ ALL_MODULES = \ all-inet \ all-ispell \ all-itcl \ + $(start-sanitize-ide) \ + all-jstools \ + $(end-sanitize-ide) \ all-ld \ all-libiberty \ $(start-sanitize-ide) \ @@ -496,6 +533,7 @@ ALL_MODULES = \ # are tested as part of the host's native tool-chain, and not # tested in a cross configuration. NATIVE_CHECK_MODULES = \ + check-bison \ check-byacc \ check-flex @@ -528,6 +566,9 @@ CROSS_CHECK_MODULES = \ check-inet \ check-ispell \ check-itcl \ + $(start-sanitize-ide) \ + check-jstools \ + $(end-sanitize-ide) \ check-ld \ check-libiberty \ $(start-sanitize-ide) \ @@ -564,13 +605,18 @@ CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES) # This is a list of the install targets for all of the modules which are # compiled using $(FLAGS_TO_PASS). +# We put install-opcodes before install-binutils because the installed +# binutils might be on PATH, and they might need the shared opcodes +# library. INSTALL_MODULES = \ install-apache \ install-autoconf \ install-automake \ install-bash \ install-bfd \ + install-opcodes \ install-binutils \ + install-bison \ install-byacc \ install-cvs \ install-db \ @@ -597,6 +643,9 @@ INSTALL_MODULES = \ install-inet \ install-ispell \ install-itcl \ + $(start-sanitize-ide) \ + install-jstools \ + $(end-sanitize-ide) \ install-ld \ install-libiberty \ $(start-sanitize-ide) \ @@ -605,7 +654,6 @@ INSTALL_MODULES = \ install-m4 \ install-make \ install-mmalloc \ - install-opcodes \ install-patch \ install-perl \ install-prms \ @@ -639,7 +687,8 @@ ALL_X11_MODULES = \ all-gash \ all-guile \ all-tclX \ - all-tk + all-tk \ + all-tix # This is a list of the check targets for all of the modules which are # compiled using $(X11_FLAGS_TO_PASS). @@ -649,7 +698,9 @@ CHECK_X11_MODULES = \ check-guile \ check-expect \ check-gash \ - check-tclX + check-tclX \ + check-tk \ + check-tix # This is a list of the install targets for all the modules which are # compiled using $(X11_FLAGS_TO_PASS). @@ -661,7 +712,8 @@ INSTALL_X11_MODULES = \ install-expect \ install-gash \ install-tclX \ - install-tk + install-tk \ + install-tix # This is a list of the targets for all of the modules which are compiled # using $(TARGET_FLAGS_TO_PASS). @@ -674,6 +726,7 @@ ALL_TARGET_MODULES = \ all-target-winsup \ all-target-libgloss \ all-target-libiberty \ + all-target-gperf \ all-target-examples # This is a list of the configure targets for all of the modules which @@ -687,6 +740,7 @@ CONFIGURE_TARGET_MODULES = \ configure-target-winsup \ configure-target-libgloss \ configure-target-libiberty \ + configure-target-gperf \ configure-target-examples # This is a list of the check targets for all of the modules which are @@ -697,7 +751,8 @@ CHECK_TARGET_MODULES = \ check-target-libg++ \ check-target-newlib \ check-target-winsup \ - check-target-libiberty + check-target-libiberty \ + check-target-gperf # This is a list of the install targets for all of the modules which are # compiled using $(TARGET_FLAGS_TO_PASS). @@ -708,7 +763,8 @@ INSTALL_TARGET_MODULES = \ install-target-newlib \ install-target-winsup \ install-target-libgloss \ - install-target-libiberty + install-target-libiberty \ + install-target-gperf # This is a list of the targets for which we can do a clean-{target}. CLEAN_MODULES = \ @@ -718,6 +774,7 @@ CLEAN_MODULES = \ clean-bash \ clean-bfd \ clean-binutils \ + clean-bison \ clean-byacc \ clean-cvs \ clean-db \ @@ -744,6 +801,9 @@ CLEAN_MODULES = \ clean-inet \ clean-ispell \ clean-itcl \ + $(start-sanitize-ide) \ + clean-jstools \ + $(end-sanitize-ide) \ clean-ld \ clean-libiberty \ $(start-sanitize-ide) \ @@ -787,6 +847,7 @@ CLEAN_TARGET_MODULES = \ clean-target-winsup \ clean-target-libgloss \ clean-target-libiberty \ + clean-target-gperf \ clean-target-examples # All of the x11 modules that can be cleaned @@ -798,7 +859,8 @@ CLEAN_X11_MODULES = \ clean-gash \ clean-guile \ clean-tclX \ - clean-tk + clean-tk \ + clean-tix # The first rule in the file had better be this one. Don't put any above it. all: all.normal @@ -849,12 +911,12 @@ $(DO_X): done; \ ;; \ esac ; \ - export AR AS CC CXX NM RANLIB DLLTOOL; \ + export AR AS CC CXX LD NM RANLIB DLLTOOL WINDRES; \ if (cd ./$$i; \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "NM=$${NM}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ $${target}); \ then true; else exit 1; fi; \ else true; fi; \ @@ -868,12 +930,12 @@ $(DO_X): for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'|"`; \ done; \ - export AR AS CC CXX NM RANLIB DLLTOOL; \ + export AR AS CC CXX LD NM RANLIB DLLTOOL WINDRES; \ if (cd $(TARGET_SUBDIR)/$$i; \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "NM=$${NM}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ $${target}); \ then true; else exit 1; fi; \ else true; fi; \ @@ -1128,6 +1190,7 @@ $(CONFIGURE_TARGET_MODULES): LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ NM="$(NM_FOR_TARGET)"; export NM; \ RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \ + WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ echo Configuring in $(TARGET_SUBDIR)/$${dir}; \ cd $(TARGET_SUBDIR)/$${dir}; \ case $(srcdir) in \ @@ -1256,7 +1319,7 @@ $(CHECK_X11_MODULES): # This rule is used to install the modules which use X11_FLAGS_TO_PASS. # To build a target install-X means to cd to X and make install. .PHONY: $(INSTALL_X11_MODULES) -$(INSTALL_X11_MODULES): +$(INSTALL_X11_MODULES): installdirs @dir=`echo $@ | sed -e 's/install-//'`; \ if [ -f ./$${dir}/Makefile ] ; then \ r=`pwd`; export r; \ @@ -1334,18 +1397,19 @@ install-dosrel-fake: # This is a list of inter-dependencies among modules. all-apache: -all-autoconf: all-m4 +all-autoconf: all-m4 all-texinfo all-automake: all-bash: all-bfd: -all-binutils: all-libiberty all-opcodes all-bfd all-flex all-byacc +all-binutils: all-libiberty all-opcodes all-bfd all-flex all-bison all-byacc +all-bison: all-texinfo all-byacc: all-cvs: all-db: all-dejagnu: all-tcl all-expect all-tk all-diff: all-libiberty all-emacs: -all-emacs19: all-byacc +all-emacs19: all-bison all-byacc all-etc: configure-target-examples: $(ALL_GCC) all-target-examples: configure-target-examples @@ -1353,16 +1417,18 @@ all-expect: all-tcl all-tk all-fileutils: all-libiberty all-findutils: all-find: -all-flex: all-libiberty all-byacc +all-flex: all-libiberty all-bison all-byacc all-gas: all-libiberty all-opcodes all-bfd all-gash: all-tcl all-gawk: ALL_GCC = all-gcc -all-gcc: all-byacc all-binutils all-gas all-ld -all-bootstrap: all-libiberty all-byacc all-binutils all-gas all-ld -GDB_TK = all-tk all-tcl -all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK) +all-gcc: all-bison all-byacc all-binutils all-gas all-ld +all-bootstrap: all-libiberty all-bison all-byacc all-binutils all-gas all-ld +GDB_TK = all-tk all-tcl all-itcl all-tix +all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK) all-gnuserv: +configure-target-gperf: $(ALL_GCC) +all-target-gperf: configure-target-gperf all-target-libiberty all-target-libg++ all-gprof: all-libiberty all-bfd all-opcodes all-grep: all-libiberty all-grez: all-libiberty all-bfd all-opcodes @@ -1377,7 +1443,10 @@ all-indent: all-inet: all-tcl all-send-pr all-perl all-ispell: all-emacs19 all-itcl: all-tcl all-tk -all-ld: all-libiberty all-bfd all-opcodes all-byacc all-flex +# start-sanitize-ide +all-jstools: all-tcl all-tk all-libide +# end-sanitize-ide +all-ld: all-libiberty all-bfd all-opcodes all-bison all-byacc all-flex configure-target-libg++: $(ALL_GCC) configure-target-librx all-target-libg++: configure-target-libg++ all-gas all-ld all-gcc all-target-libiberty all-target-newlib all-target-libio all-target-librx all-target-libstdc++ configure-target-libgloss: $(ALL_GCC) @@ -1407,8 +1476,8 @@ all-recode: all-libiberty all-sed: all-libiberty all-send-pr: all-prms all-shellutils: -all-sim: all-libiberty all-bfd all-opcodes -all-sn: all-tcl all-tk all-itcl all-db +all-sim: all-libiberty all-bfd all-opcodes all-readline +all-sn: all-tcl all-tk all-tix all-itcl all-db all-grep all-tar: all-libiberty all-tcl: all-tclX: all-tcl all-tk @@ -1417,8 +1486,9 @@ all-texinfo: all-libiberty all-textutils: all-tgas: all-libiberty all-bfd all-opcodes all-time: +all-tix: all-tcl all-tk # start-sanitize-ide -all-vmake: all-tcl all-tk all-itcl all-libide +all-vmake: all-tcl all-tk all-itcl all-libide all-tix # end-sanitize-ide all-wdiff: all-target-winsup: all-target-newlib all-target-libiberty all-target-librx all-target-libio configure-target-winsup @@ -1427,6 +1497,7 @@ all-uudecode: all-libiberty configure-target-libiberty: $(ALL_GCC) all-target-libiberty: configure-target-libiberty all-gcc all-ld all-target-newlib all-target: $(ALL_TARGET_MODULES) +install-itcl: install-tcl install-target: $(INSTALL_TARGET_MODULES) ### other supporting targets @@ -1474,7 +1545,7 @@ DEVO_SUPPORT= README Makefile.in configure configure.in \ config.guess config.sub config move-if-change \ mpw-README mpw-build.in mpw-config.in mpw-configure mpw-install \ COPYING COPYING.LIB install-sh config-ml.in symlink-tree \ - mkinstalldirs + mkinstalldirs ltconfig ltmain.sh missing ylwrap # Files in devo/etc used in any net release. # ChangeLog omitted because it may refer to files which are not in this @@ -1485,25 +1556,14 @@ ETC_SUPPORT= Makefile.in configure configure.in standards.texi \ # When you use `make setup-dirs' or `make taz' you should always redefine # this macro. SUPPORT_FILES = list-of-support-files-for-tool-in-question -# Files where "byacc" (Cygnus version) should be changed to "bison -y" (FSF). -DISTBISONFILES= binutils/Makefile.in gas/Makefile.in gdb/Makefile.in ld/Makefile.in .PHONY: taz taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \ texinfo/texinfo.tex texinfo/gpl.texinfo texinfo/lgpl.texinfo - # Make sure "diststuff" files get built properly. - for f in $(DISTBISONFILES) ; do \ - if [ -r $$f ]; then \ - sed '/^BISON *=.*$$/s/.*/BISON = bison -y/' <$$f >tmp ; \ - mv -f tmp $$f ; \ - else true; fi ; \ - done # Take out texinfo from a few places; make simple BISON=bison line. sed -e '/^all\.normal: /s/\all-texinfo //' \ -e '/^ install-texinfo /d' \ - -e '/^BISON = /,/^$$/d' \ - -e '/^# BISON:/s/.*/BISON = bison -y/' \ tmp mv -f tmp Makefile.in # @@ -1555,8 +1615,12 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \ ln -s ../../../texinfo/util/tex3patch proto-toplev/texinfo/util ; \ else true; fi chmod og=u `find . -print` - $(MAKE) -f Makefile.in do-tar-gz TOOL=$(TOOL) \ - VER=`sed <$(TOOL)/Makefile.in -n 's/^VERSION *= *//p'` + if grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \ + ver=`sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'`; \ + else \ + ver=`sed <$(TOOL)/Makefile.in -n 's/^VERSION *= *//p'`; \ + fi; \ + $(MAKE) -f Makefile.in do-tar-gz TOOL=$(TOOL) VER=$$ver do-tar-gz: echo "==> Making $(TOOL)-$(VER).tar.gz"