From a72988017894faf56709ae1819f6b83a110498c7 Mon Sep 17 00:00:00 2001 From: RicardoSanchezA Date: Wed, 6 Dec 2017 09:28:19 -0600 Subject: [PATCH] lxc_init: move up to src/lxc lxc_init.c is actually not a tool, thus it doesn't belong to the tools/ subfolder Signed-off-by: RicardoSanchezA --- src/lxc/Makefile.am | 4 ++-- src/lxc/{tools => }/lxc_init.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename src/lxc/{tools => }/lxc_init.c (99%) diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am index 5c946c12e..868615e29 100644 --- a/src/lxc/Makefile.am +++ b/src/lxc/Makefile.am @@ -276,7 +276,7 @@ lxc_device_SOURCES = tools/lxc_device.c tools/arguments.c lxc_execute_SOURCES = tools/lxc_execute.c tools/arguments.c lxc_freeze_SOURCES = tools/lxc_freeze.c tools/arguments.c lxc_info_SOURCES = tools/lxc_info.c tools/arguments.c -init_lxc_SOURCES = tools/lxc_init.c tools/arguments.c +init_lxc_SOURCES = lxc_init.c tools/arguments.c lxc_monitor_SOURCES = tools/lxc_monitor.c tools/arguments.c lxc_ls_SOURCES = tools/lxc_ls.c tools/arguments.c lxc_copy_SOURCES = tools/lxc_copy.c tools/arguments.c @@ -304,7 +304,7 @@ endif if HAVE_STATIC_LIBCAP sbin_PROGRAMS += init.lxc.static -init_lxc_static_SOURCES = tools/lxc_init.c error.c log.c initutils.c caps.c \ +init_lxc_static_SOURCES = lxc_init.c error.c log.c initutils.c caps.c \ tools/arguments.c if !HAVE_GETLINE diff --git a/src/lxc/tools/lxc_init.c b/src/lxc/lxc_init.c similarity index 99% rename from src/lxc/tools/lxc_init.c rename to src/lxc/lxc_init.c index 82935a381..91e2ce376 100644 --- a/src/lxc/tools/lxc_init.c +++ b/src/lxc/lxc_init.c @@ -36,7 +36,7 @@ #include -#include "arguments.h" +#include "tools/arguments.h" #include "error.h" #include "initutils.h" #include "log.h" -- 2.47.3