fixup src and config reorg started by borkmann

5 files changed, 15 insertions, 16 deletions

diff --git a/Makefile.am b/Makefile.am
index 87b3975..adff8b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 # Our Debian version
 DEBIAN_VERSION := $(shell if [ -e debian/changelog ]; then cat debian/changelog|head -n1|cut -d\- -f2| head -c 1; else echo "unknown"; fi)
-
 AUTOMAKE_OPTIONS = foreign 1.7
 EXTRA_DIST = \
   AUTHORS \
@@ -11,14 +10,7 @@ EXTRA_DIST = \
   CHANGELOG \
   autogen.sh 
 
-# Our main program
-bin_PROGRAMS = tlsdate tlsdate-helper
-tlsdate_SOURCES = src/tlsdate.c
-tlsdate_helper_SOURCES = src/tlsdate-helper.c
-tlsdate_helper_LDADD = -lssl -lcrypto
-
-# We're not shipping headers
-noinst_HEADERS = src/tlsdate.h
+SUBDIRS = src
 
 # Our documentation
 man_MANS = man/tlsdate.1 man/tlsdate-helper.1
diff --git a/TODO b/TODO
index 6c99943..c655699 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,6 @@
 
 Here is a nice list of things to do to improve tlsdate:
 
- 0)   relocate source and configs into subdirs
-        move code into src/
-        move configs into configs/
 
  1)  hack the client handshake to not leak the clock to the server
        set it to all zeros or something cute or something random
diff --git a/autogen.sh b/autogen.sh
index 5de05af..feb968b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,7 @@
 
 set -e
 
-exec autoreconf -ivf && \
+exec autoreconf -ivf -I src -I config && \
 aclocal && \
 autoheader && \
 autoconf && \
diff --git a/configure.ac b/configure.ac
index 869ee89..3a7868c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 AC_INIT([tlsdate], [0.0.1], [jacob at appelbaum.net])
+AC_CONFIG_AUX_DIR(config)
+AM_CONFIG_HEADER([config/tlsdate-config.h])
 AM_INIT_AUTOMAKE([tlsdate], [0.0.1])
-AM_CONFIG_HEADER([tlsdate-config.h])
 AC_CANONICAL_HOST
 AH_TOP([#define _GNU_SOURCE  1])
 
@@ -34,5 +35,4 @@ AC_CHECK_HEADERS(
 
 AC_CHECK_FUNCS([setresuid])
 
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
+AC_OUTPUT(Makefile src/Makefile)
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..756704f
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,10 @@
+AUTOMAKE_OPTIONS = foreign 1.7
+
+# Our main program
+bin_PROGRAMS = tlsdate tlsdate-helper
+tlsdate_SOURCES = tlsdate.c
+tlsdate_helper_SOURCES = tlsdate-helper.c
+tlsdate_helper_LDADD = -lssl -lcrypto
+
+# We're not shipping headers
+noinst_HEADERS = tlsdate.h