From 2611a42fb10a778e69193c0356c80427644e87bb Mon Sep 17 00:00:00 2001
From: Keith Winstein <keithw@mit.edu>
Date: Mon, 6 Feb 2012 16:28:29 -0500
Subject: [PATCH] Move protobufs inside src and distribute /debian

---
 Makefile.am                                             | 4 ++--
 configure.ac                                            | 2 +-
 debian/control                                          | 2 +-
 debian/rules                                            | 2 +-
 src/Makefile.am                                         | 6 ++++--
 {protobufs => src/protobufs}/Makefile.am                | 0
 {protobufs => src/protobufs}/hostinput.proto            | 0
 {protobufs => src/protobufs}/transportinstruction.proto | 0
 {protobufs => src/protobufs}/userinput.proto            | 0
 9 files changed, 9 insertions(+), 7 deletions(-)
 rename {protobufs => src/protobufs}/Makefile.am (100%)
 rename {protobufs => src/protobufs}/hostinput.proto (100%)
 rename {protobufs => src/protobufs}/transportinstruction.proto (100%)
 rename {protobufs => src/protobufs}/userinput.proto (100%)

diff --git a/Makefile.am b/Makefile.am
index ab197f0..ba612b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = protobufs src scripts
-EXTRA_DIST = grant.htm
+SUBDIRS = src scripts
+EXTRA_DIST = grant.htm debian
diff --git a/configure.ac b/configure.ac
index b97d029..906fb7c 100644
--- a/configure.ac
+++ b/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
diff --git a/debian/control b/debian/control
index 427f8dc..5d2f587 100644
--- a/debian/control
+++ b/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
diff --git a/debian/rules b/debian/rules
index b760bee..85ce4e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,4 +10,4 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ 
+	dh $@ --with autoreconf
diff --git a/src/Makefile.am b/src/Makefile.am
index d4a9c8b..533c2c0 100644
--- a/src/Makefile.am
+++ b/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
 
diff --git a/protobufs/Makefile.am b/src/protobufs/Makefile.am
similarity index 100%
rename from protobufs/Makefile.am
rename to src/protobufs/Makefile.am
diff --git a/protobufs/hostinput.proto b/src/protobufs/hostinput.proto
similarity index 100%
rename from protobufs/hostinput.proto
rename to src/protobufs/hostinput.proto
diff --git a/protobufs/transportinstruction.proto b/src/protobufs/transportinstruction.proto
similarity index 100%
rename from protobufs/transportinstruction.proto
rename to src/protobufs/transportinstruction.proto
diff --git a/protobufs/userinput.proto b/src/protobufs/userinput.proto
similarity index 100%
rename from protobufs/userinput.proto
rename to src/protobufs/userinput.proto