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 $(CRYPTO_CFLAGS)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/ $(CRYPTO_CFLAGS)
|
||||
AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS)
|
||||
|
||||
noinst_LIBRARIES = libmoshcrypto.a
|
||||
|
||||
@@ -33,8 +33,8 @@
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "fatal_assert.h"
|
||||
#include "base64.h"
|
||||
#include "src/util/fatal_assert.h"
|
||||
#include "src/crypto/base64.h"
|
||||
|
||||
static const char table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
#ifndef BYTEORDER_HPP
|
||||
#define BYTEORDER_HPP
|
||||
|
||||
#include "config.h"
|
||||
#include "src/include/config.h"
|
||||
|
||||
#if HAVE_DECL_BE64TOH || HAVE_DECL_BETOH64
|
||||
|
||||
|
||||
@@ -38,11 +38,11 @@
|
||||
#include <sys/resource.h>
|
||||
#include <fstream>
|
||||
|
||||
#include "byteorder.h"
|
||||
#include "crypto.h"
|
||||
#include "base64.h"
|
||||
#include "fatal_assert.h"
|
||||
#include "prng.h"
|
||||
#include "src/crypto/byteorder.h"
|
||||
#include "src/crypto/crypto.h"
|
||||
#include "src/crypto/base64.h"
|
||||
#include "src/util/fatal_assert.h"
|
||||
#include "src/crypto/prng.h"
|
||||
|
||||
using namespace Crypto;
|
||||
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@
|
||||
#ifndef CRYPTO_HPP
|
||||
#define CRYPTO_HPP
|
||||
|
||||
#include "ae.h"
|
||||
#include "src/crypto/ae.h"
|
||||
#include <string>
|
||||
#include <string.h>
|
||||
#include <stdint.h>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
/ Comments are welcome: Ted Krovetz <ted@krovetz.net> - Dedicated to Laurel K
|
||||
/------------------------------------------------------------------------- */
|
||||
|
||||
#include "config.h"
|
||||
#include "src/include/config.h"
|
||||
|
||||
/* This module implements the ae.h interface for OpenSSL, Apple Common
|
||||
/ Crypto, and Nettle. */
|
||||
@@ -84,9 +84,9 @@
|
||||
/* Includes and compiler specific definitions */
|
||||
/* ----------------------------------------------------------------------- */
|
||||
|
||||
#include "ae.h"
|
||||
#include "crypto.h"
|
||||
#include "fatal_assert.h"
|
||||
#include "src/crypto/ae.h"
|
||||
#include "src/crypto/crypto.h"
|
||||
#include "src/util/fatal_assert.h"
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#if defined(HAVE_STRINGS_H)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include "config.h"
|
||||
#include "ae.h"
|
||||
#include "src/include/config.h"
|
||||
#include "src/crypto/ae.h"
|
||||
|
||||
#include <cstring>
|
||||
#include <openssl/crypto.h>
|
||||
|
||||
+1
-1
@@ -37,7 +37,7 @@
|
||||
#include <stdint.h>
|
||||
#include <fstream>
|
||||
|
||||
#include "crypto.h"
|
||||
#include "src/crypto/crypto.h"
|
||||
|
||||
/* Read random bytes from /dev/urandom.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user