Separate modules by subdirectory

2012-02-06 18:26:45 -05:00
parent 7e56af8fcd
commit 38c9e99882
58 changed files with 79 additions and 16 deletions
@@ -4,9 +4,9 @@
 AC_PREREQ([2.68])
 AC_INIT(mosh, 0.9, mosh-devel@mit.edu)
 AM_INIT_AUTOMAKE(mosh, 0.9)
-AC_CONFIG_SRCDIR([src/transportfragment.h])
+AC_CONFIG_SRCDIR([src/frontend/mosh-client.cc])
 AC_CONFIG_HEADERS([config.h])
-AC_OUTPUT(Makefile src/Makefile src/protobufs/Makefile scripts/Makefile)
+AC_OUTPUT(Makefile src/Makefile src/crypto/Makefile src/frontend/Makefile src/network/Makefile src/protobufs/Makefile src/statesync/Makefile src/terminal/Makefile src/util/Makefile scripts/Makefile)
 # Checks for programs.
 AC_PROG_CXX
@@ -0,0 +1,38 @@
 <TITLE>OCB - An Authenticated-Encryption Scheme - GPL Patent Grant - Rogaway</TITLE>
 <body bgcolor="#FFFFFF">
 <H2><a name="ocb-grant"> <font face="Arial, Helvetica, sans-serif" size="6" color="#FF0000">OCB: 
  Patent Grant for GNU GPL</font> </a> </H2>
 Whereas I, Phillip Rogaway (hereinafter "Inventor") have sought 
 patent protection for certain technology 
 (hereinafter "Patented Technology"), 
 and Inventor wishes to aid the Free Software Foundation in achieving its goals, 
 and Inventor wishes to increase public awareness of Patented Technology, 
 Inventor hereby grants a fully paid-up, nonexclusive, 
 royalty-free license to 
 practice any patents claiming priority to the 
 patent applications below ("the Patents") 
 if practiced by
 software distributed 
 under the terms of any version of 
 the GNU General Public License as published by the Free Software Foundation, 
 59 Temple Place, Suite 330, Boston, MA 02111. 
 Inventor reserves all other rights, including without limitation
 licensing for software not distributed under the GNU General Public License. 
 <h4>The patents:</h4>
 <ul>
 <li> <a href="http://appft1.uspto.gov/netacgi/nph-Parser?Sect1=PTO2&Sect2=HITOFF&p=1&u=%2Fnetahtml%2FPTO%2Fsearch-bool.html&r=2&f=G&l=50&co1=AND&d=PG01&s1=rogaway.IN.&OS=IN/rogaway&RS=IN/rogaway">
 09/918,615</a>  -
 Method and Apparatus for Facilitating Efficient Authenticated Encryption.
 <li> <a href="http://appft1.uspto.gov/netacgi/nph-Parser?Sect1=PTO2&Sect2=HITOFF&p=1&u=%2Fnetahtml%2FPTO%2Fsearch-bool.html&r=3&f=G&l=50&co1=AND&d=PG01&s1=rogaway.IN.&OS=IN/rogaway&RS=IN/rogaway">
 09/948,084</a> - 
 Method and Apparatus for Realizing a Parallelizable Variable-Input-Length 
 Pseudorandom Function. 
 </ul>
@@ -1,14 +1 @@
-SUBDIRS = protobufs .
+SUBDIRS = protobufs util crypto terminal network statesync frontend
 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 protobufs/libmoshprotos.a
 bin_PROGRAMS = mosh-client mosh-server
 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 rijndael-alg-fst.cc rijndael-alg-fst.h
 mosh_client_SOURCES = mosh-client.cc $(source)
 mosh_server_SOURCES = mosh-server.cc $(source)
@@ -0,0 +1,5 @@
 AM_CXXFLAGS = --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
 noinst_LIBRARIES = libmoshcrypto.a
 libmoshcrypto_a_SOURCES = ae.h base64.cc base64.h crypto.cc crypto.h ocb.cc rijndael-alg-fst.cc rijndael-alg-fst.h
@@ -0,0 +1,9 @@
 AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I$(builddir)/../protobufs -I$(srcdir)/../util
 AM_CXXFLAGS = --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
 LIBS = `pkg-config --libs protobuf-lite`
 LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lutil -lrt -lm
 bin_PROGRAMS = mosh-client mosh-server
 mosh_client_SOURCES = mosh-client.cc stmclient.cc stmclient.h terminaloverlay.cc terminaloverlay.h
 mosh_server_SOURCES = mosh-server.cc
@@ -0,0 +1,6 @@
 AM_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../crypto -I$(builddir)/../protobufs
 AM_CXXFLAGS = --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
 noinst_LIBRARIES = libmoshnetwork.a
 libmoshnetwork_a_SOURCES = network.cc network.h networktransport.cc networktransport.h transportfragment.cc transportfragment.h transportsender.cc transportsender.h transportstate.h
@@ -0,0 +1,6 @@
 AM_CPPFLAGS = -I$(srcdir)/../terminal -I$(builddir)/../protobufs
 AM_CXXFLAGS = --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
 noinst_LIBRARIES = libmoshstatesync.a
 libmoshstatesync_a_SOURCES = completeterminal.cc completeterminal.h user.cc user.h
@@ -0,0 +1,7 @@
 AM_CPPFLAGS = -I$(srcdir)/../util
 AM_CXXFLAGS = --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
 noinst_LIBRARIES = libmoshterminal.a
 libmoshterminal_a_SOURCES = parseraction.cc parseraction.h parser.cc parser.h parserstate.cc parserstatefamily.h parserstate.h parsertransition.h terminal.cc terminaldispatcher.cc terminaldispatcher.h terminaldisplay.cc terminaldisplay.h terminalframebuffer.cc terminalframebuffer.h terminalfunctions.cc terminal.h terminaluserinput.cc terminaluserinput.h
@@ -0,0 +1,5 @@
 AM_CXXFLAGS = --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
 noinst_LIBRARIES = libmoshutil.a
 libmoshutil_a_SOURCES = swrite.cc swrite.h dos_assert.h