Switch to fully-qualified #include
Previously, mosh used extensive -I flags and all of the mosh-local makes it really hard to tell what the proper dependency graph is, so instead remove the -I arguments in favvor of $(top_srcdir) and qualify the paths wherever they are used.
This commit is contained in:
committed by
Alex Chernyakhovsky
parent
62869ae55f
commit
325098ac07
@@ -1,4 +1,4 @@
|
||||
AM_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../terminal -I../protobufs $(protobuf_CFLAGS)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/ $(protobuf_CFLAGS)
|
||||
AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS)
|
||||
|
||||
noinst_LIBRARIES = libmoshstatesync.a
|
||||
|
||||
@@ -30,10 +30,10 @@
|
||||
also delete it here.
|
||||
*/
|
||||
|
||||
#include "completeterminal.h"
|
||||
#include "fatal_assert.h"
|
||||
#include "src/statesync/completeterminal.h"
|
||||
#include "src/util/fatal_assert.h"
|
||||
|
||||
#include "hostinput.pb.h"
|
||||
#include "src/protobufs/hostinput.pb.h"
|
||||
|
||||
#include <limits.h>
|
||||
|
||||
|
||||
@@ -36,8 +36,8 @@
|
||||
#include <list>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "parser.h"
|
||||
#include "terminal.h"
|
||||
#include "src/terminal/parser.h"
|
||||
#include "src/terminal/terminal.h"
|
||||
|
||||
/* This class represents the complete terminal -- a UTF8Parser feeding Actions to an Emulator. */
|
||||
|
||||
|
||||
@@ -33,9 +33,9 @@
|
||||
#include <assert.h>
|
||||
#include <typeinfo>
|
||||
|
||||
#include "user.h"
|
||||
#include "fatal_assert.h"
|
||||
#include "userinput.pb.h"
|
||||
#include "src/statesync/user.h"
|
||||
#include "src/util/fatal_assert.h"
|
||||
#include "src/protobufs/userinput.pb.h"
|
||||
|
||||
using namespace Parser;
|
||||
using namespace Network;
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
#include <string>
|
||||
#include <assert.h>
|
||||
|
||||
#include "parseraction.h"
|
||||
#include "src/terminal/parseraction.h"
|
||||
|
||||
namespace Network {
|
||||
using std::deque;
|
||||
|
||||
Reference in New Issue
Block a user