Move dictionaries into own directory and rename

Generated files are unchanged but the separation will be
especially pleasant when more dictionary files are added
as examples. It is still only the rfc3588 and relay
dictionaries that are known to the diameter implementation.

5 files changed, 35 insertions, 35 deletions

diff --git a/lib/diameter/src/app/Makefile b/lib/diameter/src/app/Makefile
index 96b7736a90..9042bff407 100644
--- a/lib/diameter/src/app/Makefile
+++ b/lib/diameter/src/app/Makefile
@@ -28,8 +28,6 @@ EBIN = ../../ebin
 include $(DIAMETER_TOP)/make/$(TARGET)/rules.mk
 endif
 
-
-
 # ----------------------------------------------------
 # Application version
 # ----------------------------------------------------
@@ -52,19 +50,10 @@ INCDIR = ../../include
 
 include modules.mk
 
-diameter_gen_base_accounting.erl: \
-	$(EBIN)/diameter_gen_base_rfc3588.beam
-diameter_gen_relay.erl: \
-	$(EBIN)/diameter_gen_base_rfc3588.beam
-
-SPEC_MODULES = \
-	$(SPEC_FILES:%.dia=%)
-
-SPEC_ERL_FILES = \
-	$(SPEC_FILES:%.dia=%.erl)
-
-SPEC_HRL_FILES = \
-	$(SPEC_FILES:%.dia=%.hrl)
+DICT_FILES     = $(DICTIONARIES:%=../dict/%.dia)
+DICT_MODULES   = $(DICTIONARIES:%=diameter_gen_%)
+DICT_ERL_FILES = $(DICT_MODULES:%=%.erl)
+DICT_HRL_FILES = $(DICT_MODULES:%=%.hrl)
 
 MODULES = \
 	$(RUNTIME_MODULES) \
@@ -72,7 +61,7 @@ MODULES = \
 
 APP_MODULES = \
 	$(RUNTIME_MODULES) \
-	$(SPEC_MODULES)
+	$(DICT_MODULES)
 
 TARGET_MODULES = \
 	$(APP_MODULES) \
@@ -118,7 +107,7 @@ debug:
 opt: $(TARGET_FILES)
 
 clean:
-	rm -f $(TARGET_FILES) $(SPEC_ERL_FILES) $(SPEC_HRL_FILES)
+	rm -f $(TARGET_FILES) $(DICT_ERL_FILES) $(DICT_HRL_FILES)
 	rm -f $(APP_TARGET) $(APPUP_TARGET)
 	rm -f errs core *~ diameter_gen_*.forms diameter_gen_*.spec
 	rm -f depend.mk
@@ -127,8 +116,8 @@ docs:
 
 info:
 	@echo ""
-	@echo "SPEC_FILES = $(FILES)"
-	@echo "MODULES    = $(MODULES)"
+	@echo "DICTIONARIES = $(DICTIONARIES)"
+	@echo "MODULES      = $(MODULES)"
 	@echo ""
 	@echo "EXTERNAL_HRL_FILES = $(EXTERNAL_HRL_FILES)"
 	@echo "INTERNAL_HRL_FILES = $(INTERNAL_HRL_FILES)"
@@ -140,6 +129,10 @@ info:
 # Special Build Targets
 # ----------------------------------------------------
 
+# erl/hrl from application spec
+diameter_gen_%.erl diameter_gen_%.hrl: ../dict/%.dia
+	../../bin/diameterc -i $(EBIN) $<
+
 # Generate the app file and then modules into in. This shouldn't know
 # about ../transport but good enough for now.
 $(APP_TARGET): $(APP_SRC) \
@@ -158,13 +151,10 @@ $(APPUP_TARGET): $(APPUP_SRC) ../../vsn.mk
 compiler:
 	$(MAKE) -C ../$@
 
-app: $(APP_TARGET) $(APPUP_TARGET)
-
-# erl/hrl from application spec
-diameter_gen_%.erl diameter_gen_%.hrl: diameter_gen_%.dia
-	../../bin/diameterc -i $(EBIN) -o $(@D) $<
+app:  $(APP_TARGET) $(APPUP_TARGET)
+dict: $(DICT_ERL_FILES)
 
-$(SPEC_MODULES:%=$(EBIN)/%.$(EMULATOR)): $(EBIN)/diameter_exprecs.$(EMULATOR)
+$(DICT_MODULES:%=$(EBIN)/%.$(EMULATOR)): $(EBIN)/diameter_exprecs.$(EMULATOR)
 
 # ----------------------------------------------------
 # Release Target
@@ -180,14 +170,15 @@ release_spec: opt
 	$(INSTALL_DIR)  $(RELSYSDIR)/bin
 	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
 	$(INSTALL_DIR)  $(RELSYSDIR)/src/app
+	$(INSTALL_DIR)  $(RELSYSDIR)/src/dict
 	$(INSTALL_DIR)  $(RELSYSDIR)/include
 	$(INSTALL_DIR)  $(RELSYSDIR)/examples
 	$(INSTALL_SCRIPT) $(ESCRIPT_FILES) $(RELSYSDIR)/bin
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(MODULES:%=%.erl) $(SPEC_ERL_FILES) $(RELSYSDIR)/src/app
-	$(INSTALL_DATA) $(SPEC_FILES) $(RELSYSDIR)/src/app
+	$(INSTALL_DATA) $(MODULES:%=%.erl) $(DICT_ERL_FILES) $(RELSYSDIR)/src/app
+	$(INSTALL_DATA) $(DICT_FILES) $(RELSYSDIR)/src/dict
 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/app
-	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(SPEC_HRL_FILES) $(RELSYSDIR)/include
+	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(DICT_HRL_FILES) $(RELSYSDIR)/include
 	$(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/examples
 
 release_docs_spec:
@@ -196,7 +187,12 @@ release_docs_spec:
 # Dependencies
 # ----------------------------------------------------
 
-$(SPEC_FILES:%.dia=$(EBIN)/%.$(EMULATOR)): \
+diameter_gen_base_accounting.erl diameter_gen_relay.erl: \
+	$(EBIN)/diameter_gen_base_rfc3588.beam
+
+$(DICT_ERL_FILES) $(DICT_HRL_FILES): compiler
+
+$(DICT_ERL_FILES:%.erl=$(EBIN)/%.$(EMULATOR)): \
 	$(DIAMETER_TOP)/include/diameter.hrl \
 	$(DIAMETER_TOP)/include/diameter_gen.hrl
 
@@ -214,5 +210,6 @@ depend.mk: depend.sed $(MODULES:%=%.erl) Makefile
 
 -include depend.mk
 
-.PRECIOUS: $(SPEC_ERL_FILES) $(SPEC_HRL_FILES)
-.PHONY: app clean debug depend info opt compiler release_spec release_docs_spec
+.PRECIOUS: $(DICT_ERL_FILES) $(DICT_HRL_FILES)
+.PHONY: app clean debug depend info opt compiler dict
+.PHONY: release_spec release_docs_spec
diff --git a/lib/diameter/src/app/modules.mk b/lib/diameter/src/app/modules.mk
index c133e6f64e..ea4c58bfd7 100644
--- a/lib/diameter/src/app/modules.mk
+++ b/lib/diameter/src/app/modules.mk
@@ -17,10 +17,10 @@
 # 
 # %CopyrightEnd%
 
-SPEC_FILES = \
-	diameter_gen_base_rfc3588.dia \
-	diameter_gen_base_accounting.dia \
-	diameter_gen_relay.dia
+DICTIONARIES = \
+	base_rfc3588 \
+	base_accounting \
+	relay
 
 RUNTIME_MODULES = \
 	diameter \
diff --git a/lib/diameter/src/app/diameter_gen_base_accounting.dia b/lib/diameter/src/dict/base_accounting.dia
index b76e9f3473..ced324078c 100644
--- a/lib/diameter/src/app/diameter_gen_base_accounting.dia
+++ b/lib/diameter/src/dict/base_accounting.dia
@@ -18,6 +18,7 @@
 ;;
 
 @id 3
+@name   diameter_gen_base_accounting
 @prefix diameter_base_accounting
 @vendor 0 IETF
 
diff --git a/lib/diameter/src/app/diameter_gen_base_rfc3588.dia b/lib/diameter/src/dict/base_rfc3588.dia
index 7ec4c613d4..f7a0b717cd 100644
--- a/lib/diameter/src/app/diameter_gen_base_rfc3588.dia
+++ b/lib/diameter/src/dict/base_rfc3588.dia
@@ -18,6 +18,7 @@
 ;;
 
 @id 0
+@name   diameter_gen_base_rfc3588
 @prefix diameter_base
 @vendor 0 IETF
 
diff --git a/lib/diameter/src/app/diameter_gen_relay.dia b/lib/diameter/src/dict/relay.dia
index d86446e368..c22293209b 100644
--- a/lib/diameter/src/app/diameter_gen_relay.dia
+++ b/lib/diameter/src/dict/relay.dia
@@ -18,6 +18,7 @@
 ;;
 
 @id 0xFFFFFFFF
+@name   diameter_gen_relay
 @prefix diameter_relay
 @vendor 0 IETF