From c831a3947d7ac517fceaf8981d56c5ddcdaf26b1 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 14 Sep 2006 21:51:00 +0000 Subject: david - a couple of random things mike told me to fix --- src/functionfilesin.cpp | 5 +++-- src/rule.cpp | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/functionfilesin.cpp b/src/functionfilesin.cpp index e3d8e92..6b47f9f 100644 --- a/src/functionfilesin.cpp +++ b/src/functionfilesin.cpp @@ -29,9 +29,10 @@ void FunctionFilesIn::execute( Build *bld, const StringList &lInput, StringList while( (e = readdir( d )) ) { - if( e->d_type == DT_REG ) + if( e->d_type != DT_DIR ) { - lOutput.push_back( prefix + e->d_name ); + if( e->d_name[0] != '.') + lOutput.push_back( prefix + e->d_name ); } } diff --git a/src/rule.cpp b/src/rule.cpp index c5ed1c2..3ba4303 100644 --- a/src/rule.cpp +++ b/src/rule.cpp @@ -98,14 +98,14 @@ StringList Rule::execute( Build &bld, StringList &lInput, PerformList &lPerf ) for( PerformList::iterator k = lPerform.begin(); k != lPerform.end(); k++ ) { - Perform *p = (*k)->duplicate( bld, (*i), &mTmp ); + Perform *p = (*k)->duplicate( bld, target, &mTmp ); p->setTarget( target ); p->setRule( sName ); for( FunctionList::iterator f = lReqFuncs.begin(); f != lReqFuncs.end(); f++ ) { p->getReqFuncs().push_back( - (*f)->duplicate( bld, (*i), &mTmp ) + (*f)->duplicate( bld, target, &mTmp ) ); } lPerf.push_back( p ); -- cgit v1.2.3