Fix includes not to rely on $(top_srcdir) being in the include path.

This commit is contained in:
Pavel Roskin 2003-10-29 08:54:22 +00:00
parent e7663c1086
commit 8bc40b44f0
13 changed files with 43 additions and 44 deletions

View File

@ -1,7 +1,7 @@
#ifndef __EDIT_WIDGET_H #ifndef __EDIT_WIDGET_H
#define __EDIT_WIDGET_H #define __EDIT_WIDGET_H
#include "src/dialog.h" /* Widget */ #include "../src/dialog.h" /* Widget */
#define MAX_MACRO_LENGTH 1024 #define MAX_MACRO_LENGTH 1024
#define N_LINE_CACHES 32 #define N_LINE_CACHES 32

View File

@ -26,9 +26,9 @@
#include "edit-widget.h" #include "edit-widget.h"
#include "editcmddef.h" #include "editcmddef.h"
#include "src/cmd.h" /* view_other_cmd() */ #include "../src/cmd.h" /* view_other_cmd() */
#include "src/user.h" /* user_menu_cmd() */ #include "../src/user.h" /* user_menu_cmd() */
#include "src/wtools.h" /* query_dialog() */ #include "../src/wtools.h" /* query_dialog() */
/* /*
what editor are we going to emulate? one of EDIT_KEY_EMULATION_NORMAL what editor are we going to emulate? one of EDIT_KEY_EMULATION_NORMAL

View File

@ -37,7 +37,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "src/global.h" #include "../src/global.h"
#define N_menus 5 #define N_menus 5

View File

@ -31,16 +31,16 @@
#include "editcmddef.h" #include "editcmddef.h"
#include "edit-widget.h" #include "edit-widget.h"
#include "src/color.h" /* dialog_colors */ #include "../src/color.h" /* dialog_colors */
#include "src/tty.h" /* LINES */ #include "../src/tty.h" /* LINES */
#include "src/widget.h" /* listbox_new() */ #include "../src/widget.h" /* listbox_new() */
#include "src/layout.h" /* clr_scr() */ #include "../src/layout.h" /* clr_scr() */
#include "src/main.h" /* mc_home */ #include "../src/main.h" /* mc_home */
#include "src/help.h" /* interactive_display() */ #include "../src/help.h" /* interactive_display() */
#include "src/key.h" /* XCTRL */ #include "../src/key.h" /* XCTRL */
#include "src/dialog.h" /* do_refresh() */ #include "../src/dialog.h" /* do_refresh() */
#include "src/wtools.h" /* message() */ #include "../src/wtools.h" /* message() */
#include "src/charsets.h" #include "../src/charsets.h"
#define edit_get_load_file(f,h) input_dialog (h, _(" Enter file name: "), f) #define edit_get_load_file(f,h) input_dialog (h, _(" Enter file name: "), f)
#define edit_get_save_file(f,h) input_dialog (h, _(" Enter file name: "), f) #define edit_get_save_file(f,h) input_dialog (h, _(" Enter file name: "), f)

View File

@ -26,12 +26,11 @@
#define MAX_LINE_LEN 1024 #define MAX_LINE_LEN 1024
#include "src/color.h" /* EDITOR_NORMAL_COLOR */ #include "../src/color.h" /* EDITOR_NORMAL_COLOR */
#include "src/tty.h" /* attrset() */ #include "../src/tty.h" /* attrset() */
#include "src/widget.h" /* redraw_labels() */ #include "../src/widget.h" /* redraw_labels() */
#include "src/key.h" /* is_idle() */ #include "../src/key.h" /* is_idle() */
#include "../src/charsets.h"
#include "src/charsets.h"
/* Text styles */ /* Text styles */
#define MOD_ABNORMAL (1 << 8) #define MOD_ABNORMAL (1 << 8)

View File

@ -24,10 +24,10 @@
#include "edit.h" #include "edit.h"
#include "edit-widget.h" /* edit->macro_i */ #include "edit-widget.h" /* edit->macro_i */
#include "editcmddef.h" /* list of commands */ #include "editcmddef.h" /* list of commands */
#include "src/key.h" /* KEY_M_SHIFT */ #include "../src/key.h" /* KEY_M_SHIFT */
#include "src/tty.h" /* keys */ #include "../src/tty.h" /* keys */
#include "src/charsets.h" /* convert_from_input_c() */ #include "../src/charsets.h" /* convert_from_input_c() */
#include "src/selcodepage.h" /* do_select_codepage() */ #include "../src/selcodepage.h" /* do_select_codepage() */
/* /*
* Ordinary translations. Note that the keys listed first take priority * Ordinary translations. Note that the keys listed first take priority

View File

@ -25,7 +25,7 @@
#include "edit.h" #include "edit.h"
#include "editlock.h" #include "editlock.h"
#include "src/wtools.h" /* edit_query_dialog () */ #include "../src/wtools.h" /* edit_query_dialog () */
#define BUF_SIZE 255 #define BUF_SIZE 255
#define PID_BUF_SIZE 10 #define PID_BUF_SIZE 10

View File

@ -23,12 +23,12 @@
#include <config.h> #include <config.h>
#include "edit.h" #include "edit.h"
#include "src/wtools.h" /* query_dialog() */ #include "../src/wtools.h" /* query_dialog() */
#include "src/menu.h" /* menu_entry */ #include "../src/menu.h" /* menu_entry */
#include "src/tty.h" /* KEY_F */ #include "../src/tty.h" /* KEY_F */
#include "src/key.h" /* XCTRL */ #include "../src/key.h" /* XCTRL */
#include "src/main.h" /* drop_menus */ #include "../src/main.h" /* drop_menus */
#include "src/learn.h" /* learn_keys */ #include "../src/learn.h" /* learn_keys */
#include "edit-widget.h" #include "edit-widget.h"
#include "editcmddef.h" #include "editcmddef.h"

View File

@ -22,8 +22,8 @@
#include <config.h> #include <config.h>
#include "edit.h" #include "edit.h"
#include "src/dialog.h" /* B_CANCEL */ #include "../src/dialog.h" /* B_CANCEL */
#include "src/wtools.h" /* QuickDialog */ #include "../src/wtools.h" /* QuickDialog */
#define OPT_DLG_H 17 #define OPT_DLG_H 17
#define OPT_DLG_W 72 #define OPT_DLG_W 72

View File

@ -24,10 +24,10 @@
#include "edit.h" #include "edit.h"
#include "edit-widget.h" #include "edit-widget.h"
#include "src/tty.h" /* LINES */ #include "../src/tty.h" /* LINES */
#include "src/widget.h" /* redraw_labels() */ #include "../src/widget.h" /* redraw_labels() */
#include "src/menu.h" /* menubar_new() */ #include "../src/menu.h" /* menubar_new() */
#include "src/key.h" /* is_idle() */ #include "../src/key.h" /* is_idle() */
WEdit *wedit; WEdit *wedit;
struct WMenu *edit_menubar; struct WMenu *edit_menubar;

View File

@ -23,9 +23,9 @@
#include <config.h> #include <config.h>
#include "edit.h" #include "edit.h"
#include "edit-widget.h" #include "edit-widget.h"
#include "src/color.h" /* use_colors */ #include "../src/color.h" /* use_colors */
#include "src/main.h" /* mc_home */ #include "../src/main.h" /* mc_home */
#include "src/wtools.h" /* message() */ #include "../src/wtools.h" /* message() */
/* bytes */ /* bytes */
#define SYNTAX_MARKER_DENSITY 512 #define SYNTAX_MARKER_DENSITY 512

View File

@ -8,7 +8,7 @@
# include <slang.h> # include <slang.h>
#endif #endif
#else /* !HAVE_SYSTEM_SLANG */ #else /* !HAVE_SYSTEM_SLANG */
# include "slang/include/slang.h" # include "../slang/include/slang.h"
#endif /* !HAVE_SYSTEM_SLANG */ #endif /* !HAVE_SYSTEM_SLANG */
enum { enum {

View File

@ -33,8 +33,8 @@
#include "execute.h" #include "execute.h"
#include "setup.h" #include "setup.h"
#include "edit/edit.h" /* BLOCK_FILE */ #include "../edit/edit.h" /* BLOCK_FILE */
#include "edit/edit-widget.h" /* WEdit */ #include "../edit/edit-widget.h" /* WEdit */
/* For the simple listbox manager */ /* For the simple listbox manager */
#include "dialog.h" #include "dialog.h"