summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/configure.cc4
-rw-r--r--src/libctor.cc (renamed from src/libcppbuild.cc)2
-rw-r--r--src/libctor.h (renamed from src/libcppbuild.h)0
-rw-r--r--src/rebuild.cc4
-rw-r--r--src/rebuild.h2
-rw-r--r--src/task.h2
-rw-r--r--src/task_ar.cc2
-rw-r--r--src/task_cc.cc2
-rw-r--r--src/task_ld.cc2
-rw-r--r--src/task_so.cc2
-rw-r--r--src/tasks.cc2
11 files changed, 12 insertions, 12 deletions
diff --git a/src/configure.cc b/src/configure.cc
index ab2f837..1598251 100644
--- a/src/configure.cc
+++ b/src/configure.cc
@@ -8,7 +8,7 @@
#include "settings.h"
#include "execute.h"
-#include "libcppbuild.h"
+#include "libctor.h"
#include "tasks.h"
std::filesystem::path configurationFile("configuration.cc");
@@ -270,7 +270,7 @@ int configure(int argc, char* argv[])
std::cout << "Writing results to: " << configurationFile.string() << "\n";
{
std::ofstream istr(configurationFile);
- istr << "#include \"libcppbuild.h\"\n\n";
+ istr << "#include \"libctor.h\"\n\n";
istr << "const std::map<std::string, std::string>& configuration()\n";
istr << "{\n";
istr << " static std::map<std::string, std::string> c =\n";
diff --git a/src/libcppbuild.cc b/src/libctor.cc
index d3d8a51..9860440 100644
--- a/src/libcppbuild.cc
+++ b/src/libctor.cc
@@ -16,7 +16,7 @@
#include <getoptpp/getoptpp.hpp>
-#include "libcppbuild.h"
+#include "libctor.h"
#include "settings.h"
#include "configure.h"
#include "rebuild.h"
diff --git a/src/libcppbuild.h b/src/libctor.h
index d0a0080..d0a0080 100644
--- a/src/libcppbuild.h
+++ b/src/libctor.h
diff --git a/src/rebuild.cc b/src/rebuild.cc
index 43c4c98..5559349 100644
--- a/src/rebuild.cc
+++ b/src/rebuild.cc
@@ -7,7 +7,7 @@
#include "execute.h"
#include "configure.h"
#include "settings.h"
-#include "libcppbuild.h"
+#include "libctor.h"
std::array<BuildConfigurationEntry, 1024> configFiles;
std::size_t numConfigFiles{0};
@@ -110,7 +110,7 @@ void recompileCheck(const Settings& settings, int argc, char* argv[],
args.push_back(location);
}
}
- args.push_back("libcppbuild.a");
+ args.push_back("libctor.a");
args.push_back("-o");
args.push_back(binFile.string());
diff --git a/src/rebuild.h b/src/rebuild.h
index bc5d889..1b29bbd 100644
--- a/src/rebuild.h
+++ b/src/rebuild.h
@@ -4,7 +4,7 @@
#include <vector>
#include <array>
-#include "libcppbuild.h"
+#include "libctor.h"
class Settings;
diff --git a/src/task.h b/src/task.h
index 98363a1..acbefb3 100644
--- a/src/task.h
+++ b/src/task.h
@@ -7,7 +7,7 @@
#include <list>
#include <memory>
-#include "libcppbuild.h"
+#include "libctor.h"
enum class State
{
diff --git a/src/task_ar.cc b/src/task_ar.cc
index 5568629..980d8b4 100644
--- a/src/task_ar.cc
+++ b/src/task_ar.cc
@@ -3,7 +3,7 @@
#include <iostream>
#include <fstream>
-#include "libcppbuild.h"
+#include "libctor.h"
#include "settings.h"
#include "execute.h"
diff --git a/src/task_cc.cc b/src/task_cc.cc
index af9cf7a..0f85bf6 100644
--- a/src/task_cc.cc
+++ b/src/task_cc.cc
@@ -3,7 +3,7 @@
#include <iostream>
#include <fstream>
-#include "libcppbuild.h"
+#include "libctor.h"
#include "settings.h"
#include "execute.h"
diff --git a/src/task_ld.cc b/src/task_ld.cc
index 91f3316..4a77c72 100644
--- a/src/task_ld.cc
+++ b/src/task_ld.cc
@@ -3,7 +3,7 @@
#include <iostream>
#include <fstream>
-#include "libcppbuild.h"
+#include "libctor.h"
#include "settings.h"
#include "execute.h"
diff --git a/src/task_so.cc b/src/task_so.cc
index eaf6a85..ca7883f 100644
--- a/src/task_so.cc
+++ b/src/task_so.cc
@@ -3,7 +3,7 @@
#include <iostream>
#include <fstream>
-#include "libcppbuild.h"
+#include "libctor.h"
#include "settings.h"
#include "execute.h"
diff --git a/src/tasks.cc b/src/tasks.cc
index 93e5a8b..2d8f46e 100644
--- a/src/tasks.cc
+++ b/src/tasks.cc
@@ -5,7 +5,7 @@
#include <iostream>
#include "settings.h"
-#include "libcppbuild.h"
+#include "libctor.h"
#include "task.h"
#include "task_cc.h"
#include "task_ld.h"