aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/functionfilesin.cpp5
-rw-r--r--src/rule.cpp4
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
29 29
30 while( (e = readdir( d )) ) 30 while( (e = readdir( d )) )
31 { 31 {
32 if( e->d_type == DT_REG ) 32 if( e->d_type != DT_DIR )
33 { 33 {
34 lOutput.push_back( prefix + e->d_name ); 34 if( e->d_name[0] != '.')
35 lOutput.push_back( prefix + e->d_name );
35 } 36 }
36 } 37 }
37 38
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 )
98 for( PerformList::iterator k = lPerform.begin(); 98 for( PerformList::iterator k = lPerform.begin();
99 k != lPerform.end(); k++ ) 99 k != lPerform.end(); k++ )
100 { 100 {
101 Perform *p = (*k)->duplicate( bld, (*i), &mTmp ); 101 Perform *p = (*k)->duplicate( bld, target, &mTmp );
102 p->setTarget( target ); 102 p->setTarget( target );
103 p->setRule( sName ); 103 p->setRule( sName );
104 for( FunctionList::iterator f = lReqFuncs.begin(); 104 for( FunctionList::iterator f = lReqFuncs.begin();
105 f != lReqFuncs.end(); f++ ) 105 f != lReqFuncs.end(); f++ )
106 { 106 {
107 p->getReqFuncs().push_back( 107 p->getReqFuncs().push_back(
108 (*f)->duplicate( bld, (*i), &mTmp ) 108 (*f)->duplicate( bld, target, &mTmp )
109 ); 109 );
110 } 110 }
111 lPerf.push_back( p ); 111 lPerf.push_back( p );