Minimize installation steps

I got carried away and ended up streamlining the entire directory
tree as part of the build system refactor.

Fixes the second bullet from #163.

Also deletes a bunch of dead code.

.gitignore

@@ -19,6 +19,11 @@
 *.o.d
 *.c.orig
 *.h.orig
+#
+/src/usr/siit/jool_siit
+/src/usr/nat64/jool
+/src/usr/joold/joold
+/test/graybox/usr/graybox
 # documentation
 _site
 
@@ -78,6 +83,15 @@ install-sh
 missing
 autom4te.cache
 
+# Makefiles need to be gitignore'd on an individual basis, because there
+# are plenty of manually generated ones that need to be uploaded.
+/Makefile
+/src/usr/Makefile
+/src/usr/siit/Makefile
+/src/usr/nat64/Makefile
+/src/usr/joold/Makefile
+/test/graybox/usr/Makefile
+
 # DKMS version cache
 ######################
 dkms.package_version.conf

Makefile.am

@@ -0,0 +1,3 @@
+AUTOMAKE_OPTIONS = foreign
+
+SUBDIRS = src/mod src/usr

usr/configure.ac → configure.ac

@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.68])
 AC_INIT([Jool], [3.5.7], [[email protected]])
-AC_CONFIG_SRCDIR([common/jool.c])
+AC_CONFIG_SRCDIR([src/common/xlat.h])
 AM_INIT_AUTOMAKE([subdir-objects])
 
 # Checks for programs.
@@ -29,4 +29,8 @@ PKG_CHECK_MODULES(LIBNLGENL3, libnl-genl-3.0 >= 3.1)
 PKG_CHECK_MODULES(XTABLES, xtables)
 
 # Spit out the makefiles.
-AC_OUTPUT(Makefile stateless/Makefile stateful/Makefile joold/Makefile)
+AC_OUTPUT(Makefile
+	src/usr/Makefile
+	src/usr/siit/Makefile
+	src/usr/nat64/Makefile
+	src/usr/joold/Makefile)

deconf.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+git clean -dfx \
+	-e .cproject \
+	-e .project \
+	-e .settings \
+	-e .metadata \
+	-e Debug/

dkms.conf

@@ -33,7 +33,7 @@ if test ! -e "${VERSIONFILE}"; then
   eval "$(sed -n '/^#define  *JOOL_VERSION_\(MAJOR\|MINOR\|REV\) / {
                     s/^#define  *//;
                     s/  */=/p;
-                  }' ${SRCDIR}/include/nat64/common/xlat.h)"
+                  }' ${SRCDIR}/src/include/jool/common/xlat.h)"
 
   if test ! -z "$JOOL_VERSION_MAJOR" -a ! -z "$JOOL_VERSION_MINOR" -a \
           ! -z "$JOOL_VERSION_REV"; then
@@ -75,14 +75,14 @@ fi
 # such as after a kernel upgrade.
 AUTOINSTALL="yes"
 
-MAKE[0]="make -C ${kernel_source_dir} SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/mod/stateful modules && make -C ${kernel_source_dir} SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/mod/stateless modules"
+MAKE[0]="make -C ${kernel_source_dir} SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/src/mod/nat64 modules && make -C ${kernel_source_dir} SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/src/mod/siit modules"
 
 CLEAN="make -C ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/mod clean"
 
 BUILT_MODULE_NAME[0]="jool"
-BUILT_MODULE_LOCATION[0]="mod/stateful/"
+BUILT_MODULE_LOCATION[0]="src/mod/nat64/"
 DEST_MODULE_LOCATION[0]="/extra/"
 
 BUILT_MODULE_NAME[1]="jool_siit"
-BUILT_MODULE_LOCATION[1]="mod/stateless/"
+BUILT_MODULE_LOCATION[1]="src/mod/siit/"
 DEST_MODULE_LOCATION[1]="/extra/"