Move protobufs inside src and distribute /debian

Makefile.am

@@ -1,2 +1,2 @@
-SUBDIRS = protobufs src scripts
+SUBDIRS = src scripts
-EXTRA_DIST = grant.htm
+EXTRA_DIST = grant.htm debian

configure.ac

@@ -6,7 +6,7 @@ AC_INIT(mosh, 0.9, mosh-devel@mit.edu)
 AM_INIT_AUTOMAKE(mosh, 0.9)
 AC_CONFIG_SRCDIR([src/transportfragment.h])
 AC_CONFIG_HEADERS([config.h])
-AC_OUTPUT(Makefile src/Makefile protobufs/Makefile scripts/Makefile)
+AC_OUTPUT(Makefile src/Makefile src/protobufs/Makefile scripts/Makefile)
 
 # Checks for programs.
 AC_PROG_CXX

debian/control

@@ -2,7 +2,7 @@ Source: mosh
 Section: net
 Priority: optional
 Maintainer: Keith Winstein <keithw@mit.edu>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev, protobuf-compiler, libprotobuf-dev
+Build-Depends: debhelper (>= 8.0.0), autotools-dev, protobuf-compiler, libprotobuf-dev, dh-autoreconf
 Standards-Version: 3.9.2
 Homepage: http://mosh.mit.edu
 Vcs-Git: git://github.com/keithw/mosh.git

debian/rules

@@ -10,4 +10,4 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ 
+	dh $@ --with autoreconf

src/Makefile.am

@@ -1,7 +1,9 @@
-AM_CPPFLAGS = -I$(top_builddir)/protobufs/ -D_XOPEN_SOURCE=500 -D_GNU_SOURCE -D_BSD_SOURCE
+SUBDIRS = protobufs .
+
+AM_CPPFLAGS = -Iprotobufs -D_XOPEN_SOURCE=500 -D_GNU_SOURCE -D_BSD_SOURCE
 AM_CXXFLAGS = -g -O2 --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
 LIBS = `pkg-config --libs protobuf-lite`
-LDADD = -lutil -lrt -lm $(top_builddir)/protobufs/libmoshprotos.a
+LDADD = -lutil -lrt -lm protobufs/libmoshprotos.a
 
 bin_PROGRAMS = mosh-client mosh-server