diff options
64 files changed, 112 insertions, 115 deletions
diff --git a/bin/dchroot-dsa/dchroot-dsa.cc b/bin/dchroot-dsa/dchroot-dsa.cc index 3dd5f783..d6b61428 100644 --- a/bin/dchroot-dsa/dchroot-dsa.cc +++ b/bin/dchroot-dsa/dchroot-dsa.cc @@ -18,8 +18,8 @@ #include <config.h> -#include "main.h" -#include "options.h" +#include <dchroot-dsa/main.h> +#include <dchroot-dsa/options.h> #include <bin-common/run.h> diff --git a/bin/dchroot-dsa/main.cc b/bin/dchroot-dsa/main.cc index 27a793ed..410af234 100644 --- a/bin/dchroot-dsa/main.cc +++ b/bin/dchroot-dsa/main.cc @@ -18,8 +18,8 @@ #include <config.h> -#include "main.h" -#include "session.h" +#include <dchroot-dsa/main.h> +#include <dchroot-dsa/session.h> #include <cstdlib> #include <iostream> diff --git a/bin/dchroot-dsa/options.cc b/bin/dchroot-dsa/options.cc index afc642a5..eba4eaba 100644 --- a/bin/dchroot-dsa/options.cc +++ b/bin/dchroot-dsa/options.cc @@ -18,7 +18,7 @@ #include <config.h> -#include "options.h" +#include <dchroot-dsa/options.h> #include <sbuild/util.h> diff --git a/bin/dchroot-dsa/session.cc b/bin/dchroot-dsa/session.cc index f6a2d985..855515a3 100644 --- a/bin/dchroot-dsa/session.cc +++ b/bin/dchroot-dsa/session.cc @@ -18,7 +18,7 @@ #include <config.h> -#include "session.h" +#include <dchroot-dsa/session.h> #include <cassert> #include <cerrno> diff --git a/bin/dchroot/dchroot.cc b/bin/dchroot/dchroot.cc index 53c824b3..f4a31a31 100644 --- a/bin/dchroot/dchroot.cc +++ b/bin/dchroot/dchroot.cc @@ -18,8 +18,8 @@ #include <config.h> -#include "main.h" -#include "options.h" +#include <dchroot/main.h> +#include <dchroot/options.h> #include <bin-common/run.h> diff --git a/bin/dchroot/main.cc b/bin/dchroot/main.cc index df81d556..9bdf0485 100644 --- a/bin/dchroot/main.cc +++ b/bin/dchroot/main.cc @@ -18,8 +18,8 @@ #include <config.h> -#include "main.h" -#include "session.h" +#include <dchroot/main.h> +#include <dchroot/session.h> #include <cstdlib> #include <iostream> diff --git a/bin/dchroot/options.cc b/bin/dchroot/options.cc index 7c7bb471..b91b330b 100644 --- a/bin/dchroot/options.cc +++ b/bin/dchroot/options.cc @@ -18,7 +18,7 @@ #include <config.h> -#include "options.h" +#include <dchroot/options.h> #include <cstdlib> #include <iostream> diff --git a/bin/dchroot/session.cc b/bin/dchroot/session.cc index 132ebb9b..21a6e00f 100644 --- a/bin/dchroot/session.cc +++ b/bin/dchroot/session.cc @@ -18,7 +18,7 @@ #include <config.h> -#include "session.h" +#include <dchroot/session.h> #include <cassert> #include <cerrno> diff --git a/bin/schroot/main.cc b/bin/schroot/main.cc index 5abfe4b4..79d5cd53 100644 --- a/bin/schroot/main.cc +++ b/bin/schroot/main.cc @@ -20,7 +20,7 @@ #include <sbuild/config.h> -#include "main.h" +#include <schroot/main.h> #include <cstdlib> #include <ctime> diff --git a/bin/schroot/options.cc b/bin/schroot/options.cc index f46704d5..48f1416c 100644 --- a/bin/schroot/options.cc +++ b/bin/schroot/options.cc @@ -18,7 +18,7 @@ #include <config.h> -#include "options.h" +#include <schroot/options.h> #include <cstdlib> #include <iostream> diff --git a/bin/schroot/schroot.cc b/bin/schroot/schroot.cc index 0df5c098..395af026 100644 --- a/bin/schroot/schroot.cc +++ b/bin/schroot/schroot.cc @@ -19,7 +19,7 @@ #include <config.h> #include <schroot/main.h> -#include "options.h" +#include <schroot/options.h> #include <bin-common/run.h> diff --git a/lib/bin-common/main.cc b/lib/bin-common/main.cc index b22fc7af..17ae2ef7 100644 --- a/lib/bin-common/main.cc +++ b/lib/bin-common/main.cc @@ -23,7 +23,7 @@ #include <sbuild/types.h> #include <sbuild/feature.h> -#include "main.h" +#include <bin-common/main.h> #include <cstdlib> #include <ctime> diff --git a/lib/bin-common/option-action.cc b/lib/bin-common/option-action.cc index ba11f2bf..65dbd46e 100644 --- a/lib/bin-common/option-action.cc +++ b/lib/bin-common/option-action.cc @@ -20,8 +20,8 @@ #include <sbuild/i18n.h> -#include "option-action.h" -#include "options.h" +#include <bin-common/option-action.h> +#include <bin-common/options.h> #include <iomanip> diff --git a/lib/bin-common/options.cc b/lib/bin-common/options.cc index 1e77e00a..26af2662 100644 --- a/lib/bin-common/options.cc +++ b/lib/bin-common/options.cc @@ -21,7 +21,7 @@ #include <sbuild/i18n.h> #include <sbuild/log.h> -#include "options.h" +#include <bin-common/options.h> #include <cstdlib> #include <iostream> diff --git a/lib/dchroot-common/main.cc b/lib/dchroot-common/main.cc index f9b12f6a..cc789cd1 100644 --- a/lib/dchroot-common/main.cc +++ b/lib/dchroot-common/main.cc @@ -18,7 +18,7 @@ #include <config.h> -#include "main.h" +#include <dchroot-common/main.h> #include <cstdlib> #include <iostream> diff --git a/lib/dchroot-common/session.cc b/lib/dchroot-common/session.cc index e5fb5bcc..adbfdb7d 100644 --- a/lib/dchroot-common/session.cc +++ b/lib/dchroot-common/session.cc @@ -18,7 +18,7 @@ #include <config.h> -#include "session.h" +#include <dchroot-common/session.h> #include <cassert> #include <cerrno> diff --git a/lib/sbuild/auth/auth.cc b/lib/sbuild/auth/auth.cc index 4b70dfd9..2083d019 100644 --- a/lib/sbuild/auth/auth.cc +++ b/lib/sbuild/auth/auth.cc @@ -19,7 +19,7 @@ #include <config.h> #include <sbuild/auth/auth.h> -#include "util.h" +#include <sbuild/util.h> #include <cassert> #include <cerrno> diff --git a/lib/sbuild/auth/pam-conv-tty.cc b/lib/sbuild/auth/pam-conv-tty.cc index a7967a42..a139cbbb 100644 --- a/lib/sbuild/auth/pam-conv-tty.cc +++ b/lib/sbuild/auth/pam-conv-tty.cc @@ -19,8 +19,8 @@ #include <config.h> #include <sbuild/auth/pam-conv-tty.h> -#include "ctty.h" -#include "log.h" +#include <sbuild/ctty.h> +#include <sbuild/log.h> #include <iostream> diff --git a/lib/sbuild/auth/pam.cc b/lib/sbuild/auth/pam.cc index 652fb7fc..9a7665c4 100644 --- a/lib/sbuild/auth/pam.cc +++ b/lib/sbuild/auth/pam.cc @@ -20,7 +20,7 @@ #include <sbuild/auth/pam.h> #include <sbuild/auth/pam-conv.h> -#include "feature.h" +#include <sbuild/feature.h> #include <cassert> #include <cerrno> diff --git a/lib/sbuild/chroot/chroot.cc b/lib/sbuild/chroot/chroot.cc index 4ee6c6eb..35803c77 100644 --- a/lib/sbuild/chroot/chroot.cc +++ b/lib/sbuild/chroot/chroot.cc @@ -33,7 +33,7 @@ #ifdef SBUILD_FEATURE_UNSHARE #include <sbuild/chroot/facet/unshare.h> #endif // SBUILD_FEATURE_UNSHARE -#include "fdstream.h" +#include <sbuild/fdstream.h> #include <iostream> #include <cerrno> diff --git a/lib/sbuild/chroot/config.cc b/lib/sbuild/chroot/config.cc index 83c69271..1020bbe6 100644 --- a/lib/sbuild/chroot/config.cc +++ b/lib/sbuild/chroot/config.cc @@ -23,9 +23,9 @@ #include <sbuild/chroot/facet/session.h> #include <sbuild/chroot/facet/session-clonable.h> #include <sbuild/chroot/facet/source-clonable.h> -#include "fdstream.h" -#include "keyfile-reader.h" -#include "lock.h" +#include <sbuild/fdstream.h> +#include <sbuild/keyfile-reader.h> +#include <sbuild/lock.h> #include <cassert> #include <cerrno> diff --git a/lib/sbuild/chroot/facet/block-device-base.cc b/lib/sbuild/chroot/facet/block-device-base.cc index 411d9091..47eacee0 100644 --- a/lib/sbuild/chroot/facet/block-device-base.cc +++ b/lib/sbuild/chroot/facet/block-device-base.cc @@ -20,9 +20,9 @@ #include <sbuild/chroot/facet/block-device-base.h> #include <sbuild/chroot/facet/mountable.h> -#include "format-detail.h" -#include "lock.h" -#include "util.h" +#include <sbuild/format-detail.h> +#include <sbuild/lock.h> +#include <sbuild/util.h> #include <cerrno> #include <cstring> diff --git a/lib/sbuild/chroot/facet/block-device.cc b/lib/sbuild/chroot/facet/block-device.cc index 34b0aa87..65fae0b9 100644 --- a/lib/sbuild/chroot/facet/block-device.cc +++ b/lib/sbuild/chroot/facet/block-device.cc @@ -27,8 +27,8 @@ #ifdef SBUILD_FEATURE_UNION #include <sbuild/chroot/facet/fsunion.h> #endif // SBUILD_FEATURE_UNION -#include "format-detail.h" -#include "util.h" +#include <sbuild/format-detail.h> +#include <sbuild/util.h> #include <cassert> #include <cerrno> diff --git a/lib/sbuild/chroot/facet/btrfs-snapshot.cc b/lib/sbuild/chroot/facet/btrfs-snapshot.cc index 47740d91..8f68ea72 100644 --- a/lib/sbuild/chroot/facet/btrfs-snapshot.cc +++ b/lib/sbuild/chroot/facet/btrfs-snapshot.cc @@ -25,7 +25,7 @@ #include <sbuild/chroot/facet/session-clonable.h> #include <sbuild/chroot/facet/session.h> #include <sbuild/chroot/facet/source-clonable.h> -#include "format-detail.h" +#include <sbuild/format-detail.h> #include <cassert> #include <cerrno> diff --git a/lib/sbuild/chroot/facet/custom.cc b/lib/sbuild/chroot/facet/custom.cc index 7964eb5d..5845772b 100644 --- a/lib/sbuild/chroot/facet/custom.cc +++ b/lib/sbuild/chroot/facet/custom.cc @@ -24,7 +24,7 @@ #include <sbuild/chroot/facet/session-clonable.h> #include <sbuild/chroot/facet/session.h> #include <sbuild/chroot/facet/source-clonable.h> -#include "format-detail.h" +#include <sbuild/format-detail.h> #include <cassert> #include <cerrno> diff --git a/lib/sbuild/chroot/facet/directory-base.cc b/lib/sbuild/chroot/facet/directory-base.cc index 3be65c24..a8c2b8ba 100644 --- a/lib/sbuild/chroot/facet/directory-base.cc +++ b/lib/sbuild/chroot/facet/directory-base.cc @@ -19,9 +19,9 @@ #include <config.h> #include <sbuild/chroot/facet/directory-base.h> -#include "format-detail.h" -#include "lock.h" -#include "util.h" +#include <sbuild/format-detail.h> +#include <sbuild/lock.h> +#include <sbuild/util.h> #include <cerrno> #include <cstring> diff --git a/lib/sbuild/chroot/facet/directory.cc b/lib/sbuild/chroot/facet/directory.cc index 10c354ba..deef1f97 100644 --- a/lib/sbuild/chroot/facet/directory.cc +++ b/lib/sbuild/chroot/facet/directory.cc @@ -22,8 +22,8 @@ #include <sbuild/chroot/facet/factory.h> #include <sbuild/chroot/facet/fsunion.h> #include <sbuild/chroot/facet/session.h> -#include "format-detail.h" -#include "util.h" +#include <sbuild/format-detail.h> +#include <sbuild/util.h> #include <cassert> #include <cerrno> diff --git a/lib/sbuild/chroot/facet/file.cc b/lib/sbuild/chroot/facet/file.cc index ab35484f..59fe3db8 100644 --- a/lib/sbuild/chroot/facet/file.cc +++ b/lib/sbuild/chroot/facet/file.cc @@ -24,7 +24,7 @@ #include <sbuild/chroot/facet/session-clonable.h> #include <sbuild/chroot/facet/session.h> #include <sbuild/chroot/facet/source-clonable.h> -#include "format-detail.h" +#include <sbuild/format-detail.h> #include <cassert> #include <cerrno> diff --git a/lib/sbuild/chroot/facet/fsunion.cc b/lib/sbuild/chroot/facet/fsunion.cc index e943ed57..38dd6eac 100644 --- a/lib/sbuild/chroot/facet/fsunion.cc +++ b/lib/sbuild/chroot/facet/fsunion.cc @@ -24,7 +24,7 @@ #include <sbuild/chroot/facet/session.h> #include <sbuild/chroot/facet/fsunion.h> #include <sbuild/chroot/facet/source-clonable.h> -#include "feature.h" +#include <sbuild/feature.h> #include <cassert> diff --git a/lib/sbuild/chroot/facet/loopback.cc b/lib/sbuild/chroot/facet/loopback.cc index 4581a34b..91cbdda9 100644 --- a/lib/sbuild/chroot/facet/loopback.cc +++ b/lib/sbuild/chroot/facet/loopback.cc @@ -23,7 +23,7 @@ #include <sbuild/chroot/facet/loopback.h> #include <sbuild/chroot/facet/mountable.h> #include <sbuild/chroot/facet/session.h> -#include "format-detail.h" +#include <sbuild/format-detail.h> #include <cassert> #include <cerrno> diff --git a/lib/sbuild/chroot/facet/lvm-snapshot.cc b/lib/sbuild/chroot/facet/lvm-snapshot.cc index ffd35e4e..5e60ed53 100644 --- a/lib/sbuild/chroot/facet/lvm-snapshot.cc +++ b/lib/sbuild/chroot/facet/lvm-snapshot.cc @@ -25,7 +25,7 @@ #include <sbuild/chroot/facet/session-clonable.h> #include <sbuild/chroot/facet/session.h> #include <sbuild/chroot/facet/source-clonable.h> -#include "format-detail.h" +#include <sbuild/format-detail.h> #include <cassert> #include <cerrno> diff --git a/lib/sbuild/chroot/facet/plain.cc b/lib/sbuild/chroot/facet/plain.cc index 007a8e02..645c6e72 100644 --- a/lib/sbuild/chroot/facet/plain.cc +++ b/lib/sbuild/chroot/facet/plain.cc @@ -21,8 +21,8 @@ #include <sbuild/chroot/facet/factory.h> #include <sbuild/chroot/facet/plain.h> #include <sbuild/chroot/facet/session-clonable.h> -#include "format-detail.h" -#include "util.h" +#include <sbuild/format-detail.h> +#include <sbuild/util.h> #include <cassert> #include <cerrno> diff --git a/lib/sbuild/chroot/facet/session-clonable.cc b/lib/sbuild/chroot/facet/session-clonable.cc index 86609b3a..f160e49a 100644 --- a/lib/sbuild/chroot/facet/session-clonable.cc +++ b/lib/sbuild/chroot/facet/session-clonable.cc @@ -25,7 +25,7 @@ #include <sbuild/chroot/facet/session-clonable.h> #include <sbuild/chroot/facet/session-setup.h> #include <sbuild/chroot/facet/source-clonable.h> -#include "format-detail.h" +#include <sbuild/format-detail.h> #include <cassert> diff --git a/lib/sbuild/chroot/facet/unshare.cc b/lib/sbuild/chroot/facet/unshare.cc index d90ff597..f9d52b62 100644 --- a/lib/sbuild/chroot/facet/unshare.cc +++ b/lib/sbuild/chroot/facet/unshare.cc @@ -21,7 +21,7 @@ #include <sbuild/chroot/chroot.h> #include <sbuild/chroot/facet/factory.h> #include <sbuild/chroot/facet/unshare.h> -#include "feature.h" +#include <sbuild/feature.h> #include <boost/format.hpp> diff --git a/lib/sbuild/chroot/facet/userdata.cc b/lib/sbuild/chroot/facet/userdata.cc index 19f26be3..068fa28f 100644 --- a/lib/sbuild/chroot/facet/userdata.cc +++ b/lib/sbuild/chroot/facet/userdata.cc @@ -21,7 +21,7 @@ #include <sbuild/chroot/chroot.h> #include <sbuild/chroot/facet/factory.h> #include <sbuild/chroot/facet/userdata.h> -#include "regex.h" +#include <sbuild/regex.h> #include <locale> diff --git a/lib/sbuild/ctty.cc b/lib/sbuild/ctty.cc index a1654f56..e707b1b1 100644 --- a/lib/sbuild/ctty.cc +++ b/lib/sbuild/ctty.cc @@ -18,7 +18,7 @@ #include <config.h> -#include "ctty.h" +#include <sbuild/ctty.h> #include <cerrno> #include <cstring> diff --git a/lib/sbuild/environment.cc b/lib/sbuild/environment.cc index 3d1d27d7..8754763d 100644 --- a/lib/sbuild/environment.cc +++ b/lib/sbuild/environment.cc @@ -18,7 +18,7 @@ #include <config.h> -#include "environment.h" +#include <sbuild/environment.h> #include <cstring> diff --git a/lib/sbuild/error.h b/lib/sbuild/error.h index c422153f..7408b27f 100644 --- a/lib/sbuild/error.h +++ b/lib/sbuild/error.h @@ -352,7 +352,7 @@ namespace sbuild } -#include "error.tcc" +#include <sbuild/error.tcc> #endif /* SBUILD_ERROR_H */ diff --git a/lib/sbuild/feature.cc b/lib/sbuild/feature.cc index a64a1c8f..13f53036 100644 --- a/lib/sbuild/feature.cc +++ b/lib/sbuild/feature.cc @@ -20,8 +20,8 @@ #include <iostream> -#include "feature.h" -#include "i18n.h" +#include <sbuild/feature.h> +#include <sbuild/i18n.h> using namespace sbuild; diff --git a/lib/sbuild/format-detail.cc b/lib/sbuild/format-detail.cc index 1c361be7..d38ecfea 100644 --- a/lib/sbuild/format-detail.cc +++ b/lib/sbuild/format-detail.cc @@ -18,9 +18,9 @@ #include <config.h> -#include "format-detail.h" -#include "i18n.h" -#include "log.h" +#include <sbuild/format-detail.h> +#include <sbuild/i18n.h> +#include <sbuild/log.h> #include <boost/format.hpp> diff --git a/lib/sbuild/keyfile-reader.cc b/lib/sbuild/keyfile-reader.cc index b7e8326e..237d286a 100644 --- a/lib/sbuild/keyfile-reader.cc +++ b/lib/sbuild/keyfile-reader.cc @@ -20,7 +20,7 @@ #include <fstream> -#include "keyfile-reader.h" +#include <sbuild/keyfile-reader.h> using namespace sbuild; diff --git a/lib/sbuild/keyfile-writer.cc b/lib/sbuild/keyfile-writer.cc index 43bbe760..b3a62552 100644 --- a/lib/sbuild/keyfile-writer.cc +++ b/lib/sbuild/keyfile-writer.cc @@ -20,7 +20,7 @@ #include <fstream> -#include "keyfile-writer.h" +#include <sbuild/keyfile-writer.h> using namespace sbuild; diff --git a/lib/sbuild/keyfile.cc b/lib/sbuild/keyfile.cc index 36fcd732..7d74b2f9 100644 --- a/lib/sbuild/keyfile.cc +++ b/lib/sbuild/keyfile.cc @@ -21,7 +21,7 @@ #include <algorithm> #include <set> -#include "keyfile.h" +#include <sbuild/keyfile.h> #include <boost/format.hpp> diff --git a/lib/sbuild/lock.cc b/lib/sbuild/lock.cc index 03a38f1c..dfa8fe9a 100644 --- a/lib/sbuild/lock.cc +++ b/lib/sbuild/lock.cc @@ -18,9 +18,9 @@ #include <config.h> -#include "lock.h" -#include "log.h" -#include "feature.h" +#include <sbuild/lock.h> +#include <sbuild/log.h> +#include <sbuild/feature.h> #include <cerrno> #include <cstdlib> diff --git a/lib/sbuild/log.cc b/lib/sbuild/log.cc index 628e4348..7f7a5697 100644 --- a/lib/sbuild/log.cc +++ b/lib/sbuild/log.cc @@ -18,12 +18,12 @@ #include <config.h> -#include "ctty.h" -#include "error.h" -#include "i18n.h" -#include "log.h" -#include "nostream.h" -#include "util.h" +#include <sbuild/ctty.h> +#include <sbuild/error.h> +#include <sbuild/i18n.h> +#include <sbuild/log.h> +#include <sbuild/nostream.h> +#include <sbuild/util.h> #include <iostream> diff --git a/lib/sbuild/mntstream.cc b/lib/sbuild/mntstream.cc index f2ff2807..3f1e1601 100644 --- a/lib/sbuild/mntstream.cc +++ b/lib/sbuild/mntstream.cc @@ -18,7 +18,7 @@ #include <config.h> -#include "mntstream.h" +#include <sbuild/mntstream.h> #include <cerrno> #include <cstring> diff --git a/lib/sbuild/nostream.cc b/lib/sbuild/nostream.cc index b91c0905..7d38299e 100644 --- a/lib/sbuild/nostream.cc +++ b/lib/sbuild/nostream.cc @@ -16,6 +16,6 @@ * *********************************************************************/ -#include "nostream.h" +#include <sbuild/nostream.h> sbuild::nostream sbuild::cnull; diff --git a/lib/sbuild/parse-value.cc b/lib/sbuild/parse-value.cc index 9c3075d8..08e3b0d7 100644 --- a/lib/sbuild/parse-value.cc +++ b/lib/sbuild/parse-value.cc @@ -18,7 +18,7 @@ #include <config.h> -#include "parse-value.h" +#include <sbuild/parse-value.h> using namespace sbuild; diff --git a/lib/sbuild/personality.cc b/lib/sbuild/personality.cc index bb40433e..09ae0e5b 100644 --- a/lib/sbuild/personality.cc +++ b/lib/sbuild/personality.cc @@ -18,9 +18,9 @@ #include <config.h> -#include "config.h" -#include "personality.h" -#include "feature.h" +#include <sbuild/config.h> +#include <sbuild/personality.h> +#include <sbuild/feature.h> #include <cstring> #include <cerrno> diff --git a/lib/sbuild/run-parts.cc b/lib/sbuild/run-parts.cc index 21497ef6..a1ec39c1 100644 --- a/lib/sbuild/run-parts.cc +++ b/lib/sbuild/run-parts.cc @@ -18,8 +18,8 @@ #include <config.h> -#include "run-parts.h" -#include "util.h" +#include <sbuild/run-parts.h> +#include <sbuild/util.h> #include <cerrno> diff --git a/lib/sbuild/session.cc b/lib/sbuild/session.cc index 67eac134..e84407f4 100644 --- a/lib/sbuild/session.cc +++ b/lib/sbuild/session.cc @@ -33,11 +33,11 @@ #else #include <sbuild/auth/deny.h> #endif // SBUILD_FEATURE_PAM -#include "ctty.h" -#include "feature.h" -#include "run-parts.h" -#include "session.h" -#include "util.h" +#include <sbuild/ctty.h> +#include <sbuild/feature.h> +#include <sbuild/run-parts.h> +#include <sbuild/session.h> +#include <sbuild/util.h> #include <cassert> #include <cerrno> diff --git a/lib/sbuild/types.cc b/lib/sbuild/types.cc index 97ea2f03..d033c84e 100644 --- a/lib/sbuild/types.cc +++ b/lib/sbuild/types.cc @@ -18,7 +18,7 @@ #include <config.h> -#include "types.h" +#include <sbuild/types.h> #include <sbuild/i18n.h> using namespace sbuild; diff --git a/lib/sbuild/util.cc b/lib/sbuild/util.cc index 02158b43..68cf9a1f 100644 --- a/lib/sbuild/util.cc +++ b/lib/sbuild/util.cc @@ -18,8 +18,8 @@ #include <config.h> -#include "error.h" -#include "util.h" +#include <sbuild/error.h> +#include <sbuild/util.h> #include <cerrno> #include <cstring> diff --git a/lib/schroot-common/main.cc b/lib/schroot-common/main.cc index 850a11a6..ebd44ccb 100644 --- a/lib/schroot-common/main.cc +++ b/lib/schroot-common/main.cc @@ -18,7 +18,7 @@ #include <config.h> -#include "main.h" +#include <schroot-common/main.h> #include <sbuild/config.h> #ifdef SBUILD_FEATURE_PAM diff --git a/lib/schroot-common/options.cc b/lib/schroot-common/options.cc index 077bcbc4..4e5f6d52 100644 --- a/lib/schroot-common/options.cc +++ b/lib/schroot-common/options.cc @@ -20,7 +20,7 @@ #include <sbuild/util.h> -#include "options.h" +#include <schroot-common/options.h> #include <cstdlib> #include <iostream> diff --git a/libexec/listmounts/listmounts.cc b/libexec/listmounts/listmounts.cc index 1f9be8b4..7ba1be93 100644 --- a/libexec/listmounts/listmounts.cc +++ b/libexec/listmounts/listmounts.cc @@ -18,8 +18,8 @@ #include <config.h> -#include "options.h" -#include "main.h" +#include <listmounts/options.h> +#include <listmounts/main.h> #include <bin-common/run.h> diff --git a/libexec/listmounts/main.cc b/libexec/listmounts/main.cc index 38f7f89c..7ecaedd1 100644 --- a/libexec/listmounts/main.cc +++ b/libexec/listmounts/main.cc @@ -21,7 +21,7 @@ #include <sbuild/mntstream.h> #include <sbuild/util.h> -#include "main.h" +#include <listmounts/main.h> #include <cerrno> #include <climits> diff --git a/libexec/listmounts/options.cc b/libexec/listmounts/options.cc index 2d7bb893..122e9f41 100644 --- a/libexec/listmounts/options.cc +++ b/libexec/listmounts/options.cc @@ -20,7 +20,7 @@ #include <sbuild/i18n.h> -#include "options.h" +#include <listmounts/options.h> #include <cstdlib> #include <iostream> diff --git a/libexec/mount/main.cc b/libexec/mount/main.cc index 6f913f2d..88405eef 100644 --- a/libexec/mount/main.cc +++ b/libexec/mount/main.cc @@ -21,7 +21,7 @@ #include <sbuild/mntstream.h> #include <sbuild/util.h> -#include "main.h" +#include <mount/main.h> #include <cerrno> #include <climits> diff --git a/libexec/mount/mount.cc b/libexec/mount/mount.cc index 1845aae0..c998fd0b 100644 --- a/libexec/mount/mount.cc +++ b/libexec/mount/mount.cc @@ -18,8 +18,8 @@ #include <config.h> -#include "options.h" -#include "main.h" +#include <mount/options.h> +#include <mount/main.h> #include <bin-common/run.h> diff --git a/libexec/mount/options.cc b/libexec/mount/options.cc index 35e9c9c1..1fc7f78a 100644 --- a/libexec/mount/options.cc +++ b/libexec/mount/options.cc @@ -21,7 +21,7 @@ #include <sbuild/i18n.h> #include <sbuild/util.h> -#include "options.h" +#include <mount/options.h> #include <cstdlib> #include <iostream> diff --git a/scripts/global.mk b/scripts/global.mk index 03d6dcfb..76b28bbc 100644 --- a/scripts/global.mk +++ b/scripts/global.mk @@ -29,7 +29,7 @@ schroot_setupdatadir=$(pkgdatadir)/setup SCHROOT_CONF=$(schroot_sysconfdir)/schroot.conf # Global options for use in all Makefiles. -AM_CXXFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/bin $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing +AM_CXXFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/libexec -I$(top_srcdir)/bin $(LOCAL_CXXFLAGS) $(PTHREAD_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing AM_LDFLAGS = $(LOCAL_LDFLAGS) $(PTHREAD_LIBS) diff --git a/test/sbuild/chroot/chroot.h b/test/sbuild/chroot/chroot.h index cd1da652..370bdb35 100644 --- a/test/sbuild/chroot/chroot.h +++ b/test/sbuild/chroot/chroot.h @@ -90,7 +90,7 @@ public: // Create new chroot this->chroot = sbuild::chroot::chroot::create(type); CPPUNIT_ASSERT(this->chroot); - CPPUNIT_ASSERT(!(static_cast<bool>(this->chroot->template get_facet<sbuild::chroot::facet::session>()))); + CPPUNIT_ASSERT(!(static_cast<bool>(this->chroot->get_facet<sbuild::chroot::facet::session>()))); setup_chroot_props(this->chroot); @@ -98,7 +98,7 @@ public: // Create new source chroot. sbuild::chroot::facet::session_clonable::const_ptr psess - (this->chroot->template get_facet<sbuild::chroot::facet::session_clonable>()); + (this->chroot->get_facet<sbuild::chroot::facet::session_clonable>()); if (psess) { this->session = this->chroot->clone_session("test-session-name", @@ -107,31 +107,28 @@ public: false); if (this->session) { - CPPUNIT_ASSERT(this->session->template get_facet<sbuild::chroot::facet::session>()); + CPPUNIT_ASSERT(this->session->get_facet<sbuild::chroot::facet::session>()); } } sbuild::chroot::facet::source_clonable::const_ptr psrc - (this->chroot-> - template get_facet<sbuild::chroot::facet::source_clonable>()); + (this->chroot->get_facet<sbuild::chroot::facet::source_clonable>()); if (psrc) this->source = this->chroot->clone_source(); if (this->source) { sbuild::chroot::facet::source_clonable::const_ptr pfsrcc - (this->source-> - template get_facet<sbuild::chroot::facet::source_clonable>()); + (this->source->get_facet<sbuild::chroot::facet::source_clonable>()); CPPUNIT_ASSERT(!pfsrcc); sbuild::chroot::facet::source::const_ptr pfsrc - (this->source-> - template get_facet<sbuild::chroot::facet::source>()); + (this->source->get_facet<sbuild::chroot::facet::source>()); CPPUNIT_ASSERT(pfsrc); } if (source) { sbuild::chroot::facet::session_clonable::const_ptr psess_src - (this->source->template get_facet<sbuild::chroot::facet::session_clonable>()); + (this->source->get_facet<sbuild::chroot::facet::session_clonable>()); if (psess_src) { this->session_source = this->source->clone_session("test-session-name", @@ -140,7 +137,7 @@ public: false); if (this->session_source) { - CPPUNIT_ASSERT(this->session_source->template get_facet<sbuild::chroot::facet::session>()); + CPPUNIT_ASSERT(this->session_source->get_facet<sbuild::chroot::facet::session>()); } } } @@ -148,7 +145,7 @@ public: #ifdef SBUILD_FEATURE_UNION this->chroot_union = sbuild::chroot::chroot::create(type); sbuild::chroot::facet::fsunion::ptr un = - this->chroot_union->template get_facet<sbuild::chroot::facet::fsunion>(); + this->chroot_union->get_facet<sbuild::chroot::facet::fsunion>(); if (!un) { this->chroot_union.reset(); @@ -158,7 +155,7 @@ public: un->set_union_type("aufs"); setup_chroot_props(this->chroot_union); - CPPUNIT_ASSERT(!(this->chroot_union->template get_facet<sbuild::chroot::facet::session>())); + CPPUNIT_ASSERT(!(this->chroot_union->get_facet<sbuild::chroot::facet::session>())); CPPUNIT_ASSERT(this->chroot_union->get_name().length()); un->set_union_overlay_directory("/overlay"); @@ -173,7 +170,7 @@ public: this->source_union = chroot_union->clone_source(); sbuild::chroot::facet::session_clonable::const_ptr puni_sess_src - (this->source_union->template get_facet<sbuild::chroot::facet::session_clonable>()); + (this->source_union->get_facet<sbuild::chroot::facet::session_clonable>()); if (puni_sess_src) { this->session_source_union = this->source_union->clone_session("test-session-name", @@ -183,10 +180,10 @@ public: } CPPUNIT_ASSERT(this->session_union); - CPPUNIT_ASSERT(this->session_union->template get_facet<sbuild::chroot::facet::session>()); + CPPUNIT_ASSERT(this->session_union->get_facet<sbuild::chroot::facet::session>()); CPPUNIT_ASSERT(this->source_union); CPPUNIT_ASSERT(this->session_source_union); - CPPUNIT_ASSERT(this->session_source_union->template get_facet<sbuild::chroot::facet::session>()); + CPPUNIT_ASSERT(this->session_source_union->get_facet<sbuild::chroot::facet::session>()); } #endif // SBUILD_FEATURE_UNION @@ -214,7 +211,7 @@ public: pfac->set_persona(sbuild::personality("undefined")); sbuild::chroot::facet::source_clonable::ptr usrc - (chroot->template get_facet<sbuild::chroot::facet::source_clonable>()); + (chroot->get_facet<sbuild::chroot::facet::source_clonable>()); if (usrc) { usrc->set_source_users(sbuild::split_string("suser1,suser2", ",")); diff --git a/test/sbuild/chroot/loopback.cc b/test/sbuild/chroot/loopback.cc index fa17dd79..b7294daa 100644 --- a/test/sbuild/chroot/loopback.cc +++ b/test/sbuild/chroot/loopback.cc @@ -17,7 +17,7 @@ * *********************************************************************/ -#include "config.h" +#include <config.h> #include <algorithm> #include <set> |