aboutsummaryrefslogtreecommitdiff
path: root/src/filetarget.cpp
diff options
context:
space:
mode:
authorMike Buland <eichlan@xagasoft.com>2006-07-31 22:50:47 +0000
committerMike Buland <eichlan@xagasoft.com>2006-07-31 22:50:47 +0000
commit73d53b0962cb19a6d2a7686de658a5540ab07017 (patch)
tree9a8fd737b8f77ec9ccab43d89dc54b7e72d4d90d /src/filetarget.cpp
parentb672fa69c4c98509f8ee251b87300e3fcbe6bdc8 (diff)
downloadbuild-73d53b0962cb19a6d2a7686de658a5540ab07017.tar.gz
build-73d53b0962cb19a6d2a7686de658a5540ab07017.tar.bz2
build-73d53b0962cb19a6d2a7686de658a5540ab07017.tar.xz
build-73d53b0962cb19a6d2a7686de658a5540ab07017.zip
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.
Diffstat (limited to 'src/filetarget.cpp')
-rw-r--r--src/filetarget.cpp8
1 files changed, 4 insertions, 4 deletions
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 )
45 } 45 }
46 46
47 char *cwd = gnu_getcwd(); 47 char *cwd = gnu_getcwd();
48 std::string base( cwd ); 48 std::string base;//( cwd );
49 base += "/"; 49 //base += "/";
50 base += sDir; 50 base += sDir;
51 base += "/";
51 delete[] cwd; 52 delete[] cwd;
52 53
53 struct dirent *de; 54 struct dirent *de;
@@ -58,7 +59,6 @@ void FileTarget::addInputDir( const char *sDir )
58 continue; 59 continue;
59 60
60 std::string s( base ); 61 std::string s( base );
61 s += "/";
62 s += de->d_name; 62 s += de->d_name;
63 addInput( s.c_str() ); 63 addInput( s.c_str() );
64 } 64 }
@@ -70,7 +70,7 @@ void FileTarget::check( Builder &bld )
70{ 70{
71 Rule *pRule = bld.getRule( sRule ); 71 Rule *pRule = bld.getRule( sRule );
72 72
73 std::list<std::string> tmp = pRule->execute( bld, lInput ); 73 std::list<std::string> tmp = pRule->execute( bld, lInput, getName() );
74 lOutput.insert( lOutput.end(), tmp.begin(), tmp.end() ); 74 lOutput.insert( lOutput.end(), tmp.begin(), tmp.end() );
75 75
76 bld.processRequires( lInput ); 76 bld.processRequires( lInput );