izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make examples compileable

Browse Source
This commit is contained in:
Keith Winstein
2012-02-06 19:20:44 -05:00
parent 27eed9fdb7
commit a164a84496
8 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+1 -1
View File
@@ -6,7 +6,7 @@ AC_INIT(mosh, 0.9, mosh-devel@mit.edu)
AM_INIT_AUTOMAKE(mosh, 0.9) AM_INIT_AUTOMAKE(mosh, 0.9)
AC_CONFIG_SRCDIR([src/frontend/mosh-client.cc]) AC_CONFIG_SRCDIR([src/frontend/mosh-client.cc])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
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) 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 src/examples/Makefile)
# Checks for programs. # Checks for programs.
AC_PROG_CXX AC_PROG_CXX
src/Makefile.am
+1 -1
View File
@@ -1 +1 @@
SUBDIRS = protobufs util crypto terminal network statesync frontend SUBDIRS = protobufs util crypto terminal network statesync frontend examples
src/examples/Makefile.am
+25
View File
@@ -0,0 +1,25 @@
AM_CXXFLAGS = --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
noinst_PROGRAMS = encrypt decrypt ntester parse termemu
LIBS = `pkg-config --libs protobuf-lite`
encrypt_SOURCES = encrypt.cc
encrypt_CPPFLAGS = -I$(srcdir)/../crypto
encrypt_LDADD = ../crypto/libmoshcrypto.a
decrypt_SOURCES = decrypt.cc
decrypt_CPPFLAGS = -I$(srcdir)/../crypto
decrypt_LDADD = ../crypto/libmoshcrypto.a
parse_SOURCES = parse.cc
parse_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util
parse_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a -lutil
termemu_SOURCES = termemu.cc
termemu_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util -I$(srcdir)/../statesync -I$(builddir)/../protobufs
termemu_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a ../statesync/libmoshstatesync.a ../protobufs/libmoshprotos.a -lutil
ntester_SOURCES = ntester.cc
ntester_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I$(builddir)/../protobufs
ntester_LDADD = ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../protobufs/libmoshprotos.a -lutil -lrt -lm
examples/decrypt.cpp → src/examples/decrypt.cc
+1 -1
View File
@@ -6,7 +6,7 @@
#include <unistd.h> #include <unistd.h>
#include <iostream> #include <iostream>
#include "crypto.hpp" #include "crypto.h"
using namespace Crypto; using namespace Crypto;
examples/encrypt.cpp → src/examples/encrypt.cc
+1 -1
View File
@@ -6,7 +6,7 @@
#include <unistd.h> #include <unistd.h>
#include <iostream> #include <iostream>
#include "crypto.hpp" #include "crypto.h"
using namespace Crypto; using namespace Crypto;
examples/ntester.cpp → src/examples/ntester.cc
+2 -2
View File
@@ -2,8 +2,8 @@
#include <unistd.h> #include <unistd.h>
#include <poll.h> #include <poll.h>
#include "user.hpp" #include "user.h"
#include "networktransport.cpp" #include "networktransport.cc"
using namespace Network; using namespace Network;
examples/parse.cpp → src/examples/parse.cc
+2 -2
View File
@@ -14,8 +14,8 @@
#include <iostream> #include <iostream>
#include <typeinfo> #include <typeinfo>
#include "parser.hpp" #include "parser.h"
#include "swrite.hpp" #include "swrite.h"
const size_t buf_size = 1024; const size_t buf_size = 1024;
examples/termemu.cpp → src/examples/termemu.cc
+3 -3
View File
@@ -21,9 +21,9 @@
#include <pwd.h> #include <pwd.h>
#include <sys/time.h> #include <sys/time.h>
#include "parser.hpp" #include "parser.h"
#include "completeterminal.hpp" #include "completeterminal.h"
#include "swrite.hpp" #include "swrite.h"
const size_t buf_size = 16384; const size_t buf_size = 16384;