diff options
| -rw-r--r-- | clean/buildfile | 7 | ||||
| -rw-r--r-- | etc/buildfile | 10 | ||||
| -rw-r--r-- | libbrep/buildfile | 30 | ||||
| -rw-r--r-- | load/buildfile | 7 | ||||
| -rw-r--r-- | migrate/buildfile | 7 | ||||
| -rw-r--r-- | mod/buildfile | 15 | ||||
| -rw-r--r-- | tests/web/xhtml/buildfile | 1 |
7 files changed, 55 insertions, 22 deletions
diff --git a/clean/buildfile b/clean/buildfile index 638b206..8cda205 100644 --- a/clean/buildfile +++ b/clean/buildfile @@ -26,6 +26,9 @@ if $cli.configured # them when cleaning in src (so that clean results in a state identical to # distributed). # - cli.cxx{*}: dist = true - cli.cxx{*}: clean = ($src_root != $out_root) + cli.cxx{*}: + { + dist = true + clean = ($src_root != $out_root) + } } diff --git a/etc/buildfile b/etc/buildfile index 1dd8faf..8518b2b 100644 --- a/etc/buildfile +++ b/etc/buildfile @@ -4,5 +4,11 @@ ./: file{** -buildfile} -*: install = data/etc/ -*: install.subdirs = true # Recreate subdirectories. +# Install into the etc/ subdirectory of, say, /usr/share/ +# recreating subdirectories. +# +*: +{ + install = data/etc/ + install.subdirs = true +} diff --git a/libbrep/buildfile b/libbrep/buildfile index 95f70a3..250c740 100644 --- a/libbrep/buildfile +++ b/libbrep/buildfile @@ -30,20 +30,34 @@ lib{brep}: \ # clean results in a state identical to distributed). # hxx{version}: in{version} $src_root/manifest -hxx{version}: dist = true -hxx{version}: clean = ($src_root != $out_root) +hxx{version}: +{ + dist = true + clean = ($src_root != $out_root) +} + +# Export options. +# +lib{brep}: +{ + cxx.export.poptions = "-I$out_root" "-I$src_root" + cxx.export.libs = $int_libs +} # For pre-releases use the complete version to make sure they cannot be used -# in place of another pre-release or the final version. +# in place of another pre-release or the final version. See the version module +# for details on the version.* variable values. # if $version.pre_release lib{brep}: bin.lib.version = @"-$version.project_id" else lib{brep}: bin.lib.version = @"-$version.major.$version.minor" -lib{brep}: cxx.export.poptions = "-I$out_root" "-I$src_root" -lib{brep}: cxx.export.libs = $int_libs - -# Install into the libbrep/ subdirectory of, say, /usr/include/. +# Install into the libbrep/ subdirectory of, say, /usr/include/ +# recreating subdirectories. # -{hxx ixx txx}{*}: install = include/libbrep/ +{hxx ixx txx}{*}: +{ + install = include/libbrep/ + install.subdirs = true +} diff --git a/load/buildfile b/load/buildfile index 790e1d9..11252b2 100644 --- a/load/buildfile +++ b/load/buildfile @@ -27,6 +27,9 @@ if $cli.configured # them when cleaning in src (so that clean results in a state identical to # distributed). # - cli.cxx{*}: dist = true - cli.cxx{*}: clean = ($src_root != $out_root) + cli.cxx{*}: + { + dist = true + clean = ($src_root != $out_root) + } } diff --git a/migrate/buildfile b/migrate/buildfile index 0e24dc9..a10390b 100644 --- a/migrate/buildfile +++ b/migrate/buildfile @@ -26,6 +26,9 @@ if $cli.configured # them when cleaning in src (so that clean results in a state identical to # distributed). # - cli.cxx{*}: dist = true - cli.cxx{*}: clean = ($src_root != $out_root) + cli.cxx{*}: + { + dist = true + clean = ($src_root != $out_root) + } } diff --git a/mod/buildfile b/mod/buildfile index 93120cf..98e4af6 100644 --- a/mod/buildfile +++ b/mod/buildfile @@ -20,10 +20,6 @@ mod{brep}: {hxx ixx txx cxx}{* -options} \ {hxx ixx cxx}{ options} \ ../libbrep/lib{brep} ../web/libus{web} $libs -# Don't install any of the module's headers. -# -{hxx ixx txx}{*}: install = false - # Generated options parser. # if $cli.configured @@ -43,6 +39,13 @@ if $cli.configured # them when cleaning in src (so that clean results in a state identical to # distributed). # - cli.cxx{*}: dist = true - cli.cxx{*}: clean = ($src_root != $out_root) + cli.cxx{*}: + { + dist = true + clean = ($src_root != $out_root) + } } + +# Don't install any of the module's headers. +# +{hxx ixx txx}{*}: install = false diff --git a/tests/web/xhtml/buildfile b/tests/web/xhtml/buildfile index b5d591c..983909f 100644 --- a/tests/web/xhtml/buildfile +++ b/tests/web/xhtml/buildfile @@ -3,5 +3,6 @@ # license : MIT; see accompanying LICENSE file include ../../../web/ + exe{driver}: {hxx cxx}{*} ../../../web/libus{web} exe{driver}: file{test.out}: test.stdout = true |