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
@@ -7,7 +7,7 @@ EXTRA_DIST = \
|
||||
$(displaytests) \
|
||||
emulation-attributes.test
|
||||
|
||||
AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS)
|
||||
AM_CXXFLAGS = -I$(top_srcdir)/ $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS)
|
||||
AM_LDFLAGS = $(HARDEN_LDFLAGS) $(CODE_COVERAGE_LIBS)
|
||||
|
||||
displaytests = \
|
||||
|
||||
+4
-4
@@ -41,11 +41,11 @@
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "base64.h"
|
||||
#include "src/crypto/base64.h"
|
||||
#include "base64_vector.h"
|
||||
#include "crypto.h"
|
||||
#include "prng.h"
|
||||
#include "fatal_assert.h"
|
||||
#include "src/crypto/crypto.h"
|
||||
#include "src/crypto/prng.h"
|
||||
#include "src/util/fatal_assert.h"
|
||||
// #include "test_utils.h"
|
||||
|
||||
#define KEY_LEN 16
|
||||
|
||||
@@ -39,9 +39,9 @@
|
||||
#define __STDC_FORMAT_MACROS
|
||||
#include <inttypes.h>
|
||||
|
||||
#include "crypto.h"
|
||||
#include "prng.h"
|
||||
#include "fatal_assert.h"
|
||||
#include "src/crypto/crypto.h"
|
||||
#include "src/crypto/prng.h"
|
||||
#include "src/util/fatal_assert.h"
|
||||
#include "test_utils.h"
|
||||
|
||||
using namespace Crypto;
|
||||
|
||||
+3
-3
@@ -30,7 +30,7 @@
|
||||
also delete it here.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "src/include/config.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
@@ -52,8 +52,8 @@
|
||||
#include <libutil.h>
|
||||
#endif
|
||||
|
||||
#include "pty_compat.h"
|
||||
#include "swrite.h"
|
||||
#include "src/util/pty_compat.h"
|
||||
#include "src/util/swrite.h"
|
||||
|
||||
int main( int argc, char *argv[] )
|
||||
{
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "locale_utils.h"
|
||||
#include "src/util/locale_utils.h"
|
||||
|
||||
int main( int argc __attribute__(( unused )), char **argv __attribute__(( unused )))
|
||||
{
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
#include <cstdlib>
|
||||
#include <set>
|
||||
|
||||
#include "network.h"
|
||||
#include "src/network/network.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
|
||||
@@ -41,12 +41,12 @@
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "ae.h"
|
||||
#include "crypto.h"
|
||||
#include "prng.h"
|
||||
#include "fatal_assert.h"
|
||||
#include "src/crypto/ae.h"
|
||||
#include "src/crypto/crypto.h"
|
||||
#include "src/crypto/prng.h"
|
||||
#include "src/util/fatal_assert.h"
|
||||
#include "test_utils.h"
|
||||
#include "shared.h"
|
||||
#include "src/util/shared.h"
|
||||
|
||||
#define KEY_LEN 16
|
||||
#define NONCE_LEN 12
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "crypto.h"
|
||||
#include "src/crypto/crypto.h"
|
||||
|
||||
#define DUMP_NAME_FMT "%-10s "
|
||||
|
||||
|
||||
Reference in New Issue
Block a user