From 71d02b2298d5ef3b9c0c59fdeef49d08af2648d2 Mon Sep 17 00:00:00 2001
From: Keith Winstein <keithw@mit.edu>
Date: Sun, 5 Feb 2012 02:48:41 -0500
Subject: [PATCH] Makefile tweaks to pass "make distclean"

---
 Makefile.am           |  1 -
 protobufs/Makefile.am | 17 +++++++++++------
 scripts/Makefile.am   |  2 +-
 src/Makefile.am       |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6bf74f1..b26a3ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1 @@
 SUBDIRS = protobufs src scripts
-
diff --git a/protobufs/Makefile.am b/protobufs/Makefile.am
index 0a44558..06a89e9 100644
--- a/protobufs/Makefile.am
+++ b/protobufs/Makefile.am
@@ -1,17 +1,22 @@
 source = userinput.proto hostinput.proto transportinstruction.proto
 
 PROTOC = protoc
-AM_CXXFLAGS = `pkg-config --cflags protobuf-lite`
+AM_CXXFLAGS = `pkg-config --cflags protobuf-lite` -g -O2 --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
 
 userinput.pb.cc: userinput.proto
-	$(PROTOC) --cpp_out=$(builddir) $<
+	$(PROTOC) --cpp_out=$(builddir) -I$(srcdir) $<
 hostinput.pb.cc: hostinput.proto
-	$(PROTOC) --cpp_out=$(builddir) $<
+	$(PROTOC) --cpp_out=$(builddir) -I$(srcdir) $<
 transportinstruction.pb.cc: transportinstruction.proto
-	$(PROTOC) --cpp_out=$(builddir) $<
+	$(PROTOC) --cpp_out=$(builddir) -I$(srcdir) $<
+
+.o.cc:
+	$(CXX) $(CXXFLAGS) -o $@ $<
 
 noinst_LIBRARIES = libmoshprotos.a
 
-libmoshprotos_a_SOURCES = $(builddir)/userinput.pb.cc $(builddir)/hostinput.pb.cc $(builddir)/transportinstruction.pb.cc
+libmoshprotos_a_SOURCES = userinput.proto hostinput.proto transportinstruction.proto
 
-CLEANFILES = $(builddir)/userinput.pb.cc $(builddir)/hostinput.pb.cc $(builddir)/transportinstruction.pb.cc $(builddir)/userinput.pb.h $(builddir)/hostinput.pb.h $(builddir)/transportinstruction.pb.h
\ No newline at end of file
+libmoshprotos_a_LIBADD = userinput.pb.$(OBJEXT) hostinput.pb.$(OBJEXT) transportinstruction.pb.$(OBJEXT)
+
+CLEANFILES = userinput.pb.cc hostinput.pb.cc transportinstruction.pb.cc userinput.pb.h hostinput.pb.h transportinstruction.pb.h
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 1eb362b..21eaf27 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1 +1 @@
-bin_SCRIPTS = mosh
\ No newline at end of file
+dist_bin_SCRIPTS = mosh
diff --git a/src/Makefile.am b/src/Makefile.am
index bafcc22..5724b58 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ LDADD = -lutil -lcrypto -lrt -lm $(top_builddir)/protobufs/libmoshprotos.a
 
 bin_PROGRAMS = mosh-client mosh-server
 
-source = parser.cc parserstate.cc terminal.cc parseraction.cc terminalfunctions.cc swrite.cc terminalframebuffer.cc terminaldispatcher.cc terminaluserinput.cc terminaldisplay.cc network.cc ocb.cc base64.cc crypto.cc networktransport.cc transportfragment.cc user.cc completeterminal.cc transportsender.cc stmclient.cc terminaloverlay.cc
+source = ae.h base64.cc base64.h completeterminal.cc completeterminal.h crypto.cc crypto.h dos_assert.h network.cc network.h networktransport.cc networktransport.h ocb.cc parseraction.cc parseraction.h parser.cc parser.h parserstate.cc parserstatefamily.h parserstate.h parsertransition.h stmclient.cc stmclient.h swrite.cc swrite.h terminal.cc terminaldispatcher.cc terminaldispatcher.h terminaldisplay.cc terminaldisplay.h terminalframebuffer.cc terminalframebuffer.h terminalfunctions.cc terminal.h terminaloverlay.cc terminaloverlay.h terminaluserinput.cc terminaluserinput.h transportfragment.cc transportfragment.h transportsender.cc transportsender.h transportstate.h user.cc user.h
 
 mosh_client_SOURCES = mosh-client.cc $(source)