diff options
| -rw-r--r-- | build/export.build | 4 | ||||
| -rw-r--r-- | build/root.build | 2 | ||||
| -rw-r--r-- | buildfile | 2 | ||||
| -rw-r--r-- | libformat/buildfile (renamed from format/buildfile) | 4 | ||||
| -rw-r--r-- | libformat/export.hxx (renamed from format/export) | 2 | ||||
| -rw-r--r-- | libformat/format.cxx (renamed from format/format.cxx) | 4 | ||||
| -rw-r--r-- | libformat/format.hxx (renamed from format/format) | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/build/export.build b/build/export.build index 53e115c..25c99aa 100644 --- a/build/export.build +++ b/build/export.build @@ -1,6 +1,6 @@ $out_root/: { - include format/ + include libformat/ } -export $out_root/format/lib{format} +export $out_root/libformat/lib{format} 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 @@ -./: format/ doc{version} file{manifest} +./: libformat/ doc{version} file{manifest} doc{version}: file{manifest} # Generated by the version module. doc{version}: dist = true diff --git a/format/buildfile b/libformat/buildfile index e84af47..4f6f156 100644 --- a/format/buildfile +++ b/libformat/buildfile @@ -16,6 +16,6 @@ lib{format}: cxx.export.poptions = "-I$out_root" "-I$src_root" liba{format}: cxx.export.poptions += -DLIBFORMAT_STATIC libs{format}: cxx.export.poptions += -DLIBFORMAT_SHARED -# Install into the format/ subdirectory of, say, /usr/include/. +# Install into the libformat/ subdirectory of, say, /usr/include/. # -install.include = $install.include/format/ +install.include = $install.include/libformat/ diff --git a/format/export b/libformat/export.hxx index 39a37da..125c9df 100644 --- a/format/export +++ b/libformat/export.hxx @@ -1,4 +1,4 @@ -// file: format/export -*- C++ -*- +// file: libformat/export.hxx -*- C++ -*- #pragma once diff --git a/format/format.cxx b/libformat/format.cxx index 0566e78..421f50d 100644 --- a/format/format.cxx +++ b/libformat/format.cxx @@ -1,6 +1,6 @@ -// file: format/format.cxx -*- C++ -*- +// file: libformat/format.cxx -*- C++ -*- -#include <format/format> +#include <libformat/format.hxx> using namespace std; diff --git a/format/format b/libformat/format.hxx index 69350b0..9c813ac 100644 --- a/format/format +++ b/libformat/format.hxx @@ -1,10 +1,10 @@ -// file: format/format -*- C++ -*- +// file: libformat/format.hxx -*- C++ -*- #pragma once #include <string> -#include <format/export> +#include <libformat/export.hxx> LIBFORMAT_EXPORT std::string format (const std::string& greeting, const std::string& name); |