Skip to content

Use -include_lib() instead of -include("../include/...") #10244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use -include_lib() instead of -include("../include/...") #10244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/edoc/src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ RELSYSDIR = $(RELEASE_PATH)/lib/edoc-$(VSN)

EBIN = ../ebin
XMERL = ../../xmerl
ERL_COMPILE_FLAGS += -pa $(XMERL) -I../include -I$(XMERL)/include +warn_unused_vars +warn_unused_import +warn_deprecated_guard +no_docs +nowarn_missing_spec_documented +warn_deprecated_catch -Werror
ERL_COMPILE_FLAGS += -pa $(XMERL) -I../include -I$(XMERL)/include -I${ERL_TOP}/lib
ERL_COMPILE_FLAGS += +warn_unused_vars +warn_unused_import +warn_deprecated_guard +no_docs +nowarn_missing_spec_documented +warn_deprecated_catch -Werror

include files.mk

Expand Down
2 changes: 1 addition & 1 deletion lib/edoc/src/edoc_doclet.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
-import(edoc_report, [report/2, warning/2]).

%% @headerfile "../include/edoc_doclet.hrl"
-include("../include/edoc_doclet.hrl").
-include_lib("edoc/include/edoc_doclet.hrl").

-define(EDOC_APP, edoc).
-define(DEFAULT_FILE_SUFFIX, ".html").
Expand Down
2 changes: 1 addition & 1 deletion lib/edoc/src/edoc_doclet_chunks.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
-import(edoc_report, [report/2]).

%% @headerfile "../include/edoc_doclet.hrl"
-include("../include/edoc_doclet.hrl").
-include_lib("edoc/include/edoc_doclet.hrl").

-define(DEFAULT_FILE_SUFFIX, ".chunk").
-define(CHUNKS_DIR, "chunks").
Expand Down
2 changes: 1 addition & 1 deletion lib/edoc/src/edoc_doclet_markdown.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
-export([run/2]).

%% @headerfile "../include/edoc_doclet.hrl"
-include("../include/edoc_doclet.hrl").
-include_lib("edoc/include/edoc_doclet.hrl").

-include_lib("xmerl/include/xmerl.hrl").
-include_lib("kernel/include/eep48.hrl").
Expand Down
2 changes: 1 addition & 1 deletion lib/et/src/et_collector.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Interface module for the Event Trace (ET) application
-compile([{nowarn_deprecated_function,[{erlang,now,0}]}]).

-include("et_internal.hrl").
-include("../include/et.hrl").
-include_lib("et/include/et.hrl").

-record(state, {parent_pid,
auto_shutdown, % Optionally shutdown when the last subscriber dies
Expand Down
2 changes: 1 addition & 1 deletion lib/et/src/et_selector.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

-compile([{nowarn_deprecated_function,[{erlang,now,0}]}]).

-include("../include/et.hrl").
-include_lib("et/include/et.hrl").

-type event() :: #event{}.

Expand Down
2 changes: 1 addition & 1 deletion lib/et/src/et_viewer.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
stop/1,
get_collector_pid/1]).

-include("../include/et.hrl").
-include_lib("et/include/et.hrl").
-include("et_internal.hrl").

-define(unknown, "UNKNOWN").
Expand Down
2 changes: 1 addition & 1 deletion lib/et/src/et_wx_contents_viewer.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
handle_call/3, handle_cast/2, handle_info/2,
handle_event/2]).

-include("../include/et.hrl").
-include_lib("et/include/et.hrl").
-include("et_internal.hrl").
-include_lib("wx/include/wx.hrl").

Expand Down
2 changes: 1 addition & 1 deletion lib/et/src/et_wx_viewer.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
-export([init/1, terminate/2, code_change/3,
handle_call/3, handle_cast/2, handle_info/2]).

-include("../include/et.hrl").
-include_lib("et/include/et.hrl").
-include("et_internal.hrl").
-include_lib("wx/include/wx.hrl").

Expand Down
2 changes: 1 addition & 1 deletion lib/kernel/src/auth.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Manual.
}).
-type state() :: #state{}.

-include("../include/file.hrl").
-include_lib("kernel/include/file.hrl").

%%----------------------------------------------------------------------
%% Exported functions
Expand Down
2 changes: 1 addition & 1 deletion lib/stdlib/src/erl_bits.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
set_bit_type/2,
as_list/1]).

-include("../include/erl_bits.hrl").
-include_lib("stdlib/include/erl_bits.hrl").

%% Dummies.

Expand Down
2 changes: 1 addition & 1 deletion lib/wx/api_gen/wx_extra/wxEvtHandler.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ wxWidgets docs:
[wxEvtHandler](https://docs.wxwidgets.org/3.2/classwx_evt_handler.html)
""".
-include("wxe.hrl").
-include("../include/wx.hrl").
-include_lib("wx/include/wx.hrl").

%% API
-export([connect/2, connect/3, disconnect/1, disconnect/2, disconnect/3]).
Expand Down
2 changes: 1 addition & 1 deletion lib/wx/src/gen/wxEvtHandler.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ wxWidgets docs:
[wxEvtHandler](https://docs.wxwidgets.org/3.2/classwx_evt_handler.html)
""".
-include("wxe.hrl").
-include("../include/wx.hrl").
-include_lib("wx/include/wx.hrl").

%% API
-export([connect/2, connect/3, disconnect/1, disconnect/2, disconnect/3]).
Expand Down
2 changes: 1 addition & 1 deletion lib/wx/src/wx.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ Global (classless) functions are located in the wx_misc module.
wx_enum/0, wx_wxMouseState/0, wx_wxHtmlLinkInfo/0]).

-include("wxe.hrl").
-include("../include/wx.hrl").
-include_lib("wx/include/wx.hrl").

-type wx_object() :: #wx_ref{}. %% Opaque object reference
-type wx_env() :: #wx_env{}. %% Opaque process environment
Expand Down
2 changes: 1 addition & 1 deletion lib/wx/src/wx_object.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ Example:
[wx:wx_object()](`m:wx#type-wx_object`) | atom() | pid()**
""".
-include("wxe.hrl").
-include("../include/wx.hrl").
-include_lib("wx/include/wx.hrl").

%% API
-export([start/3, start/4,
Expand Down
2 changes: 1 addition & 1 deletion lib/wx/src/wxe_server.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
-define(log(S,A), log(?MODULE_STRING,?LINE,S,A)).

-include("wxe.hrl").
-include("../include/wx.hrl").
-include_lib("wx/include/wx.hrl").

%%====================================================================
%% API
Expand Down
Loading