Move the manager process sources into a subdirectory, away from

the gaze of prying VMODs.

bin/varnishd/Makefile.am

@@ -55,14 +55,14 @@ varnishd_SOURCES = \
 	hash/hash_classic.c \
 	hash/hash_critbit.c \
 	hash/hash_simple_list.c \
-	mgt_child.c \
-	mgt_cli.c \
-	mgt_param.c \
-	mgt_pool.c \
-	mgt_sandbox.c \
-	mgt_sandbox_solaris.c \
-	mgt_shmem.c \
-	mgt_vcc.c \
+	mgt/mgt_child.c \
+	mgt/mgt_cli.c \
+	mgt/mgt_param.c \
+	mgt/mgt_pool.c \
+	mgt/mgt_sandbox.c \
+	mgt/mgt_sandbox_solaris.c \
+	mgt/mgt_shmem.c \
+	mgt/mgt_vcc.c \
 	rfc2616.c \
 	storage/stevedore.c \
 	storage/stevedore_utils.c \
@@ -86,8 +86,8 @@ noinst_HEADERS = \
 	default_vcl.h \
 	hash/hash_slinger.h \
 	heritage.h \
-	mgt.h \
-	mgt_cli.h \
+	mgt/mgt.h \
+	mgt/mgt_cli.h \
 	storage/storage.h \
 	storage/storage_persistent.h \
 	vparam.h
@@ -128,7 +128,7 @@ default_vcl.h:	default.vcl Makefile
 	    -e 's/^/ "/' $(srcdir)/default.vcl >> $@
 
 # Explicitly record dependency
-mgt_vcc.c:	default_vcl.h
+mgt/mgt_vcc.c:	default_vcl.h
 
 varnishd.1: $(top_srcdir)/doc/sphinx/reference/varnishd.rst
 if HAVE_RST2MAN

bin/varnishd/flint.sh

@@ -18,6 +18,8 @@ flexelint \
 	*.c \
 	storage/*.c \
 	waiter/*.c \
+	hash/*.c \
+	mgt/*.c \
 	../../lib/libvarnish/*.c \
 	../../lib/libvarnishcompat/execinfo.c \
 	../../lib/libvcl/*.c \

bin/varnishd/mgt_child.c → bin/varnishd/mgt/mgt_child.c

@@ -43,7 +43,7 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#include "mgt.h"
+#include "mgt/mgt.h"
 
 #include "heritage.h"
 #include "vapi/vsm_int.h"

bin/varnishd/mgt_cli.c → bin/varnishd/mgt/mgt_cli.c

@@ -42,7 +42,7 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#include "mgt.h"
+#include "mgt/mgt.h"
 
 #include "heritage.h"
 #include "vcli.h"

bin/varnishd/mgt_param.c → bin/varnishd/mgt/mgt_param.c

@@ -37,7 +37,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "mgt.h"
+#include "mgt/mgt.h"
 
 #include "waiter/cache_waiter.h"
 #include "heritage.h"

bin/varnishd/mgt_pool.c → bin/varnishd/mgt/mgt_pool.c

@@ -47,7 +47,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "mgt.h"
+#include "mgt/mgt.h"
 
 #include "heritage.h"
 #include "vparam.h"

bin/varnishd/mgt_sandbox.c → bin/varnishd/mgt/mgt_sandbox.c

@@ -52,7 +52,7 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#include "mgt.h"
+#include "mgt/mgt.h"
 
 #include "heritage.h"
 

bin/varnishd/mgt_sandbox_solaris.c → bin/varnishd/mgt/mgt_sandbox_solaris.c

@@ -42,7 +42,7 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#include "mgt.h"
+#include "mgt/mgt.h"
 
 #include "heritage.h"
 

bin/varnishd/mgt_shmem.c → bin/varnishd/mgt/mgt_shmem.c

@@ -97,7 +97,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "mgt.h"
+#include "mgt/mgt.h"
 
 #include "flopen.h"
 #include "heritage.h"

bin/varnishd/mgt_vcc.c → bin/varnishd/mgt/mgt_vcc.c

@@ -38,7 +38,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "mgt.h"
+#include "mgt/mgt.h"
 
 #include "libvcl.h"
 #include "vcl.h"

bin/varnishd/storage/stevedore_utils.c

@@ -49,7 +49,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "mgt.h"
+#include "mgt/mgt.h"
 
 #include "storage/storage.h"
 #include "vnum.h"

bin/varnishd/varnishd.c

@@ -43,7 +43,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "mgt.h"
+#include "mgt/mgt.h"
 
 #include "hash/hash_slinger.h"
 #include "heritage.h"