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_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)
|
||||
|
||||
noinst_LIBRARIES = libmoshutil.a
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "crypto.h"
|
||||
#include "src/crypto/crypto.h"
|
||||
|
||||
static void dos_detected( const char *expression, const char *file, int line, const char *function )
|
||||
{
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
also delete it here.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "src/include/config.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
@@ -43,7 +43,7 @@
|
||||
#include <langinfo.h>
|
||||
#endif
|
||||
|
||||
#include "locale_utils.h"
|
||||
#include "src/util/locale_utils.h"
|
||||
|
||||
|
||||
const std::string LocaleVar::str( void ) const
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
also delete it here.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "src/include/config.h"
|
||||
|
||||
#if !defined(HAVE_FORKPTY) || !defined(HAVE_CFMAKERAW)
|
||||
#include <stdio.h>
|
||||
@@ -42,7 +42,7 @@
|
||||
#include <sys/stropts.h>
|
||||
#include <termios.h>
|
||||
|
||||
#include "pty_compat.h"
|
||||
#include "src/util/pty_compat.h"
|
||||
|
||||
#ifndef HAVE_FORKPTY
|
||||
pid_t my_forkpty( int *amaster, char *name,
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
#ifndef PTY_COMPAT_HPP
|
||||
#define PTY_COMPAT_HPP
|
||||
|
||||
#include "config.h"
|
||||
#include "src/include/config.h"
|
||||
|
||||
#ifndef HAVE_FORKPTY
|
||||
# define forkpty my_forkpty
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@
|
||||
also delete it here.
|
||||
*/
|
||||
|
||||
#include "select.h"
|
||||
#include "src/util/select.h"
|
||||
|
||||
fd_set Select::dummy_fd_set;
|
||||
|
||||
|
||||
+2
-2
@@ -39,8 +39,8 @@
|
||||
#include <sys/select.h>
|
||||
#include <assert.h>
|
||||
|
||||
#include "fatal_assert.h"
|
||||
#include "timestamp.h"
|
||||
#include "src/util/fatal_assert.h"
|
||||
#include "src/util/timestamp.h"
|
||||
|
||||
/* Convenience wrapper for pselect(2).
|
||||
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@
|
||||
#ifndef SHARED_HPP
|
||||
#define SHARED_HPP
|
||||
|
||||
#include "config.h"
|
||||
#include "src/include/config.h"
|
||||
|
||||
#ifdef HAVE_MEMORY
|
||||
#include <memory>
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "swrite.h"
|
||||
#include "src/util/swrite.h"
|
||||
|
||||
int swrite( int fd, const char *str, ssize_t len )
|
||||
{
|
||||
|
||||
@@ -30,9 +30,9 @@
|
||||
also delete it here.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "src/include/config.h"
|
||||
|
||||
#include "timestamp.h"
|
||||
#include "src/util/timestamp.h"
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user