Ignore:
Timestamp:
Sep 15, 2006, 7:09:38 AM (19 years ago)
Author:
bird
Message:

Untested merge with GNU Make v3.81 (vendor/gnumake/2005-05-16 -> vendor/gnumake/current).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/gmake/makefile.com

    r53 r503  
    1313$! hb
    1414$! But don't ask Martin Zinser about the lines, I added/changed.
    15 $! In case of an error do some cleanup 
     15$! In case of an error do some cleanup
    1616$ on error then $ goto cleanup
    1717$! in case somebody set up her/his own symbol for cc
     
    3434$   ccopt = ""
    3535$  else
    36 $   ccopt = "/decc/prefix=all"
     36$   ccopt = "/decc/prefix=(all,except=(globfree,glob))"
    3737$   if f$trnlnm("SYS").eqs.""
    3838$    then
     
    6969$ filelist = "alloca ar arscan commands default dir expand file function " + -
    7070             "hash implicit job main misc read remake remote-stub rule " + -
    71              "signame variable version vmsfunctions vmsify vpath " + - 
    72              "[.glob]glob [.glob]fnmatch getopt1 getopt"
     71             "signame variable version vmsfunctions vmsify vpath " + -
     72             "[.glob]glob [.glob]fnmatch getopt1 getopt strcache"
    7373$ copy config.h-vms config.h
    7474$ n=0
     
    9696$ exit
    9797$!
    98 $!------------------------------------------------------------------------------
     98$!-----------------------------------------------------------------------------
    9999$!
    100100$! Check if this is a define relating to the properties of the C/C++
     
    102102$!
    103103$CHECK_CC_QUAL:
    104 $ open/write tmpc 'tc 
     104$ open/write tmpc 'tc
    105105$ ccqual = "/warn=(disable=questcompare)"
    106106$ write tmpc "#include <stdio.h>"
    107107$ write tmpc "unsigned int i = 1;"
    108108$ write tmpc "int main(){"
    109 $ write tmpc "if (i < 0){printf(""Mission impossible\n"");}}" 
     109$ write tmpc "if (i < 0){printf(""Mission impossible\n"");}}"
    110110$ close tmpc
    111111$ gosub cc_qual_check
    112112$ return
    113113$!
    114 $!------------------------------------------------------------------------------
     114$!-----------------------------------------------------------------------------
    115115$!
    116116$! Check for properties of C/C++ compiler
     
    123123$ set message/fac/ident/sever/text
    124124$ delete/nolog 'tmpnam'.*;*
    125 $ if cc_qual then ccopt = ccopt + ccqual 
     125$ if cc_qual then ccopt = ccopt + ccqual
    126126$ return
    127 $!------------------------------------------------------------------------------
     127$!-----------------------------------------------------------------------------
    128128$!
    129129$ compileit : subroutine
     
    132132$ if ploc .lt. f$length(p1) then filnam=f$extract(ploc+1,100,p1)
    133133$ write optf "''filnam'"
    134 $ cc'ccopt'/include=([],[.glob]) - 
    135   /define=("allocated_variable_expand_for_file=alloc_var_expand_for_file","unlink=remove","HAVE_CONFIG_H","VMS") - 
     134$ cc'ccopt'/include=([],[.glob]) -
     135  /define=("allocated_variable_expand_for_file=alloc_var_expand_for_file","unlink=remove","HAVE_CONFIG_H","VMS") -
    136136  'p1'
    137137$ exit
    138138$ endsubroutine : compileit
     139$!
     140$!-----------------------------------------------------------------------------
     141$!Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
     142$!2006 Free Software Foundation, Inc.
     143$!This file is part of GNU Make.
     144$!
     145$!GNU Make is free software; you can redistribute it and/or modify it under the
     146$!terms of the GNU General Public License as published by the Free Software
     147$!Foundation; either version 2, or (at your option) any later version.
     148$!
     149$!GNU Make is distributed in the hope that it will be useful, but WITHOUT ANY
     150$!WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
     151$!A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
     152$!
     153$!You should have received a copy of the GNU General Public License along with
     154$!GNU Make; see the file COPYING.  If not, write to the Free Software
     155$!Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
Note: See TracChangeset for help on using the changeset viewer.