diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2017-04-29 17:47:34 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2017-04-29 17:47:34 +0300 |
| commit | 16f26d75a938df61cde56a2d0231f3788a67d039 (patch) | |
| tree | 57fa2084f2f96ed6251dfe6e6c882dc12ef25b12 | |
| parent | 830989c9c81b501256f5dd47bf13c989dc2dffde (diff) | |
Add hxx extension for headers and lib prefix for library dirs
| -rw-r--r-- | build/export.build | 4 | ||||
| -rw-r--r-- | build/root.build | 2 | ||||
| -rw-r--r-- | buildfile | 2 | ||||
| -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) | 4 | ||||
| -rw-r--r-- | libhello/hello.hxx (renamed from hello/hello) | 4 | ||||
| -rw-r--r-- | tests/build/root.build | 2 | ||||
| -rw-r--r-- | tests/test/driver.cxx | 2 |
9 files changed, 13 insertions, 13 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 @@ -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 09f117b..76d079f 100644 --- a/hello/buildfile +++ b/libhello/buildfile @@ -16,6 +16,6 @@ lib{hello}: cxx.export.poptions = "-I$out_root" "-I$src_root" liba{hello}: cxx.export.poptions += -DLIBHELLO_STATIC libs{hello}: cxx.export.poptions += -DLIBHELLO_SHARED -# 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 65d0aa7..677815d 100644 --- a/hello/hello.cxx +++ b/libhello/hello.cxx @@ -1,6 +1,6 @@ -// file: hello/hello.cxx -*- C++ -*- +// file: libhello/hello.cxx -*- C++ -*- -#include <hello/hello> +#include <libhello/hello.hxx> #include <iostream> diff --git a/hello/hello b/libhello/hello.hxx index 5fb7d9e..58bd7b2 100644 --- a/hello/hello +++ b/libhello/hello.hxx @@ -1,10 +1,10 @@ -// file: hello/hello -*- C++ -*- +// file: libhello/hello.hxx -*- C++ -*- #pragma once #include <string> -#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 () |