X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=Makefile.in;h=c27046ccc0e7604b2ca69748e9fba077d794da00;hb=367e0392e49e724889aa59ac379a986eb5f5aebb;hp=f1aac1d7a37c2e74c5bb60ffadd7eb21a5603bef;hpb=e677105ccd976d21cbab331df8c3db39d3846832;p=deliverable%2Fbinutils-gdb.git diff --git a/Makefile.in b/Makefile.in index f1aac1d7a3..c27046ccc0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -58,7 +58,7 @@ GDB_NLM_DEPS = SHELL = /bin/sh # INSTALL_PROGRAM_ARGS is changed by configure.in to use -x for a -# cygwin32 host. +# cygwin host. INSTALL_PROGRAM_ARGS = INSTALL = $(SHELL) $$s/install-sh -c @@ -211,11 +211,14 @@ INSTALL_TARGET_CROSS = installdirs \ 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/$(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; \ + case "$(target_canonical)" in \ + i[3456]86-*-cygwin*) \ + 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/winsup/include -idirafter $$s/newlib/libc/include -nostdinc; \ + ;; \ + *) \ + echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \ + ;; \ + esac \ else \ echo $$r/gcc/xgcc -B$$r/gcc/; \ fi; \ @@ -247,11 +250,14 @@ CHILL_FOR_TARGET = ` \ 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/$(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; \ + case "$(target_canonical)" in \ + i[3456]86-*-cygwin*) \ + echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/winsup/include -idirafter $$s/newlib/libc/include -nostdinc; \ + ;; \ + *) \ + echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \ + ;; \ + esac \ else \ echo $$r/gcc/xgcc -B$$r/gcc/; \ fi; \ @@ -577,6 +583,7 @@ ALL_MODULES = \ $(end-sanitize-cygnus) \ all-tar \ all-tcl \ + all-tcl8.1 \ all-texinfo \ all-textutils \ all-tgas \ @@ -586,6 +593,7 @@ ALL_MODULES = \ all-vmake \ $(end-sanitize-ide) \ all-wdiff \ + all-zip \ $(EXTRA_TARGET_HOST_ALL_MODULES) # This is a list of the check targets for all of the modules which are @@ -597,7 +605,8 @@ ALL_MODULES = \ NATIVE_CHECK_MODULES = \ check-bison \ check-byacc \ - check-flex + check-flex \ + check-zip CROSS_CHECK_MODULES = \ check-apache \ @@ -727,6 +736,7 @@ INSTALL_MODULES = \ install-intl \ install-ispell \ install-tcl \ + install-tcl8.1 \ install-itcl \ $(start-sanitize-ide) \ install-jstools \ @@ -765,6 +775,7 @@ INSTALL_MODULES = \ install-vmake \ $(end-sanitize-ide) \ install-wdiff \ + install-zip \ $(EXTRA_TARGET_HOST_INSTALL_MODULES) # This is a list of the targets for all of the modules which are compiled @@ -778,6 +789,7 @@ ALL_X11_MODULES = \ all-guile \ all-tclX \ all-tk \ + all-tk8.1 \ all-tix # This is a list of the check targets for all of the modules which are @@ -803,6 +815,7 @@ INSTALL_X11_MODULES = \ install-gash \ install-tclX \ install-tk \ + install-tk8.1 \ install-tix # This is a list of the targets for all of the modules which are compiled @@ -976,7 +989,8 @@ CLEAN_MODULES = \ $(start-sanitize-ide) \ clean-vmake \ $(end-sanitize-ide) \ - clean-wdiff + clean-wdiff \ + clean-zip # All of the target modules that can be cleaned CLEAN_TARGET_MODULES = \ @@ -1708,7 +1722,7 @@ all-indent: all-inet: all-tcl all-send-pr all-perl all-intl: all-ispell: all-emacs19 -all-itcl: all-tcl all-tk +all-itcl: all-tcl all-tk all-tcl8.1 all-tk8.1 # start-sanitize-ide all-jstools: all-tcl all-tk all-tix all-libgui all-libide all-libidetcl # end-sanitize-ide @@ -1724,7 +1738,7 @@ 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-libgui: all-tcl all-tk all-tcl8.1 all-tk8.1 all-itcl all-libiberty: # start-sanitize-ide all-libide: all-ilu @@ -1732,7 +1746,7 @@ all-libidetcl: all-tcl all-tk all-itcl all-ilu all-libgui all-libide # end-sanitize-ide # start-sanitize-java configure-target-libjava: $(ALL_GCC) configure-target-boehm-gc configure-target-qthreads -all-target-libjava: configure-target-libjava all-gcc all-target-newlib all-target-boehm-gc all-target-qthreads +all-target-libjava: configure-target-libjava all-gcc all-zip all-target-newlib all-target-boehm-gc all-target-qthreads # end-sanitize-java configure-target-librx: $(ALL_GCC) configure-target-newlib all-target-librx: configure-target-librx @@ -1761,17 +1775,19 @@ all-send-pr: all-prms all-shellutils: all-sim: all-libiberty all-bfd all-opcodes all-readline # start-sanitize-cygnus -all-snavigator: all-tcl all-tk all-tix all-itcl all-db all-grep all-flexlm all-libgui +all-snavigator: all-tcl8.1 all-tk8.1 all-tix all-itcl all-db all-grep all-flexlm all-libgui # end-sanitize-cygnus all-tar: all-libiberty all-tcl: +all-tcl8.1: all-tclX: all-tcl all-tk all-tk: all-tcl +all-tk8.1: all-tcl8.1 all-texinfo: all-libiberty all-textutils: all-tgas: all-libiberty all-bfd all-opcodes all-time: -all-tix: all-tcl all-tk +all-tix: all-tcl all-tk all-tcl8.1 all-tk8.1 # start-sanitize-ide all-vmake: all-tcl all-tk all-itcl all-tix all-libgui all-libide all-libidetcl # end-sanitize-ide @@ -1779,6 +1795,7 @@ all-wdiff: 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 +all-zip: configure-target-libiberty: $(ALL_GCC) all-target-libiberty: configure-target-libiberty all-gcc all-ld all-target-newlib all-target: $(ALL_TARGET_MODULES)