Permalink
Browse files

Separate modules by subdirectory

  • Loading branch information...
1 parent 7e56af8 commit 38c9e99882d236abf1b2ea98ae4787ab87735aee @keithw keithw committed Feb 6, 2012
Showing with 79 additions and 16 deletions.
  1. +2 −2 configure.ac
  2. +38 −0 ocb-license.html
  3. +1 −14 src/Makefile.am
  4. +5 −0 src/crypto/Makefile.am
  5. 0 src/{ → crypto}/ae.h
  6. 0 src/{ → crypto}/base64.cc
  7. 0 src/{ → crypto}/base64.h
  8. 0 src/{ → crypto}/crypto.cc
  9. 0 src/{ → crypto}/crypto.h
  10. 0 src/{ → crypto}/ocb.cc
  11. 0 src/{ → crypto}/rijndael-alg-fst.cc
  12. 0 src/{ → crypto}/rijndael-alg-fst.h
  13. +9 −0 src/frontend/Makefile.am
  14. 0 src/{ → frontend}/mosh-client.cc
  15. 0 src/{ → frontend}/mosh-server.cc
  16. 0 src/{ → frontend}/stmclient.cc
  17. 0 src/{ → frontend}/stmclient.h
  18. 0 src/{ → frontend}/terminaloverlay.cc
  19. 0 src/{ → frontend}/terminaloverlay.h
  20. +6 −0 src/network/Makefile.am
  21. 0 src/{ → network}/network.cc
  22. 0 src/{ → network}/network.h
  23. 0 src/{ → network}/networktransport.cc
  24. 0 src/{ → network}/networktransport.h
  25. 0 src/{ → network}/transportfragment.cc
  26. 0 src/{ → network}/transportfragment.h
  27. 0 src/{ → network}/transportsender.cc
  28. 0 src/{ → network}/transportsender.h
  29. 0 src/{ → network}/transportstate.h
  30. +6 −0 src/statesync/Makefile.am
  31. 0 src/{ → statesync}/completeterminal.cc
  32. 0 src/{ → statesync}/completeterminal.h
  33. 0 src/{ → statesync}/user.cc
  34. 0 src/{ → statesync}/user.h
  35. +7 −0 src/terminal/Makefile.am
  36. 0 src/{ → terminal}/parser.cc
  37. 0 src/{ → terminal}/parser.h
  38. 0 src/{ → terminal}/parseraction.cc
  39. 0 src/{ → terminal}/parseraction.h
  40. 0 src/{ → terminal}/parserstate.cc
  41. 0 src/{ → terminal}/parserstate.h
  42. 0 src/{ → terminal}/parserstatefamily.h
  43. 0 src/{ → terminal}/parsertransition.h
  44. 0 src/{ → terminal}/terminal.cc
  45. 0 src/{ → terminal}/terminal.h
  46. 0 src/{ → terminal}/terminaldispatcher.cc
  47. 0 src/{ → terminal}/terminaldispatcher.h
  48. 0 src/{ → terminal}/terminaldisplay.cc
  49. 0 src/{ → terminal}/terminaldisplay.h
  50. 0 src/{ → terminal}/terminalframebuffer.cc
  51. 0 src/{ → terminal}/terminalframebuffer.h
  52. 0 src/{ → terminal}/terminalfunctions.cc
  53. 0 src/{ → terminal}/terminaluserinput.cc
  54. 0 src/{ → terminal}/terminaluserinput.h
  55. +5 −0 src/util/Makefile.am
  56. 0 src/{ → util}/dos_assert.h
  57. 0 src/{ → util}/swrite.cc
  58. 0 src/{ → util}/swrite.h
View
@@ -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
View
@@ -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>
+
+
View
@@ -1,14 +1 @@
-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 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)
+SUBDIRS = protobufs util crypto terminal network statesync frontend
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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
+
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 38c9e99

Please sign in to comment.