committed by
Keith Winstein
parent
f7be5c8cec
commit
dd941df19d
@@ -1,13 +1,7 @@
|
||||
# This must be set in Makefile.am for dependency tracking to work.
|
||||
if COND_THIRD_LIBSTDDJB
|
||||
STDDJB_LDFLAGS += $(top_builddir)/third/libstddjb/libstddjb.a
|
||||
STDDJB_CPPFLAGS += -I$(top_srcdir)/third/libstddjb
|
||||
endif
|
||||
|
||||
AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(STDDJB_CPPFLAGS) $(TINFO_CFLAGS) $(protobuf_CFLAGS)
|
||||
AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(TINFO_CFLAGS) $(protobuf_CFLAGS)
|
||||
AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS)
|
||||
AM_LDFLAGS = $(HARDEN_LDFLAGS)
|
||||
LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a $(STDDJB_LDFLAGS) -lm $(TINFO_LIBS) $(protobuf_LIBS)
|
||||
LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lm $(TINFO_LIBS) $(protobuf_LIBS)
|
||||
|
||||
mosh_server_LDADD = $(LDADD) -lutil
|
||||
|
||||
|
||||
@@ -30,11 +30,6 @@
|
||||
#include <curses.h>
|
||||
#include <term.h>
|
||||
|
||||
/* For newer skalibs */
|
||||
extern "C" {
|
||||
const char *PROG = "mosh-client";
|
||||
}
|
||||
|
||||
void usage( const char *argv0 ) {
|
||||
fprintf( stderr, "mosh-client (%s)\n", PACKAGE_STRING );
|
||||
fprintf( stderr, "Copyright 2012 Keith Winstein <mosh-devel@mit.edu>\n" );
|
||||
|
||||
@@ -67,11 +67,6 @@
|
||||
|
||||
#include "networktransport.cc"
|
||||
|
||||
/* For newer skalibs */
|
||||
extern "C" {
|
||||
const char *PROG = "mosh-server";
|
||||
}
|
||||
|
||||
typedef Network::Transport< Terminal::Complete, Network::UserStream > ServerConnection;
|
||||
|
||||
void serve( int host_fd,
|
||||
|
||||
Reference in New Issue
Block a user