Merge glorytunctl with glorytun and use argz

Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>

Makefile.am

@@ -1,45 +1,37 @@
 ACLOCAL_AMFLAGS = -I m4 --install
 
-bin_PROGRAMS = glorytun glorytunctl
+bin_PROGRAMS = glorytun
 
 glorytun_CFLAGS = $(libsodium_CFLAGS)
 glorytun_LDADD = $(libsodium_LIBS)
 glorytun_SOURCES = \
-    src/common.h \
+    argz/argz.c \
+    argz/argz.h \
+    mud/mud.c
+    mud/mud.h \
+    src/bench.c \
+    src/bind.c \
     src/common.c \
-    src/ip.h \
-    src/str.h \
+    src/common.h \
     src/ctl.c \
     src/ctl.h \
-    src/main.c \
-    src/option.c \
-    src/option.h \
-    src/tun.c \
-    src/tun.h \
     src/iface.c \
     src/iface.h \
-    mud/mud.h \
-    mud/mud.c
-
-glorytunctl_CFLAGS =
-glorytunctl_LDADD =
-glorytunctl_SOURCES = \
-    src/common.h \
-    src/common.c \
+    src/ip.h \
+    src/keygen.c \
+    src/main.c \
+    src/path.c \
     src/str.h \
-    src/ctl.c \
-    src/ctl.h \
-    src/mainctl.c \
-    src/option.c \
-    src/option.h
+    src/tun.c \
+    src/tun.h \
 
 EXTRA_DIST = \
     LICENSE \
     README.md \
     VERSION \
-    systemd \
+    autogen.sh \
+    meson.build \
     mud/LICENSE \
     mud/README.md \
-    meson.build \
-    autogen.sh \
+    systemd \
     version.sh