Changeset 1471


Ignore:
Timestamp:
03/27/06 19:02:27 (8 years ago)
Author:
wehart
Message:

Removing the use of the 'cp -up' command. This has been replaced with
the acro/bin/cp_u command, which is a wrapper for 'cp'. This wrapper
was needed because the -u flag is not universally supported.

( Links to Acro-related mail archives at  http://software.sandia.gov/Acro/ )

Location:
colin/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • colin/trunk/Makefile.in

    r1470 r1471  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am. 
     1# Makefile.in generated by automake 1.9.2 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005  Free Software Foundation, Inc. 
     5# 2003, 2004  Free Software Foundation, Inc. 
    66# This Makefile.in is free software; the Free Software Foundation 
    77# gives unlimited permission to copy and/or distribute it, 
     
    347347# (2) otherwise, pass the desired values on the `make' command line. 
    348348$(RECURSIVE_TARGETS): 
    349         @failcom='exit 1'; \ 
    350         for f in x $$MAKEFLAGS; do \ 
    351           case $$f in \ 
    352             *=* | --[!k]*);; \ 
    353             *k*) failcom='fail=yes';; \ 
    354           esac; \ 
    355         done; \ 
     349        @set fnord $$MAKEFLAGS; amf=$$2; \ 
    356350        dot_seen=no; \ 
    357351        target=`echo $@ | sed s/-recursive//`; \ 
     
    365359          fi; \ 
    366360          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ 
    367           || eval $$failcom; \ 
     361           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ 
    368362        done; \ 
    369363        if test "$$dot_seen" = "no"; then \ 
     
    373367mostlyclean-recursive clean-recursive distclean-recursive \ 
    374368maintainer-clean-recursive: 
    375         @failcom='exit 1'; \ 
    376         for f in x $$MAKEFLAGS; do \ 
    377           case $$f in \ 
    378             *=* | --[!k]*);; \ 
    379             *k*) failcom='fail=yes';; \ 
    380           esac; \ 
    381         done; \ 
     369        @set fnord $$MAKEFLAGS; amf=$$2; \ 
    382370        dot_seen=no; \ 
    383371        case "$@" in \ 
     
    400388          fi; \ 
    401389          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ 
    402           || eval $$failcom; \ 
     390           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ 
    403391        done && test -z "$$fail" 
    404392tags-recursive: 
  • colin/trunk/colin/Makefile.am

    r1467 r1471  
    66TOPINC=../../../include 
    77TOPLIB=../../../lib 
     8TOPBIN=../../../bin 
    89 
    910if HAVE_ANSI_CPP_HEADERS 
     
    2627all-local: 
    2728        @if test -d $(TOPLIB) ; then : ; else mkdir $(TOPLIB) ; fi 
    28         @cp -up libcolin.a $(TOPLIB) 
     29        @$(TOPBIN)/cp_u libcolin.a $(TOPLIB) 
    2930 
    3031clean-local: 
  • colin/trunk/test/Makefile.in

    r1470 r1471  
    1 # Makefile.in generated by automake 1.9.6 from Makefile.am. 
     1# Makefile.in generated by automake 1.9.2 from Makefile.am. 
    22# @configure_input@ 
    33 
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 
    5 # 2003, 2004, 2005  Free Software Foundation, Inc. 
     5# 2003, 2004  Free Software Foundation, Inc. 
    66# This Makefile.in is free software; the Free Software Foundation 
    77# gives unlimited permission to copy and/or distribute it, 
     
    1414 
    1515@SET_MAKE@ 
     16 
     17SOURCES = $(namespace_SOURCES) $(test10_SOURCES) $(test11_SOURCES) $(test11a_SOURCES) $(test12_SOURCES) $(test13_SOURCES) $(test13a_SOURCES) $(test14_SOURCES) $(test14a_SOURCES) $(test15_SOURCES) $(test15a_SOURCES) $(test16_SOURCES) $(test2_SOURCES) $(test3_SOURCES) $(test5_SOURCES) $(test6_SOURCES) $(test7_SOURCES) $(test8_SOURCES) $(test9_SOURCES) 
    1618 
    1719srcdir = @srcdir@ 
Note: See TracChangeset for help on using the changeset viewer.