From 20c2dcc70525f110c6f71c4b968d7d67682b7c35 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Fri, 16 Dec 2011 16:51:19 +0100
Subject: Move example code to examples/code

---
 lib/diameter/src/Makefile   | 17 +++++++++++++++--
 lib/diameter/src/modules.mk | 16 ++++++++--------
 2 files changed, 23 insertions(+), 10 deletions(-)

(limited to 'lib/diameter/src')

diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
index 2ec016ecbc..8b763e73ec 100644
--- a/lib/diameter/src/Makefile
+++ b/lib/diameter/src/Makefile
@@ -88,6 +88,9 @@ TARGET_FILES = \
 # Subdirectories of src to release modules into.
 TARGET_DIRS = $(sort $(dir $(TARGET_MODULES)))
 
+# Ditto for examples.
+EXAMPLE_DIRS = $(sort $(dir $(EXAMPLES)))
+
 APP_FILE   = diameter.app
 APP_SRC    = $(APP_FILE).src
 APP_TARGET = $(EBIN)/$(APP_FILE)
@@ -169,6 +172,8 @@ info:
 	@echo
 	@$(call list,EXAMPLES)
 	@echo
+	@$(call list,EXAMPLE_DIRS)
+	@echo
 	@$(call list,BINS)
 	@echo ========================================
 
@@ -189,23 +194,31 @@ endif
 # Can't $(INSTALL_DIR) more than one directory at a time on Solaris.
 
 release_spec: opt
-	for d in bin ebin examples include src/dict $(TARGET_DIRS:%/=src/%); do \
+	for d in bin ebin include src/dict; do \
 	    $(INSTALL_DIR) $(RELSYSDIR)/$$d; \
 	done
 	$(INSTALL_SCRIPT) $(BINS:%=../bin/%) $(RELSYSDIR)/bin
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(EXAMPLES:%=../examples/%) $(RELSYSDIR)/examples
 	$(INSTALL_DATA) $(EXTERNAL_HRLS:%=../include/%) $(DICT_HRLS) \
 	                $(RELSYSDIR)/include
 	$(INSTALL_DATA) $(DICTS:%=dict/%.dia) $(RELSYSDIR)/src/dict
 	$(MAKE) $(TARGET_DIRS:%/=release_src_%)
+	$(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%)
 
 $(TARGET_DIRS:%/=release_src_%): release_src_%:
+	$(INSTALL_DIR) $(RELSYSDIR)/src/$*
 	$(INSTALL_DATA) $(filter $*/%, $(TARGET_MODULES:%=%.erl) \
 	                               $(INTERNAL_HRLS)) \
 	                $(filter $*/%, compiler/$(DICT_YRL).yrl) \
 	                $(RELSYSDIR)/src/$*
 
+$(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%:
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/$*
+	$(INSTALL_DATA) $(patsubst, %, \
+	                            ../examples/%, \
+	                            $(filter $*/%, $(EXAMPLES))) \
+	                $(RELSYSDIR)/examples/$*
+
 release_docs_spec:
 
 # ----------------------------------------------------
diff --git a/lib/diameter/src/modules.mk b/lib/diameter/src/modules.mk
index 11d354e57e..0b591e7c1e 100644
--- a/lib/diameter/src/modules.mk
+++ b/lib/diameter/src/modules.mk
@@ -88,11 +88,11 @@ BINS = \
 
 # Released files relative to ../examples.
 EXAMPLES = \
-	GNUmakefile \
-	peer.erl \
-	client.erl \
-	client_cb.erl \
-	server.erl \
-	server_cb.erl \
-	relay.erl \
-	relay_cb.erl
+	code/GNUmakefile \
+	code/peer.erl \
+	code/client.erl \
+	code/client_cb.erl \
+	code/server.erl \
+	code/server_cb.erl \
+	code/relay.erl \
+	code/relay_cb.erl
-- 
cgit v1.2.3


From 84873533d8caf176a710135d15e3578168350eab Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Fri, 16 Dec 2011 16:58:03 +0100
Subject: Install example dictionaries

---
 lib/diameter/src/Makefile   | 5 ++---
 lib/diameter/src/modules.mk | 8 +++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'lib/diameter/src')

diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
index 8b763e73ec..dbfaa4e140 100644
--- a/lib/diameter/src/Makefile
+++ b/lib/diameter/src/Makefile
@@ -214,9 +214,7 @@ $(TARGET_DIRS:%/=release_src_%): release_src_%:
 
 $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%:
 	$(INSTALL_DIR) $(RELSYSDIR)/examples/$*
-	$(INSTALL_DATA) $(patsubst, %, \
-	                            ../examples/%, \
-	                            $(filter $*/%, $(EXAMPLES))) \
+	$(INSTALL_DATA) $(patsubst %, ../examples/%, $(filter $*/%, $(EXAMPLES))) \
 	                $(RELSYSDIR)/examples/$*
 
 release_docs_spec:
@@ -250,6 +248,7 @@ depend.mk: depend.sed $(MODULES:%=%.erl) Makefile
 .PHONY: app clean depend dict info release_subdir
 .PHONY: debug opt release_docs_spec release_spec
 .PHONY: $(TARGET_DIRS:%/=%) $(TARGET_DIRS:%/=release_src_%)
+.PHONY: $(EXAMPLE_DIRS:%/=release_examples_%)
 
 # Keep intermediate files.
 .SECONDARY: $(DICT_ERLS) $(DICT_HRLS) gen/$(DICT_YRL:%=%.erl)
diff --git a/lib/diameter/src/modules.mk b/lib/diameter/src/modules.mk
index 0b591e7c1e..7a700a6d53 100644
--- a/lib/diameter/src/modules.mk
+++ b/lib/diameter/src/modules.mk
@@ -95,4 +95,10 @@ EXAMPLES = \
 	code/server.erl \
 	code/server_cb.erl \
 	code/relay.erl \
-	code/relay_cb.erl
+	code/relay_cb.erl \
+	dict/rfc4004_mip.dia \
+	dict/rfc4005_nas.dia \
+	dict/rfc4006_cc.dia \
+	dict/rfc4072_eap.dia \
+	dict/rfc4590_digest.dia \
+	dict/rfc4740_sip.dia
-- 
cgit v1.2.3