diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2017-02-01 23:16:40 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2017-02-01 23:16:40 -0500 |
| commit | 8bb15cce3ca7d192ffe13083752309ba74336be7 (patch) | |
| tree | 2a0f9e420e3e1db8ac992ac06a17810c441cefd4 | |
| parent | 336f925294bc50224a6c3a7d5779a741762ea52c (diff) | |
move systemd-cgroups-agent into grp-system
| -rw-r--r-- | src/Makefile | 1 | ||||
| -rw-r--r-- | src/grp-system/Makefile | 2 | ||||
| -rw-r--r-- | src/grp-system/systemd-cgroups-agent/Makefile (renamed from src/systemd-cgroups-agent/Makefile) | 2 | ||||
| -rw-r--r-- | src/grp-system/systemd-cgroups-agent/cgroups-agent.c (renamed from src/systemd-cgroups-agent/cgroups-agent.c) | 0 | ||||
| -rwxr-xr-x | tools/notsd-move | 1 |
5 files changed, 4 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index d9e4ed57f2..7bea64ea42 100644 --- a/src/Makefile +++ b/src/Makefile @@ -49,7 +49,6 @@ nested.subdirs += nss-myhostname nested.subdirs += nss-systemd nested.subdirs += systemd-ask-password nested.subdirs += systemd-cgls -nested.subdirs += systemd-cgroups-agent nested.subdirs += systemd-cgtop nested.subdirs += systemd-cryptsetup nested.subdirs += systemd-debug-generator diff --git a/src/grp-system/Makefile b/src/grp-system/Makefile index e9c6d7b07f..c3dad876f5 100644 --- a/src/grp-system/Makefile +++ b/src/grp-system/Makefile @@ -1,3 +1,4 @@ + # -*- Mode: makefile; indent-tabs-mode: t -*- # # This file is part of systemd. @@ -30,6 +31,7 @@ nested.subdirs += grp-utils nested.subdirs += libcore nested.subdirs += systemctl nested.subdirs += systemd +nested.subdirs += systemd-cgroups-agent nested.subdirs += systemd-shutdown include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-cgroups-agent/Makefile b/src/grp-system/systemd-cgroups-agent/Makefile index ae40bb0163..5d49f891fd 100644 --- a/src/systemd-cgroups-agent/Makefile +++ b/src/grp-system/systemd-cgroups-agent/Makefile @@ -20,7 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk rootlibexec_PROGRAMS += systemd-cgroups-agent diff --git a/src/systemd-cgroups-agent/cgroups-agent.c b/src/grp-system/systemd-cgroups-agent/cgroups-agent.c index 1475334fc1..1475334fc1 100644 --- a/src/systemd-cgroups-agent/cgroups-agent.c +++ b/src/grp-system/systemd-cgroups-agent/cgroups-agent.c diff --git a/tools/notsd-move b/tools/notsd-move index 3d3205262f..ad638a2e63 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -663,6 +663,7 @@ move_files() ( src/libcore \ src/systemctl \ src/systemd \ + src/systemd-cgroups-agent \ src/systemd-shutdown grp src/grp-system/grp-utils \ src/systemd-analyze \ |