Subversion Repositories DevTools

Rev

Rev 289 | Rev 299 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 289 Rev 293
Line 4000... Line 4000...
4000
    #   Ensure that only one such lib exists
4000
    #   Ensure that only one such lib exists
4001
    #
4001
    #
4002
    Error( "Library of the same name already defined: $lib" )
4002
    Error( "Library of the same name already defined: $lib" )
4003
        if ( $SHLIBS->Get($lib) );
4003
        if ( $SHLIBS->Get($lib) );
4004
    $SHLIBS->NewAdd($lib);
4004
    $SHLIBS->NewAdd($lib);
4005
    
4005
 
4006
    #
4006
    #
4007
    #   If the user has not specified a --Shared parameter then provide one
4007
    #   If the user has not specified a --Shared parameter then provide one
4008
    #
4008
    #
4009
    push @args, "--Shared=Current"
4009
    push @args, "--Shared=Current"
4010
        unless ( grep (/^--Shared/, @args) );
4010
        unless ( grep (/^--Shared/, @args) );
Line 8506... Line 8506...
8506
            #          by many,many lines of output. This makes it difficult
8506
            #          by many,many lines of output. This makes it difficult
8507
            #          to see the error.
8507
            #          to see the error.
8508
            #
8508
            #
8509
            #       2) Lack of Flexability
8509
            #       2) Lack of Flexability
8510
            #
8510
            #
8511
            MakeEntry( "\$(BINDIR)/$i$::exe: ", "", "\\\n\t\t", ".$::o ", $pObjs );
8511
            MakeEntry( "\$(BINDIR)/$i$::exe: ", "", "\\\n\t\t", ".$::o ", @$pObjs );
8512
        }
8512
        }
8513
        else
8513
        else
8514
        {
8514
        {
8515
            #
8515
            #
8516
            #   New Style Prog Interface
8516
            #   New Style Prog Interface
Line 8543... Line 8543...
8543
        push @TESTPROGOBJS, @$pObjs;
8543
        push @TESTPROGOBJS, @$pObjs;
8544
        
8544
        
8545
        MakePrint( "#---- (${i})\n\n" );
8545
        MakePrint( "#---- (${i})\n\n" );
8546
        if ( $ScmToolsetProgDependancies )
8546
        if ( $ScmToolsetProgDependancies )
8547
        {
8547
        {
8548
            MakeEntry( "\$(BINDIR)/$i$::exe: ", "", "\\\n\t\t", ".$::o ", $pObjs );
8548
            MakeEntry( "\$(BINDIR)/$i$::exe: ", "", "\\\n\t\t", ".$::o ", @$pObjs );
8549
        }
8549
        }
8550
        else
8550
        else
8551
        {
8551
        {
8552
            PackageProgRemoveFiles( $i );
8552
            PackageProgRemoveFiles( $i );
8553
        }
8553
        }
Line 9263... Line 9263...
9263
#
9263
#
9264
#   Cannot use make's wildcard function as this only operates in the current directory
9264
#   Cannot use make's wildcard function as this only operates in the current directory
9265
#
9265
#
9266
.PHONY:		rmlitter
9266
.PHONY:		rmlitter
9267
rmlitter:
9267
rmlitter:
9268
	-\$(XX_PRE)( echo "Removing litter"; \\
9268
	-\$(XX_PRE)( echo "Removing litter";\\
9269
		\$(touch) _delete.bak _delete.tmp _delete.err ;\\
9269
		\$(touch) _delete.bak _delete.tmp _delete.err ;\\
9270
		\$(rm) -f core *.bak *.tmp *.err ;\\
9270
		\$(rm) -f core *.bak *.tmp *.err ;\\
9271
		for subdir in \$(SHDIRS) ; do \\
9271
		for subdir in \$(SHDIRS) '' ; do \\
9272
			if [ -d \$\$subdir ] ; then \\
9272
			if [ -d "\$\$subdir" ] ; then \\
9273
				( cd \$\$subdir ;\\
9273
				( cd \$\$subdir ;\\
9274
				\$(touch) _delete.err _delete.cmd ;\\
9274
				\$(touch) _delete.err _delete.cmd ;\\
9275
				\$(rm) -r * ; );\\
9275
				\$(rm) -r * ; );\\
9276
			fi ;\\
9276
			fi ;\\
9277
		done;\\
9277
		done;\\
9278
		for subdir in \$(OBJDIR) ; do \\
9278
		for subdir in \$(OBJDIR) '' ; do \\
9279
			if [ -d \$\$subdir ] ; then \\
9279
			if [ -d "\$\$subdir" ] ; then \\
9280
				( cd \$\$subdir ;\\
9280
				( cd \$\$subdir ;\\
9281
				\$(touch) _delete.err _delete.cmd ;\\
9281
				\$(touch) _delete.err _delete.cmd ;\\
9282
				\$(rm) -r *.err *.cmd ; );\\
9282
				\$(rm) -r *.err *.cmd ; );\\
9283
			fi ;\\
9283
			fi ;\\
9284
		done;\\
9284
		done;\\