Changeset 735ff1e in trunk

Timestamp:

2020-09-17T19:25:34Z (4 years ago)

Author:

Ross Patterson <me@…>

Branches:

master

Children:

775a3db

Parents:

da24739

Message:

build(make): Improve and clarify Makefile org

This is opinionated, so I understand if community members disagree and I'm happy to back
this out.

It's conventional (and I prefer) to group variables toward the top of the ./Makefile
so I've done that.

I also prefer separating task-oriented "phony" targets above any "real" targets (whose
recipes create/update actual build artifacts on the filesystem). The task-oriented
targets tend to be a better starting point for any developers approaching the
./Makefile to understand where to get started.

File:

• Makefile (modified) (5 diffs)

Makefile ¶

@@ -1 @@
-
+# Tahoe LFS Development and maintenance tasks
+#
 # NOTE: this Makefile requires GNU make
 
@@ -12 +13 @@
 MAKEFLAGS += --no-builtin-rules
 
-default:
-        @echo "no default target"
-
+# Local target variables
 PYTHON=python
 export PYTHON
 PYFLAKES=flake8
 export PYFLAKES
-
 SOURCES=src/allmydata static misc setup.py
 APPNAME=tahoe-lafs
+
+
+# Top-level targets
+
+default:
+        @echo "no default target"
 
 # This is necessary only if you want to automatically produce a new
@@ -28 +32 @@
 make-version:
         $(PYTHON) ./setup.py update_version
-
-src/allmydata/_version.py:
-        $(MAKE) make-version
 
 # Build OS X pkg packages.
@@ -66 +67 @@
 ## # --include appeared in coverage-3.4
 ## COVERAGE_OMIT=--include '$(CURDIR)/src/allmydata/*' --omit '$(CURDIR)/src/allmydata/test/*'
-
 
 .PHONY: code-checks
@@ -228 +228 @@
 upload-tarballs:
         @if [ "X${BB_BRANCH}" = "Xmaster" ] || [ "X${BB_BRANCH}" = "X" ]; then for f in dist/*; do flappclient --furlfile ~/.tahoe-tarball-upload.furl upload-file $$f; done ; else echo not uploading tarballs because this is not trunk but is branch \"${BB_BRANCH}\" ; fi
+
+
+# Real targets
+
+src/allmydata/_version.py:
+        $(MAKE) make-version