You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jp...@apache.org on 2018/06/30 11:44:17 UTC
[2/2] mesos git commit: Combined headers and sources in
`MESOS_LINUX_FILES`.
Combined headers and sources in `MESOS_LINUX_FILES`.
The autotools build doesn't have a general style of separating
header and source files into separate build variables, so combine
both into the same `MESOS_LINUX_FILES` addition to make the style
more consistent.
Review: https://reviews.apache.org/r/67793/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/397633c8
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/397633c8
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/397633c8
Branch: refs/heads/master
Commit: 397633c830855429bbb2d250114ed3974b924ce4
Parents: 41985f0
Author: James Peach <jp...@apache.org>
Authored: Sat Jun 30 21:43:25 2018 +1000
Committer: James Peach <jp...@apache.org>
Committed: Sat Jun 30 21:43:25 2018 +1000
----------------------------------------------------------------------
src/Makefile.am | 86 +++++++++++++++++++++++++---------------------------
1 file changed, 42 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/397633c8/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 76f61d8..de80820 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1285,96 +1285,94 @@ libmesos_no_3rdparty_la_SOURCES += \
MESOS_LINUX_FILES = \
linux/capabilities.cpp \
- linux/cgroups.cpp \
- linux/fs.cpp \
- linux/ldcache.cpp \
- linux/ldd.cpp \
- linux/ns.cpp \
- linux/perf.cpp \
- linux/systemd.cpp \
- slave/containerizer/mesos/linux_launcher.cpp \
- slave/containerizer/mesos/isolators/appc/runtime.cpp \
- slave/containerizer/mesos/isolators/cgroups/cgroups.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystem.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/blkio.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/cpu.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/cpuacct.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/cpuset.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/devices.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/hugetlb.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/memory.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/net_prio.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/perf_event.cpp \
- slave/containerizer/mesos/isolators/cgroups/subsystems/pids.cpp \
- slave/containerizer/mesos/isolators/docker/runtime.cpp \
- slave/containerizer/mesos/isolators/docker/volume/isolator.cpp \
- slave/containerizer/mesos/isolators/filesystem/linux.cpp \
- slave/containerizer/mesos/isolators/filesystem/shared.cpp \
- slave/containerizer/mesos/isolators/gpu/allocator.cpp \
- slave/containerizer/mesos/isolators/gpu/isolator.cpp \
- slave/containerizer/mesos/isolators/gpu/nvml.cpp \
- slave/containerizer/mesos/isolators/gpu/volume.cpp \
- slave/containerizer/mesos/isolators/linux/capabilities.cpp \
- slave/containerizer/mesos/isolators/linux/devices.cpp \
- slave/containerizer/mesos/isolators/namespaces/ipc.cpp \
- slave/containerizer/mesos/isolators/namespaces/pid.cpp \
- slave/containerizer/mesos/isolators/network/cni/cni.cpp \
- slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp \
- slave/containerizer/mesos/isolators/volume/host_path.cpp \
- slave/containerizer/mesos/isolators/volume/image.cpp \
- slave/containerizer/mesos/isolators/volume/secret.cpp \
- slave/containerizer/mesos/provisioner/backends/aufs.cpp \
- slave/containerizer/mesos/provisioner/backends/bind.cpp \
- slave/containerizer/mesos/provisioner/backends/overlay.cpp
-
-MESOS_LINUX_FILES += \
linux/capabilities.hpp \
+ linux/cgroups.cpp \
linux/cgroups.hpp \
+ linux/fs.cpp \
linux/fs.hpp \
+ linux/ldcache.cpp \
linux/ldcache.hpp \
+ linux/ldd.cpp \
linux/ldd.hpp \
+ linux/ns.cpp \
linux/ns.hpp \
+ linux/perf.cpp \
linux/perf.hpp \
linux/sched.hpp \
+ linux/systemd.cpp \
linux/systemd.hpp \
+ slave/containerizer/mesos/linux_launcher.cpp \
slave/containerizer/mesos/linux_launcher.hpp \
+ slave/containerizer/mesos/isolators/appc/runtime.cpp \
slave/containerizer/mesos/isolators/appc/runtime.hpp \
+ slave/containerizer/mesos/isolators/cgroups/cgroups.cpp \
slave/containerizer/mesos/isolators/cgroups/cgroups.hpp \
slave/containerizer/mesos/isolators/cgroups/constants.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystem.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystem.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/blkio.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/blkio.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/cpu.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/cpu.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/cpuacct.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/cpuacct.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/cpuset.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/cpuset.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/devices.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/devices.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/hugetlb.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/hugetlb.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/memory.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/memory.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/net_prio.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/net_prio.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/perf_event.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/perf_event.hpp \
+ slave/containerizer/mesos/isolators/cgroups/subsystems/pids.cpp \
slave/containerizer/mesos/isolators/cgroups/subsystems/pids.hpp \
+ slave/containerizer/mesos/isolators/docker/runtime.cpp \
slave/containerizer/mesos/isolators/docker/runtime.hpp \
+ slave/containerizer/mesos/isolators/docker/volume/isolator.cpp \
slave/containerizer/mesos/isolators/docker/volume/isolator.hpp \
+ slave/containerizer/mesos/isolators/filesystem/linux.cpp \
slave/containerizer/mesos/isolators/filesystem/linux.hpp \
+ slave/containerizer/mesos/isolators/filesystem/shared.cpp \
slave/containerizer/mesos/isolators/filesystem/shared.hpp \
+ slave/containerizer/mesos/isolators/gpu/allocator.cpp \
slave/containerizer/mesos/isolators/gpu/allocator.hpp \
slave/containerizer/mesos/isolators/gpu/components.hpp \
+ slave/containerizer/mesos/isolators/gpu/isolator.cpp \
slave/containerizer/mesos/isolators/gpu/isolator.hpp \
slave/containerizer/mesos/isolators/gpu/nvidia.hpp \
+ slave/containerizer/mesos/isolators/gpu/nvml.cpp \
slave/containerizer/mesos/isolators/gpu/nvml.hpp \
+ slave/containerizer/mesos/isolators/gpu/volume.cpp \
slave/containerizer/mesos/isolators/gpu/volume.hpp \
+ slave/containerizer/mesos/isolators/linux/capabilities.cpp \
slave/containerizer/mesos/isolators/linux/capabilities.hpp \
+ slave/containerizer/mesos/isolators/linux/devices.cpp \
slave/containerizer/mesos/isolators/linux/devices.hpp \
+ slave/containerizer/mesos/isolators/namespaces/ipc.cpp \
slave/containerizer/mesos/isolators/namespaces/ipc.hpp \
+ slave/containerizer/mesos/isolators/namespaces/pid.cpp \
slave/containerizer/mesos/isolators/namespaces/pid.hpp \
+ slave/containerizer/mesos/isolators/network/cni/cni.cpp \
slave/containerizer/mesos/isolators/network/cni/cni.hpp \
+ slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp \
slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.hpp \
+ slave/containerizer/mesos/isolators/volume/host_path.cpp \
slave/containerizer/mesos/isolators/volume/host_path.hpp \
+ slave/containerizer/mesos/isolators/volume/image.cpp \
slave/containerizer/mesos/isolators/volume/image.hpp \
+ slave/containerizer/mesos/isolators/volume/secret.cpp \
slave/containerizer/mesos/isolators/volume/secret.hpp \
+ slave/containerizer/mesos/provisioner/backends/aufs.cpp \
slave/containerizer/mesos/provisioner/backends/aufs.hpp \
+ slave/containerizer/mesos/provisioner/backends/bind.cpp \
slave/containerizer/mesos/provisioner/backends/bind.hpp \
+ slave/containerizer/mesos/provisioner/backends/overlay.cpp \
slave/containerizer/mesos/provisioner/backends/overlay.hpp
if ENABLE_XFS_DISK_ISOLATOR