Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Update Makefile and src/Makefile

* Targets in `Makefile` of `yaws.plt` and `dialyzer` calls
  dialyzer with two target directories, `ebin` and `src`;
  this causes the error of duplicate modules.
  Checking out the .beam files under `ebin` is sufficient
  for dialyzer; `src` is removed.

* Target `mime_type_c.beam` in `src/Makefile` is
  superfluous and generates a spurious .beam file in
  the `src` directory, so the target is removed.
  Also target `charset.def` in `src/Makefile` should be
  dependent on `../ebin/mime_type_c.beam`, so this is
  also changed from the previous target without the
  directory path.
  • Loading branch information...
commit 9b86f4ac624b693d2f6253c95b7166dea6b8a2f5 1 parent 2ff32fe
Kenji Rikitake authored

Showing 2 changed files with 3 additions and 5 deletions. Show diff stats Hide diff stats

  1. +2 2 Makefile
  2. +1 3 src/Makefile
4 Makefile
@@ -79,7 +79,7 @@ touch:
79 79 find . -name '*.erl' -print | xargs touch -m
80 80
81 81 yaws.plt:
82   - dialyzer --build_plt -r ebin src --output_plt yaws.plt \
  82 + dialyzer --build_plt -r ebin --output_plt yaws.plt \
83 83 -r $(ERLDIR)/lib/sasl-$(SASL_VSN) \
84 84 -r $(ERLDIR)/lib/kernel-$(KERNEL_VSN) \
85 85 -r $(ERLDIR)/lib/stdlib-$(STDLIB_VSN) \
@@ -89,7 +89,7 @@ yaws.plt:
89 89 # -r $(ERLDIR)/lib/ssl-$(SSL_VSN)
90 90
91 91 dialyzer: yaws.plt
92   - -dialyzer -q --plt yaws.plt -r ebin src > dialyzer_warnings
  92 + -dialyzer -q --plt yaws.plt -r ebin > dialyzer_warnings
93 93 diff -U0 known_dialyzer_warnings dialyzer_warnings
94 94
95 95 .PHONY: test
4 src/Makefile
@@ -101,9 +101,7 @@ charset.def:
101 101 echo $(DEFAULT_CHARSET) > ../priv/charset.def; \
102 102 else rm -f ../priv/charset.def ; touch ../priv/charset.def; fi
103 103
104   -mime_type_c.beam: mime_type_c.erl
105   -
106   -mime_types.erl: charset.def mime_type_c.beam
  104 +mime_types.erl: charset.def ../ebin/mime_type_c.beam
107 105 $(ERL) -noshell -pa ../ebin -s mime_type_c generate
108 106
109 107 debug:

0 comments on commit 9b86f4a

Please sign in to comment.
Something went wrong with that request. Please try again.