aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2014-03-29 18:34:38 +0100
committerAnders Svensson <[email protected]>2014-03-29 19:20:45 +0100
commit5ca206af45b3195233991dfe820e9fb636800a33 (patch)
treecad0095bc906fd4e7aa6272e98fd017a2b91469b
parentc23b242d0d634d10b03412c19768d381906578ab (diff)
downloadotp-5ca206af45b3195233991dfe820e9fb636800a33.tar.gz
otp-5ca206af45b3195233991dfe820e9fb636800a33.tar.bz2
otp-5ca206af45b3195233991dfe820e9fb636800a33.zip
Move info modules into own subdirectory
Possibly overkill for two modules but it mirrors their different treatment by the makefile.
-rw-r--r--lib/diameter/src/Makefile2
-rw-r--r--lib/diameter/src/info/diameter_dbg.erl (renamed from lib/diameter/src/base/diameter_dbg.erl)3
-rw-r--r--lib/diameter/src/info/diameter_info.erl (renamed from lib/diameter/src/base/diameter_info.erl)0
-rw-r--r--lib/diameter/src/modules.mk4
4 files changed, 4 insertions, 5 deletions
diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
index fa5f4c41ce..127406ae23 100644
--- a/lib/diameter/src/Makefile
+++ b/lib/diameter/src/Makefile
@@ -41,7 +41,7 @@ INCDIR = ../include
ABS_EBIN := $(shell cd $(EBIN) && pwd)
# Where make should look for dependencies.
-VPATH = .:base:compiler:transport:gen
+VPATH = .:base:compiler:transport:gen:info
# ----------------------------------------------------
# Target specs
diff --git a/lib/diameter/src/base/diameter_dbg.erl b/lib/diameter/src/info/diameter_dbg.erl
index 5edbabedeb..1237007a75 100644
--- a/lib/diameter/src/base/diameter_dbg.erl
+++ b/lib/diameter/src/info/diameter_dbg.erl
@@ -55,9 +55,8 @@
tp/1]).
-include_lib("diameter/include/diameter.hrl").
--include("diameter_internal.hrl").
-
+-define(APPLICATION, diameter).
-define(INFO, diameter_info).
-define(SEP(), ?INFO:sep()).
diff --git a/lib/diameter/src/base/diameter_info.erl b/lib/diameter/src/info/diameter_info.erl
index 10972f3231..10972f3231 100644
--- a/lib/diameter/src/base/diameter_info.erl
+++ b/lib/diameter/src/info/diameter_info.erl
diff --git a/lib/diameter/src/modules.mk b/lib/diameter/src/modules.mk
index 9f9b6d3308..a2a7a51892 100644
--- a/lib/diameter/src/modules.mk
+++ b/lib/diameter/src/modules.mk
@@ -73,8 +73,8 @@ CT_MODULES = \
# Info/debug modules, also not included in the app file.
INFO_MODULES = \
- base/diameter_dbg \
- base/diameter_info
+ info/diameter_dbg \
+ info/diameter_info
# Released hrl files in ../include intended for public consumption.
EXTERNAL_HRLS = \