summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-04-29 13:20:50 (GMT)
committerKaren Arutyunov <karen@codesynthesis.com>2017-04-29 13:20:50 (GMT)
commit3dc9c1698aa18be1f5a0c67a70a4e6cd655a3da4 (patch)
treefd519a6fe244aee44f5e6103015385852aedd195
parenta9135c795451b594b904f11c62e1fe71c6ec9c85 (diff)
Add hxx extension for headers and lib prefix for library dirs
-rw-r--r--build/export.build4
-rw-r--r--build/root.build2
-rw-r--r--buildfile2
-rw-r--r--libhello/buildfile (renamed from hello/buildfile)4
-rw-r--r--libhello/export.hxx (renamed from hello/export)2
-rw-r--r--libhello/hello.cxx (renamed from hello/hello.cxx)6
-rw-r--r--libhello/hello.hxx (renamed from hello/hello)6
-rw-r--r--tests/build/root.build2
-rw-r--r--tests/test/driver.cxx2
9 files changed, 15 insertions, 15 deletions
diff --git a/build/export.build b/build/export.build
index 1eb73b7..0151425 100644
--- a/build/export.build
+++ b/build/export.build
@@ -1,6 +1,6 @@
$out_root/:
{
- include hello/
+ include libhello/
}
-export $out_root/hello/lib{hello}
+export $out_root/libhello/lib{hello}
diff --git a/build/root.build b/build/root.build
index 4f70114..8ceadfa 100644
--- a/build/root.build
+++ b/build/root.build
@@ -2,5 +2,5 @@ cxx.std = 11
using cxx
-hxx{*}: extension =
+hxx{*}: extension = hxx
cxx{*}: extension = cxx
diff --git a/buildfile b/buildfile
index 57e0f35..b3ad7e3 100644
--- a/buildfile
+++ b/buildfile
@@ -1,4 +1,4 @@
-./: hello/ tests/ doc{INSTALL version} file{manifest}
+./: libhello/ tests/ doc{INSTALL version} file{manifest}
doc{version}: file{manifest} # Generated by the version module.
doc{version}: dist = true
diff --git a/hello/buildfile b/libhello/buildfile
index 30787e2..e65edde 100644
--- a/hello/buildfile
+++ b/libhello/buildfile
@@ -21,6 +21,6 @@ libs{hello}: cxx.export.poptions += -DLIBHELLO_SHARED
lib{hello}: cxx.export.libs = $int_libs
-# Install into the hello/ subdirectory of, say, /usr/include/.
+# Install into the libhello/ subdirectory of, say, /usr/include/.
#
-install.include = $install.include/hello/
+install.include = $install.include/libhello/
diff --git a/hello/export b/libhello/export.hxx
index 18f4968..e6c723e 100644
--- a/hello/export
+++ b/libhello/export.hxx
@@ -1,4 +1,4 @@
-// file: hello/export -*- C++ -*-
+// file: libhello/export.hxx -*- C++ -*-
#pragma once
diff --git a/hello/hello.cxx b/libhello/hello.cxx
index 8fdd5a6..f7e3b7f 100644
--- a/hello/hello.cxx
+++ b/libhello/hello.cxx
@@ -1,8 +1,8 @@
-// file: hello/hello.cxx -*- C++ -*-
+// file: libhello/hello.cxx -*- C++ -*-
-#include <hello/hello>
+#include <libhello/hello.hxx>
-#include <print/print>
+#include <libprint/print.hxx>
using namespace std;
diff --git a/hello/hello b/libhello/hello.hxx
index 75a47a0..ccc43c2 100644
--- a/hello/hello
+++ b/libhello/hello.hxx
@@ -1,12 +1,12 @@
-// file: hello/hello -*- C++ -*-
+// file: libhello/hello.hxx -*- C++ -*-
#pragma once
#include <string>
-#include <format/format>
+#include <libformat/format.hxx>
-#include <hello/export>
+#include <libhello/export.hxx>
namespace hello
{
diff --git a/tests/build/root.build b/tests/build/root.build
index de723b8..a2ee38a 100644
--- a/tests/build/root.build
+++ b/tests/build/root.build
@@ -2,7 +2,7 @@ cxx.std = 11
using cxx
-hxx{*}: extension =
+hxx{*}: extension = hxx
cxx{*}: extension = cxx
# Every exe{} in this subproject is by default a test.
diff --git a/tests/test/driver.cxx b/tests/test/driver.cxx
index 59bfb2d..38937f0 100644
--- a/tests/test/driver.cxx
+++ b/tests/test/driver.cxx
@@ -1,6 +1,6 @@
// file: tests/test/driver.cxx -*- C++ -*-
-#include <hello/hello>
+#include <libhello/hello.hxx>
int
main ()