X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=Makefile.in;h=e482971407c47ae70a5ac86f6201b2c4d02a73c1;hb=b4ac40fad552923a3e17e1915c1c69b5db4e64d6;hp=b9e93df51061ea639ad4aa1cea152e939875959d;hpb=fab3dd2d3ad71329eea69c165505f8d2a0ad399e;p=deliverable%2Fbinutils-gdb.git diff --git a/Makefile.in b/Makefile.in index b9e93df510..e482971407 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,7 @@ # # Makefile for directory with subdirs to build. -# Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 1997 Free Software Foundation +# Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 1998 +# Free Software Foundation # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,16 +21,25 @@ srcdir = . prefix = /usr/local - exec_prefix = $(prefix) -bindir = $(exec_prefix)/bin -libdir = $(exec_prefix)/lib + +bindir=${exec_prefix}/bin +sbindir=${exec_prefix}/sbin +libexecdir=${exec_prefix}/libexec +datadir=${prefix}/share +sysconfdir=${prefix}/etc +sharedstatedir=${prefix}/com +localstatedir=${prefix}/var +libdir=${exec_prefix}/lib +includedir=${prefix}/include +oldincludedir=/usr/include +infodir=${prefix}/info +mandir=${prefix}/man + tooldir = $(exec_prefix)/$(target) program_transform_name = -datadir = $(prefix)/share -mandir = $(prefix)/man man1dir = $(mandir)/man1 man2dir = $(mandir)/man2 man3dir = $(mandir)/man3 @@ -39,16 +49,18 @@ man6dir = $(mandir)/man6 man7dir = $(mandir)/man7 man8dir = $(mandir)/man8 man9dir = $(mandir)/man9 -infodir = $(prefix)/info -includedir = $(prefix)/include 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_XFORM = $(INSTALL) -t='$(program_transform_name)' INSTALL_DOSREL = install-dosrel-fake @@ -63,9 +75,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 = @@ -77,10 +90,9 @@ PICFLAG_FOR_TARGET = CHILLFLAGS = $(CFLAGS) CHILL_LIB = -lchill # end-sanitize-chill -CXX = gcc +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 @@ -88,8 +100,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 @@ -97,10 +113,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 ] ; \ @@ -139,7 +163,7 @@ OTHERS = # This is set by the configure script to the list of directories which # should be built using the target tools. -TARGET_CONFIGDIRS = libiberty libgloss newlib libio librx libstdc++ libg++ winsup +TARGET_CONFIGDIRS = libiberty libgloss newlib libio librx libstdc++ libg++ winsup opcodes libstub cygmon # Target libraries are put under this directory: # Changed by configure to $(target_alias) if cross. @@ -163,10 +187,10 @@ REALLY_SET_LIB_PATH = \ ALL = all.normal INSTALL_TARGET = installdirs \ + install-gcc \ $(INSTALL_MODULES) \ $(INSTALL_TARGET_MODULES) \ $(INSTALL_X11_MODULES) \ - install-gcc \ $(INSTALL_DOSREL) @@ -174,7 +198,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/$(TARGET_SUBDIR)/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; \ @@ -213,7 +237,7 @@ CXX_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/$(TARGET_SUBDIR)/newlib/ -L$$r/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; \ @@ -224,13 +248,13 @@ CXX_FOR_TARGET = ` \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ echo $(CXX); \ else \ - t='$(program_transform_name)'; echo gcc | sed -e 's/x/x/' $$t; \ + t='$(program_transform_name)'; echo c++ | sed -e 's/x/x/' $$t; \ fi; \ 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); \ @@ -240,8 +264,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); \ @@ -261,6 +285,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 ; \ @@ -284,8 +319,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); \ @@ -321,7 +356,7 @@ BASE_FLAGS_TO_PASS = \ "INSTALL=$(INSTALL)" \ "INSTALL_DATA=$(INSTALL_DATA)" \ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ - "INSTALL_XFORM=$(INSTALL_XFORM)" \ + "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ "LDFLAGS=$(LDFLAGS)" \ "LEX=$(LEX)" \ "LD_FOR_TARGET=$(LD_FOR_TARGET)" \ @@ -336,14 +371,29 @@ BASE_FLAGS_TO_PASS = \ "PICFLAG=$(PICFLAG)" \ "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ "RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \ + "RPATH_ENVVAR=$(RPATH_ENVVAR)" \ "SHELL=$(SHELL)" \ "EXPECT=$(EXPECT)" \ "RUNTEST=$(RUNTEST)" \ "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ - "YACC=$(BISON)" \ + "WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \ + "YACC=$(YACC)" \ + "bindir=$(bindir)" \ + "datadir=$(datadir)" \ "exec_prefix=$(exec_prefix)" \ + "includedir=$(includedir)" \ + "infodir=$(infodir)" \ + "libdir=$(libdir)" \ + "libexecdir=$(libexecdir)" \ + "lispdir=$(lispdir)" \ + "localstatedir=$(localstatedir)" \ + "mandir=$(mandir)" \ + "oldincludedir=$(oldincludedir)" \ "prefix=$(prefix)" \ - "tooldir=$(tooldir)" + "sbindir=$(sbindir)" \ + "sharedstatedir=$(sharedstatedir)" \ + "sysconfdir=$(sysconfdir)" \ + "tooldir=$(tooldir)" # Flags to pass down to most sub-makes, in which we're building with # the host environment. @@ -354,9 +404,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) @@ -389,7 +440,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) @@ -410,16 +462,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` + "`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s/.*=$$/XFOO=/`" \ + "`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s/.*=$$/XFOO=/`" \ + "`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s/.*=$$/XFOO=/`" \ + "`echo 'LIBGCC1_TEST=$(LIBGCC1_TEST)' | sed -e s/.*=$$/XFOO=/`" \ + "`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \ + "`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \ + "`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s/.*=$$/XFOO=/`" \ + "`echo 'ENQUIRE=$(ENQUIRE)' | sed -e s/.*=$$/XFOO=/`" \ + "`echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \ GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) @@ -427,12 +480,15 @@ GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) # using $(FLAGS_TO_PASS). ALL_MODULES = \ all-apache \ + all-ash \ all-autoconf \ + all-automake \ all-bash \ all-bfd \ all-binutils \ + all-bison \ all-byacc \ - all-cvs \ + all-cvssrc \ all-db \ all-dejagnu \ all-diff \ @@ -444,17 +500,32 @@ ALL_MODULES = \ all-flex \ all-gas \ all-gawk \ + all-gettext \ + all-gnuserv \ all-gprof \ all-grep \ all-grez \ all-gzip \ all-hello \ + $(start-sanitize-ide) \ + all-ilu \ + $(end-sanitize-ide) \ all-indent \ all-inet \ + all-intl \ all-ispell \ all-itcl \ + $(start-sanitize-ide) \ + all-jstools \ + $(end-sanitize-ide) \ all-ld \ + all-libgui \ all-libiberty \ + $(start-sanitize-ide) \ + all-libide \ + all-libidetcl \ + $(end-sanitize-ide) \ + all-libtool \ all-m4 \ all-make \ all-mmalloc \ @@ -470,7 +541,7 @@ ALL_MODULES = \ all-send-pr \ all-shellutils \ all-sim \ - all-sn \ + all-snavigator \ all-tar \ all-tcl \ all-texinfo \ @@ -478,6 +549,9 @@ ALL_MODULES = \ all-tgas \ all-time \ all-uudecode \ + $(start-sanitize-ide) \ + all-vmake \ + $(end-sanitize-ide) \ all-wdiff # This is a list of the check targets for all of the modules which are @@ -487,16 +561,19 @@ 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 CROSS_CHECK_MODULES = \ check-apache \ + check-ash \ check-autoconf \ + check-automake \ check-bash \ check-bfd \ check-binutils \ - check-cvs \ + check-cvssrc \ check-db \ check-dejagnu \ check-diff \ @@ -506,16 +583,31 @@ CROSS_CHECK_MODULES = \ check-find \ check-gas \ check-gawk \ + check-gettext \ + check-gnuserv \ check-gprof \ check-grep \ check-gzip \ check-hello \ + $(start-sanitize-ide) \ + check-ilu \ + $(end-sanitize-ide) \ check-indent \ check-inet \ + check-intl \ check-ispell \ check-itcl \ + $(start-sanitize-ide) \ + check-jstools \ + $(end-sanitize-ide) \ check-ld \ + check-libgui \ check-libiberty \ + $(start-sanitize-ide) \ + check-libide \ + check-libidetcl \ + $(end-sanitize-ide) \ + check-libtool \ check-m4 \ check-make \ check-mmcheckoc \ @@ -529,7 +621,7 @@ CROSS_CHECK_MODULES = \ check-sed \ check-send-pr \ check-shellutils \ - check-sn \ + check-snavigator \ check-sim \ check-tar \ check-tcl \ @@ -538,20 +630,32 @@ CROSS_CHECK_MODULES = \ check-tgas \ check-time \ check-uudecode \ + $(start-sanitize-ide) \ + check-vmake \ + $(end-sanitize-ide) \ check-wdiff 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. +# We put install-tcl before install-itcl because itcl wants to run a +# program on installation which uses the Tcl libraries. INSTALL_MODULES = \ install-apache \ + install-ash \ install-autoconf \ + install-automake \ install-bash \ install-bfd \ + install-opcodes \ install-binutils \ + install-bison \ install-byacc \ - install-cvs \ + install-cvssrc \ install-db \ install-dejagnu \ install-diff \ @@ -563,21 +667,36 @@ INSTALL_MODULES = \ install-flex \ install-gas \ install-gawk \ + install-gettext \ + install-gnuserv \ install-gprof \ install-grep \ install-grez \ install-gzip \ install-hello \ + $(start-sanitize-ide) \ + install-ilu \ + $(end-sanitize-ide) \ install-indent \ install-inet \ + install-intl \ install-ispell \ + install-tcl \ install-itcl \ + $(start-sanitize-ide) \ + install-jstools \ + $(end-sanitize-ide) \ install-ld \ + install-libgui \ install-libiberty \ + $(start-sanitize-ide) \ + install-libide \ + install-libidetcl \ + $(end-sanitize-ide) \ + install-libtool \ install-m4 \ install-make \ install-mmalloc \ - install-opcodes \ install-patch \ install-perl \ install-prms \ @@ -588,14 +707,16 @@ INSTALL_MODULES = \ install-send-pr \ install-shellutils \ install-sim \ - install-sn \ + install-snavigator \ install-tar \ - install-tcl \ install-texinfo \ install-textutils \ install-tgas \ install-time \ install-uudecode \ + $(start-sanitize-ide) \ + install-vmake \ + $(end-sanitize-ide) \ install-wdiff # This is a list of the targets for all of the modules which are compiled @@ -608,7 +729,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). @@ -618,7 +740,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). @@ -630,7 +754,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). @@ -643,7 +768,10 @@ ALL_TARGET_MODULES = \ all-target-winsup \ all-target-libgloss \ all-target-libiberty \ - all-target-examples + all-target-gperf \ + all-target-examples \ + all-target-libstub \ + all-target-cygmon # This is a list of the configure targets for all of the modules which # are compiled using the target tools. @@ -656,7 +784,10 @@ CONFIGURE_TARGET_MODULES = \ configure-target-winsup \ configure-target-libgloss \ configure-target-libiberty \ - configure-target-examples + configure-target-gperf \ + configure-target-examples \ + configure-target-libstub \ + configure-target-cygmon # This is a list of the check targets for all of the modules which are # compiled using $(TARGET_FLAGS_TO_PASS). @@ -666,7 +797,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). @@ -677,17 +809,21 @@ 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 = \ clean-apache \ + clean-ash \ clean-autoconf \ + clean-automake \ clean-bash \ clean-bfd \ clean-binutils \ + clean-bison \ clean-byacc \ - clean-cvs \ + clean-cvssrc \ clean-db \ clean-dejagnu \ clean-diff \ @@ -699,17 +835,32 @@ CLEAN_MODULES = \ clean-flex \ clean-gas \ clean-gawk \ + clean-gettext \ + clean-gnuserv \ clean-gprof \ clean-grep \ clean-grez \ clean-gzip \ clean-hello \ + $(start-sanitize-ide) \ + clean-ilu \ + $(end-sanitize-ide) \ clean-indent \ clean-inet \ + clean-intl \ clean-ispell \ clean-itcl \ + $(start-sanitize-ide) \ + clean-jstools \ + $(end-sanitize-ide) \ clean-ld \ + clean-libgui \ clean-libiberty \ + $(start-sanitize-ide) \ + clean-libide \ + clean-libidetcl \ + $(end-sanitize-ide) \ + clean-libtool \ clean-m4 \ clean-make \ clean-mmalloc \ @@ -725,7 +876,7 @@ CLEAN_MODULES = \ clean-send-pr \ clean-shellutils \ clean-sim \ - clean-sn \ + clean-snavigator \ clean-tar \ clean-tcl \ clean-texinfo \ @@ -733,6 +884,9 @@ CLEAN_MODULES = \ clean-tgas \ clean-time \ clean-uudecode \ + $(start-sanitize-ide) \ + clean-vmake \ + $(end-sanitize-ide) \ clean-wdiff # All of the target modules that can be cleaned @@ -745,7 +899,10 @@ CLEAN_TARGET_MODULES = \ clean-target-winsup \ clean-target-libgloss \ clean-target-libiberty \ - clean-target-examples + clean-target-gperf \ + clean-target-examples \ + clean-target-libstub \ + clean-target-cygmon # All of the x11 modules that can be cleaned CLEAN_X11_MODULES = \ @@ -756,7 +913,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 @@ -807,12 +965,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; \ @@ -826,12 +984,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; \ @@ -981,6 +1139,28 @@ gcc-no-fixedincludes: mv gcc/tmp-include gcc/include 2>/dev/null; \ else true; fi +# start-sanitize-ide +# Install Foundry. Avoid installing a bunch of stuff we don't need. +install-foundry: + mods="$(INSTALL_MODULES)"; \ + x11_mods="$(INSTALL_X11_MODULES)"; \ + for d in install-tcl install-tk install-itcl install-tix install-ilu; do \ + mods="`echo $${mods} | sed -e "s/$$d//"`"; \ + x11_mods="`echo $${x11_mods} | sed -e "s/$$d//"`"; \ + done; \ + $(MAKE) INSTALL_MODULES="$${mods}" INSTALL_X11_MODULES="$${x11_mods}" install + for d in tcl tk itcl tix ilu; do \ + if [ -f $$d/Makefile ]; then \ + r=`pwd`; export r; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ + (cd $$d; $(MAKE) $(FLAGS_TO_PASS) install-minimal); \ + else \ + true; \ + fi; \ + done +# end-sanitize-ide + # This rule is used to build the modules which use FLAGS_TO_PASS. To # build a target all-X means to cd to X and make all. # @@ -1086,6 +1266,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 \ @@ -1214,7 +1395,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; \ @@ -1292,17 +1473,22 @@ install-dosrel-fake: # This is a list of inter-dependencies among modules. all-apache: -all-autoconf: all-m4 +all-ash: +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-cvssrc: +configure-target-cygmon: $(ALL_GCC) +all-target-cygmon: configure-target-cygmon all-gas all-ld all-gcc all-target-libiberty all-target-newlib all-target-libio all-target-libstub 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 @@ -1310,15 +1496,22 @@ 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-libiberty 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-libgui +# start-sanitize-ide +GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui all-libide all-libidetcl +# end-sanitize-ide +all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK) +all-gettext: +all-gnuserv: +configure-target-gperf: $(ALL_GCC) +all-target-gperf: configure-target-gperf all-target-libiberty all-target-libstdc++ all-gprof: all-libiberty all-bfd all-opcodes all-grep: all-libiberty all-grez: all-libiberty all-bfd all-opcodes @@ -1326,22 +1519,38 @@ all-gui: all-gdb all-libproc all-target-librx all-guile: all-gzip: all-libiberty all-hello: all-libiberty +# start-sanitize-ide +all-ilu: +# end-sanitize-ide all-indent: all-inet: all-tcl all-send-pr all-perl +all-intl: 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-tix all-libgui all-libide all-libidetcl +# 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) all-target-libgloss: configure-target-libgloss configure-target-newlib configure-target-libio: $(ALL_GCC) all-target-libio: configure-target-libio all-gas all-ld all-gcc all-target-libiberty all-target-newlib +check-target-libio: all-target-libstdc++ +all-libgui: all-tcl all-tk all-itcl all-libiberty: +# start-sanitize-ide +all-libide: all-ilu +all-libidetcl: all-tcl all-tk all-itcl all-ilu all-libgui all-libide +# end-sanitize-ide configure-target-librx: $(ALL_GCC) configure-target-newlib all-target-librx: configure-target-librx configure-target-libstdc++: $(ALL_GCC) all-target-libstdc++: configure-target-libstdc++ all-gas all-ld all-gcc all-target-libiberty all-target-newlib all-target-libio +configure-target-libstub: $(ALL_GCC) +all-target-libstub: configure-target-libstub +all-libtool: all-m4: all-libiberty all-make: all-libiberty all-mmalloc: @@ -1357,8 +1566,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-snavigator: all-tcl all-tk all-tix all-itcl all-db all-grep all-tar: all-libiberty all-tcl: all-tclX: all-tcl all-tk @@ -1367,15 +1576,21 @@ 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-tix all-libgui all-libide all-libidetcl +# end-sanitize-ide all-wdiff: -all-target-winsup: all-target-newlib all-target-libiberty all-target-librx all-target-libio configure-target-winsup +all-target-winsup: all-target-newlib all-target-libiberty all-target-libio configure-target-winsup configure-target-winsup: configure-target-newlib 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-target: $(INSTALL_TARGET_MODULES) - +# start-sanitize-gdbtk +install-gdbtk: install-tcl install-tk install-itcl install-tix install-libgui install-gdb +#end-sanitize-gdbtk ### other supporting targets MAKEDIRS= \ @@ -1419,8 +1634,9 @@ Makefile: Makefile.in configure.in $(host_makefile_frag) $(target_makefile_frag) # distribution (perhaps it would be better to include it anyway). 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 \ - COPYING COPYING.LIB install-sh config-ml.in symlink-tree + mpw-README mpw-build.in mpw-config.in mpw-configure mpw-install \ + COPYING COPYING.LIB install-sh config-ml.in symlink-tree \ + 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 @@ -1431,25 +1647,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 .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. + # Take out texinfo from a few places. 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 # @@ -1501,8 +1706,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"