Stout: Corrected style of Makefiles. This is not a full standartization of Makefile format, however, it is a step towards consistency. This patch focuses mainly on the order of files and corrects obvious issues. These are guidelines behind the change:
- Files in the same folder should appear in lexicographical order. - Subfolders should appear in lexicographical order either after files or mixed with them (depending on the current consensus in the file). - Though tabs are preferred, spaces are not replaced if they are current consensus in the file or current section. Review: https://reviews.apache.org/r/40013 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/288e7703 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/288e7703 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/288e7703 Branch: refs/heads/master Commit: 288e770321ee99d480a045b1f38d16ab67a5f0cb Parents: ffdda71 Author: Alexander Rukletsov <[email protected]> Authored: Sat Nov 7 13:32:03 2015 +0100 Committer: Till Toenshoff <[email protected]> Committed: Sat Nov 7 13:32:03 2015 +0100 ---------------------------------------------------------------------- .../3rdparty/stout/include/Makefile.am | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/288e7703/3rdparty/libprocess/3rdparty/stout/include/Makefile.am ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/Makefile.am b/3rdparty/libprocess/3rdparty/stout/include/Makefile.am index 67b142b..741639a 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/Makefile.am +++ b/3rdparty/libprocess/3rdparty/stout/include/Makefile.am @@ -40,8 +40,6 @@ nobase_include_HEADERS = \ stout/json.hpp \ stout/lambda.hpp \ stout/linkedhashmap.hpp \ - stout/posix/gzip.hpp \ - stout/posix/os.hpp \ stout/list.hpp \ stout/mac.hpp \ stout/multihashmap.hpp \ @@ -64,19 +62,6 @@ nobase_include_HEADERS = \ stout/os/getcwd.hpp \ stout/os/killtree.hpp \ stout/os/linux.hpp \ - stout/os/posix/bootid.hpp \ - stout/os/posix/exists.hpp \ - stout/os/posix/fcntl.hpp \ - stout/os/posix/fork.hpp \ - stout/os/posix/ftruncate.hpp \ - stout/os/posix/killtree.hpp \ - stout/os/posix/ls.hpp \ - stout/os/posix/process.hpp \ - stout/os/posix/pstree.hpp \ - stout/os/posix/sendfile.hpp \ - stout/os/posix/shell.hpp \ - stout/os/posix/signals.hpp \ - stout/os/posix/stat.hpp \ stout/os/ls.hpp \ stout/os/mkdir.hpp \ stout/os/mktemp.hpp \ @@ -98,6 +83,19 @@ nobase_include_HEADERS = \ stout/os/touch.hpp \ stout/os/utime.hpp \ stout/os/write.hpp \ + stout/os/posix/bootid.hpp \ + stout/os/posix/exists.hpp \ + stout/os/posix/fcntl.hpp \ + stout/os/posix/fork.hpp \ + stout/os/posix/ftruncate.hpp \ + stout/os/posix/killtree.hpp \ + stout/os/posix/ls.hpp \ + stout/os/posix/process.hpp \ + stout/os/posix/pstree.hpp \ + stout/os/posix/sendfile.hpp \ + stout/os/posix/shell.hpp \ + stout/os/posix/signals.hpp \ + stout/os/posix/stat.hpp \ stout/os/raw/environment.hpp \ stout/os/windows/bootid.hpp \ stout/os/windows/exists.hpp \ @@ -116,6 +114,8 @@ nobase_include_HEADERS = \ stout/preprocessor.hpp \ stout/proc.hpp \ stout/protobuf.hpp \ + stout/posix/gzip.hpp \ + stout/posix/os.hpp \ stout/recordio.hpp \ stout/result.hpp \ stout/set.hpp \ @@ -126,9 +126,9 @@ nobase_include_HEADERS = \ stout/subcommand.hpp \ stout/svn.hpp \ stout/synchronized.hpp \ - stout/tests/utils.hpp \ stout/thread_local.hpp \ stout/try.hpp \ + stout/tests/utils.hpp \ stout/unimplemented.hpp \ stout/unreachable.hpp \ stout/utils.hpp \
