# HG changeset patch
# User Alys Brooks <alysbrooks@fastmail.com>
# Date 2021-08-01 09:55:38
# Node ID f32fadb1f886323b6b7feafa22762cbb87519688
# Parent  0fc1d145ef5f1a21d4207046fc0412424c63ae38

Reorganize Makefile.

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,11 @@
 
 DEFAULT_RUN = framework-debug
 
+#BUILD
+
+# While I frequently build and run using make, the convention is that running
+# 'make' by itself merely builds the software:
+default: $(DEFAULT_RUN)
 
 core-debug:
 	dotnet build ${CORE_SOLUTION} -f netcoreapp3.1
@@ -15,25 +20,21 @@
 framework-release:
 	msbuild -restore:True ${FRAMEWORK_SOLUTION} -p:Configuration=Release
 
-
-clean-obj:
-	rm -r isometric-park-fna/obj/
-
 framework-debug: clean-obj
 	msbuild -restore:True ${FRAMEWORK_SOLUTION} -p:Configuration=Debug 
 
 
+#RUN
+
 run-core-debug: 
 	cd isometric-park-fna/bin/Debug/netcoreapp3.1; LD_LIBRARY_PATH="../../../../fnalibs/lib64" DYLD_LIBRARY_PATH="../../../../fnalibs/osx" dotnet ./isometric-park-fna.dll
 
 run-core-release: 
 	cd isometric-park-fna/bin/Release/netcoreapp3.1; LD_LIBRARY_PATH="../../../../fnalibs/lib64" DYLD_LIBRARY_PATH="../../../../fnalibs/osx" dotnet ./isometric-park-fna.dll
 
-
 run-core-release-xvfb: 
 	cd isometric-park-fna/bin/Release/netcoreapp3.1; LD_LIBRARY_PATH="../../../../fnalibs/lib64" DYLD_LIBRARY_PATH="../../../../fnalibs/osx" xvfb-run -a -s "-screen 0 1400x900x24 +extension RANDR  +extension GLX +extension RENDER" --  dotnet ./isometric-park-fna.dll
 
-
 run-framework-release:
 	cd isometric-park-fna/bin/Release/; LD_LIBRARY_PATH="../../../fnalibs/lib64" DYLD_LIBRARY_PATH="../../../fnalibs/osx" mono isometric-park-fna.exe
 
@@ -41,7 +42,10 @@
 	cd isometric-park-fna/bin/Debug/; LD_LIBRARY_PATH="../../../fnalibs/lib64" DYLD_LIBRARY_PATH="../../../fnalibs/osx" mono isometric-park-fna.exe
 
 # lint:
-# 	yamllint -d relaxed  isometric-park-fna/Content/news_items.yaml
+# 	yamllint -d relaxed isometric-park-fna/Content/news_items.yaml
+
+clean-obj:
+	rm -r isometric-park-fna/obj/
 
 #CONVENIENCE
 
@@ -49,4 +53,3 @@
 release: framework-release
 
 run: $(DEFAULT_RUN) run-$(DEFAULT_RUN)
-	# cd isometric-park-fna/bin/Debug/; LD_LIBRARY_PATH="../../../fnalibs/lib64" DYLD_LIBRARY_PATH="../../../fnalibs/osx" mono isometric-park-fna.exe