From 73d53b0962cb19a6d2a7686de658a5540ab07017 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Mon, 31 Jul 2006 22:50:47 +0000 Subject: It almost builds, we need to get rid of duplicate list entries and actually store the commands somewhere so the target handler can decide if they need to be run. --- src/filetarget.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/filetarget.cpp') diff --git a/src/filetarget.cpp b/src/filetarget.cpp index 65f9d70..3fefd9f 100644 --- a/src/filetarget.cpp +++ b/src/filetarget.cpp @@ -45,9 +45,10 @@ void FileTarget::addInputDir( const char *sDir ) } char *cwd = gnu_getcwd(); - std::string base( cwd ); - base += "/"; + std::string base;//( cwd ); + //base += "/"; base += sDir; + base += "/"; delete[] cwd; struct dirent *de; @@ -58,7 +59,6 @@ void FileTarget::addInputDir( const char *sDir ) continue; std::string s( base ); - s += "/"; s += de->d_name; addInput( s.c_str() ); } @@ -70,7 +70,7 @@ void FileTarget::check( Builder &bld ) { Rule *pRule = bld.getRule( sRule ); - std::list tmp = pRule->execute( bld, lInput ); + std::list tmp = pRule->execute( bld, lInput, getName() ); lOutput.insert( lOutput.end(), tmp.begin(), tmp.end() ); bld.processRequires( lInput ); -- cgit v1.2.3