From 3c06a9e977ddd8b25f44646c3d080b170a472367 Mon Sep 17 00:00:00 2001 From: Claes Wikstrom Date: Thu, 10 Oct 2002 14:30:16 +0000 Subject: [PATCH] rearr of includefiles git-svn-id: https://erlyaws.svn.sourceforge.net/svnroot/erlyaws/trunk/yaws@202 9fbdc01b-0d2c-0410-bfb7-fb27d70d8b52 --- {src => include}/yaws.hrl | 3 +-- src/yaws.erl | 8 +++++++- src/yaws_api.erl | 7 ++++++- src/yaws_compile.erl | 7 ++++++- src/yaws_config.erl | 10 +++++++++- src/yaws_debug.erl | 6 +++++- src/yaws_log.erl | 7 ++++++- src/yaws_ls.erl | 6 +++++- src/yaws_server.erl | 6 +++++- src/yaws_ssl.erl | 7 ++++++- 10 files changed, 56 insertions(+), 11 deletions(-) rename {src => include}/yaws.hrl (95%) diff --git a/src/yaws.hrl b/include/yaws.hrl similarity index 95% rename from src/yaws.hrl rename to include/yaws.hrl index 903bd9037..f315a3ed7 100644 --- a/src/yaws.hrl +++ b/include/yaws.hrl @@ -6,8 +6,7 @@ %%%---------------------------------------------------------------------- -author('klacke@hyber.org'). --include_lib("yaws/include/yaws_api.hrl"). --include("yaws_debug.hrl"). + %% global conf -record(gconf,{file, diff --git a/src/yaws.erl b/src/yaws.erl index 92526b6b4..fa7d7d9d8 100644 --- a/src/yaws.erl +++ b/src/yaws.erl @@ -7,7 +7,13 @@ -module(yaws). -author('klacke@bluetail.com'). --include ("yaws.hrl"). + +-include_lib("yaws/include/yaws.hrl"). +-include_lib("yaws/include/yaws_api.hrl"). +-include("yaws_debug.hrl"). + + + -include_lib("kernel/include/file.hrl"). -compile(export_all). diff --git a/src/yaws_api.erl b/src/yaws_api.erl index 0e321af79..68e28d08c 100644 --- a/src/yaws_api.erl +++ b/src/yaws_api.erl @@ -9,7 +9,12 @@ -author('klacke@hyber.org'). %% -compile(export_all). --include("yaws.hrl"). + + +-include_lib("yaws/include/yaws.hrl"). +-include_lib("yaws/include/yaws_api.hrl"). +-include("yaws_debug.hrl"). + -export([parse_post_data/1, parse_query/1, code_to_phrase/1, ssi/2, redirect/1]). diff --git a/src/yaws_compile.erl b/src/yaws_compile.erl index 82da052bb..bc3e846a8 100644 --- a/src/yaws_compile.erl +++ b/src/yaws_compile.erl @@ -9,7 +9,12 @@ -author('klacke@hyber.org'). -compile(export_all). --include("yaws.hrl"). + + + +-include_lib("yaws/include/yaws.hrl"). +-include_lib("yaws/include/yaws_api.hrl"). +-include("yaws_debug.hrl"). diff --git a/src/yaws_config.erl b/src/yaws_config.erl index 7c600a271..7aa5f1852 100644 --- a/src/yaws_config.erl +++ b/src/yaws_config.erl @@ -7,7 +7,15 @@ -module(yaws_config). -author('klacke@bluetail.com'). --include("yaws.hrl"). + + + + +-include_lib("yaws/include/yaws.hrl"). +-include_lib("yaws/include/yaws_api.hrl"). +-include("yaws_debug.hrl"). + + -include_lib("kernel/include/file.hrl"). -compile(export_all). diff --git a/src/yaws_debug.erl b/src/yaws_debug.erl index 0e489545c..bff3805fd 100644 --- a/src/yaws_debug.erl +++ b/src/yaws_debug.erl @@ -8,7 +8,11 @@ -module(yaws_debug). -author('klacke@hyber.org'). -compile(export_all). --include("yaws.hrl"). + + +-include_lib("yaws/include/yaws.hrl"). +-include_lib("yaws/include/yaws_api.hrl"). +-include("yaws_debug.hrl"). typecheck([{record, Rec, X} | Tail], File, Line) when atom(X), diff --git a/src/yaws_log.erl b/src/yaws_log.erl index aafeb8e7c..1fe9a013f 100644 --- a/src/yaws_log.erl +++ b/src/yaws_log.erl @@ -18,7 +18,12 @@ %% gen_server callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2]). --include("yaws.hrl"). + +-include_lib("yaws/include/yaws.hrl"). +-include_lib("yaws/include/yaws_api.hrl"). +-include("yaws_debug.hrl"). + + -record(state, { running, dir, diff --git a/src/yaws_ls.erl b/src/yaws_ls.erl index 41aa78ec8..cb1a8051e 100644 --- a/src/yaws_ls.erl +++ b/src/yaws_ls.erl @@ -9,7 +9,11 @@ -author('klacke@hyber.org'). -compile(export_all). --include("yaws.hrl"). + +-include_lib("yaws/include/yaws.hrl"). +-include_lib("yaws/include/yaws_api.hrl"). +-include("yaws_debug.hrl"). + -include_lib("kernel/include/file.hrl"). diff --git a/src/yaws_server.erl b/src/yaws_server.erl index 528ef9ab9..b53f079f6 100644 --- a/src/yaws_server.erl +++ b/src/yaws_server.erl @@ -12,7 +12,11 @@ %%-export([Function/Arity, ...]). -behaviour(gen_server). --include("yaws.hrl"). + +-include_lib("yaws/include/yaws.hrl"). +-include_lib("yaws/include/yaws_api.hrl"). +-include("yaws_debug.hrl"). + -include_lib("kernel/include/file.hrl"). %% External exports diff --git a/src/yaws_ssl.erl b/src/yaws_ssl.erl index b9ec1d47e..692b06f45 100644 --- a/src/yaws_ssl.erl +++ b/src/yaws_ssl.erl @@ -9,7 +9,12 @@ -author('klacke@hyber.org'). -compile(export_all). --include("yaws.hrl"). + + +-include_lib("yaws/include/yaws.hrl"). +-include_lib("yaws/include/yaws_api.hrl"). +-include("yaws_debug.hrl"). + -include_lib("kernel/include/file.hrl").