Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modify Makefile.am.local files to support check-local and clean-local targets. #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Version 0.4.8 (david hull)
* modify Makefile.am to allow check-local and clean-local rules to
be specified in Makefile.am.local
* 'make clean' runs 'make clean-am'

Version 0.4.7 (kenan.gillet)
* fix make check after make clean
* fix rebar dialyzer check
Expand Down
2 changes: 1 addition & 1 deletion fw-pkgin/config
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# variable FW_PACKAGE_DEFAULT_MAINTAINER if non-empty at init time

FW_PACKAGE_NAME="fw-template-erlang-rebar"
FW_PACKAGE_VERSION="0.4.7"
FW_PACKAGE_VERSION="0.4.8"
FW_PACKAGE_MAINTAINER="Anthony Molinaro <[email protected]>"
FW_PACKAGE_SHORT_DESCRIPTION="Erlang template for framewerk which uses rebar to build."
FW_PACKAGE_DESCRIPTION="`cat README`"
Expand Down
10 changes: 8 additions & 2 deletions fw.local/template/erlang-rebar/Makefile_dot_am
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,16 @@ all: .generated_app_file rebar
fi ; \
fi

check: rebar .dialyzer_ok
.PHONY: check-local clean-local

check: check-local

check-local:: rebar .dialyzer_ok
if test -z "$(NO_EUNIT)" ; then \
FW_REBAR_BUILD=1 ./rebar $(REBAR_OPTS) compile eunit ; \
fi

clean: rebar
clean: rebar clean-am clean-local
@rm -f .dialyzer_ok
FW_REBAR_BUILD=1 ./rebar $(REBAR_OPTS) clean

Expand Down Expand Up @@ -85,3 +89,5 @@ maintainer-clean-local::
fi ; \
done
@if test -d ebin ; then rm -rf ebin ; fi

clean-local::