From 9e7449804168f701109a5fd6b2ebe6b43ecece44 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 23 Nov 2011 14:32:18 +0100
Subject: Added dialyzer targets for building inets plt and running dialyzer on
 inets.

---
 lib/inets/Makefile | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

(limited to 'lib/inets')

diff --git a/lib/inets/Makefile b/lib/inets/Makefile
index 4765a2ca3c..1ad6ccf39f 100644
--- a/lib/inets/Makefile
+++ b/lib/inets/Makefile
@@ -31,12 +31,17 @@ VSN = $(INETS_VSN)
 
 SPECIAL_TARGETS = 
 
+INETS_DIA_PLT     = ./priv/inets.plt
+INETS_DIA_PLT_LOG = $(basename $(INETS_DIA_PLT)).dialyzer_plt_log
+INETS_DIA_LOG     = $(basename $(INETS_DIA_PLT)).dialyzer_log
+
+
 # ----------------------------------------------------
 # Default Subdir Targets
 # ----------------------------------------------------
 include $(ERL_TOP)/make/otp_subdir.mk
 
-.PHONY: info gclean
+.PHONY: info gclean dialyzer dialyzer_plt dclean
 
 info:
 	@echo "OS:        $(OS)"
@@ -45,6 +50,30 @@ info:
 	@echo "INETS_VSN: $(INETS_VSN)"
 	@echo "APP_VSN:   $(APP_VSN)"
 	@echo ""
+	@echo "INETS_DIA_PLT: $(INETS_DIA_PLT)"
+	@echo "INETS_DIA_LOG: $(INETS_DIA_LOG)"
+	@echo ""
 
 gclean: 
 	git clean -fXd
+
+dclean:
+	rm -f $(INETS_DIA_PLT)
+	rm -f $(INETS_DIA_PLT_LOG)
+	rm -f $(INETS_DIA_LOG)
+
+dialyzer_plt: $(INETS_DIA_PLT)
+
+$(INETS_DIA_PLT): 
+	@echo "Building inets plt file"
+	@dialyzer --build_plt \
+                  --output_plt $@ \
+                  -r ../inets/ebin \
+                  -o $(INETS_DIA_PLT_LOG) \
+                  --verbose
+
+dialyzer: $(INETS_DIA_PLT)
+	@echo "Running dialyzer on inets"
+	@dialyzer --plt $< \
+                  ../inets/ebin \
+                  --verbose
-- 
cgit v1.2.3


From 20733e3fd8b7ca6ec37585e17a88a8c9cf0d4410 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 23 Nov 2011 16:54:23 +0100
Subject: Added priv subdir (inets/priv/plt) as plt destination.

---
 lib/inets/Makefile            | 14 ++++++--------
 lib/inets/priv/plt/.gitignore |  2 ++
 2 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 lib/inets/priv/plt/.gitignore

(limited to 'lib/inets')

diff --git a/lib/inets/Makefile b/lib/inets/Makefile
index 1ad6ccf39f..1414a89621 100644
--- a/lib/inets/Makefile
+++ b/lib/inets/Makefile
@@ -31,9 +31,8 @@ VSN = $(INETS_VSN)
 
 SPECIAL_TARGETS = 
 
-INETS_DIA_PLT     = ./priv/inets.plt
-INETS_DIA_PLT_LOG = $(basename $(INETS_DIA_PLT)).dialyzer_plt_log
-INETS_DIA_LOG     = $(basename $(INETS_DIA_PLT)).dialyzer_log
+INETS_DIA_PLT      = ./priv/plt/inets.plt
+INETS_DIA_ANALYSIS = $(basename $(INETS_DIA_PLT)).dialyzer_analysis
 
 
 # ----------------------------------------------------
@@ -50,8 +49,8 @@ info:
 	@echo "INETS_VSN: $(INETS_VSN)"
 	@echo "APP_VSN:   $(APP_VSN)"
 	@echo ""
-	@echo "INETS_DIA_PLT: $(INETS_DIA_PLT)"
-	@echo "INETS_DIA_LOG: $(INETS_DIA_LOG)"
+	@echo "INETS_DIA_PLT:      $(INETS_DIA_PLT)"
+	@echo "INETS_DIA_ANALYSIS: $(INETS_DIA_ANALYSIS)"
 	@echo ""
 
 gclean: 
@@ -59,8 +58,7 @@ gclean:
 
 dclean:
 	rm -f $(INETS_DIA_PLT)
-	rm -f $(INETS_DIA_PLT_LOG)
-	rm -f $(INETS_DIA_LOG)
+	rm -f $(INETS_DIA_ANALYSIS)
 
 dialyzer_plt: $(INETS_DIA_PLT)
 
@@ -69,7 +67,7 @@ $(INETS_DIA_PLT):
 	@dialyzer --build_plt \
                   --output_plt $@ \
                   -r ../inets/ebin \
-                  -o $(INETS_DIA_PLT_LOG) \
+                  --output $(INETS_DIA_ANALYSIS) \
                   --verbose
 
 dialyzer: $(INETS_DIA_PLT)
diff --git a/lib/inets/priv/plt/.gitignore b/lib/inets/priv/plt/.gitignore
new file mode 100644
index 0000000000..2051b52d48
--- /dev/null
+++ b/lib/inets/priv/plt/.gitignore
@@ -0,0 +1,2 @@
+/*.plt
+/*.dialyzer_analysis
-- 
cgit v1.2.3