-
Notifications
You must be signed in to change notification settings - Fork 12
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
Makefile updates #234
Merged
Merged
Makefile updates #234
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
2770bb2
test: rename test-examples to check-examples
jnikula 6715f25
check: rename 'check' to 'check-style' and repurpose 'check'
jnikula c600b48
build: remove html -> rst build rule
jnikula 6560fce
build: remove the quiet build hacks
jnikula 3b1b656
build: remove Makefile.rules
jnikula 07092ed
build: include local Makefiles dynamically
jnikula 87ef915
build: simplify subdir Makefiles
jnikula 214f4c7
build: remove some stale comments
jnikula fd45724
build: fix cleaning of pycache
jnikula b4be2a0
build: unify docdir to doc_dir
jnikula b840bb4
build: use src_dir instead of dir
jnikula e6bdda4
build: add missing .PHONY deps
jnikula File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,5 @@ | ||
# Route plain 'make' to Sphinx help | ||
.PHONY: all | ||
all: help | ||
.PHONY: default | ||
default: help | ||
|
||
subdirs := . test doc src/hawkmoth docker | ||
|
||
include $(subdirs:%=%/Makefile.local) | ||
include Makefile.rules | ||
include $(shell find -name Makefile.local) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,15 @@ | ||
# -*- makefile -*- | ||
# Copyright (c) 2018, Jani Nikula <[email protected]> | ||
# Licensed under the terms of BSD 2-Clause, see LICENSE for details. | ||
# | ||
# Helpers for packaging and releasing. | ||
# | ||
# FIXME: | ||
# | ||
# * Add helpers for releasing | ||
# - release checks | ||
# - updating the version | ||
# - tagging | ||
# - uploading tagged versions to pypi | ||
# | ||
|
||
dir := . | ||
|
||
RST := $(RST) CHANGELOG.rst CONTRIBUTING.rst README.rst | ||
|
||
# Static analysis | ||
.PHONY: check | ||
check: | ||
check: check-style check-rst check-examples | ||
|
||
.PHONY: check-style | ||
check-style: | ||
flake8 src/hawkmoth test | ||
|
||
.PHONY: check-rst | ||
|
@@ -44,4 +34,14 @@ test-upload: | |
upload: | ||
twine upload dist/* | ||
|
||
.PHONY: clean | ||
clean: | ||
rm -rf $(CLEAN) | ||
|
||
.PHONY: distclean | ||
distclean: clean | ||
rm -rf $(DISTCLEAN) | ||
|
||
.SUFFIXES: | ||
|
||
DISTCLEAN := $(DISTCLEAN) build dist hawkmoth.egg-info |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,2 @@ | ||
all: | ||
$(MAKE) -C .. all | ||
|
||
.DEFAULT: | ||
.DEFAULT default: | ||
$(MAKE) -C .. $@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,2 @@ | ||
all: | ||
$(MAKE) -C .. all | ||
|
||
.DEFAULT: | ||
.DEFAULT default: | ||
$(MAKE) -C .. $@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,2 @@ | ||
all: | ||
$(MAKE) -C .. all | ||
|
||
.DEFAULT: | ||
.DEFAULT default: | ||
$(MAKE) -C .. $@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,2 @@ | ||
all: | ||
$(MAKE) -C .. all | ||
|
||
.DEFAULT: | ||
$(MAKE) -C .. $@ | ||
.DEFAULT default: | ||
$(MAKE) -C ../.. $@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# -*- makefile -*- | ||
|
||
dir := src/hawkmoth | ||
src_dir := src/hawkmoth | ||
|
||
CLEAN := $(CLEAN) $(dir)/hawkmoth.pyc $(dir)/cautodoc.pyc $(dir)/__init__.pyc | ||
CLEAN := $(CLEAN) $(shell find $(src_dir) -type d -name __pycache__) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,2 @@ | ||
all: | ||
$(MAKE) -C .. all | ||
|
||
.DEFAULT: | ||
.DEFAULT default: | ||
$(MAKE) -C .. $@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Being overly pedantic here, but this would fit better with the 1st commit. No biggie though.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess I made this drive-by change, and that inspired me to do the
docdir
change.