From b738fe22f483419412ffbdb73accef1dfebf6db9 Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Sun, 25 Mar 2018 09:53:53 -0400
Subject: [PATCH] Rearrange makefiles

---
 Makefile   | 23 +++++++++++++++--------
 compile.mk |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index ebb4d6d0..c0a9cfb2 100644
--- a/Makefile
+++ b/Makefile
@@ -9,11 +9,13 @@ ifdef RELEASE
 	FLAGS += -DRELEASE=$(RELEASE)
 endif
 
-SOURCES += $(wildcard src/*.cpp src/*/*.cpp)
-SOURCES += dep/nanovg/src/nanovg.c
+include arch.mk
 
 
-include arch.mk
+# Sources and build flags
+
+SOURCES += $(wildcard src/*.cpp src/*/*.cpp)
+SOURCES += dep/nanovg/src/nanovg.c
 
 ifeq ($(ARCH), lin)
 	SOURCES += dep/osdialog/osdialog_gtk2.c
@@ -47,7 +49,9 @@ ifeq ($(ARCH), win)
 endif
 
 
-all: $(TARGET)
+# Convenience targets
+
+all: dep $(TARGET)
 
 dep:
 	$(MAKE) -C dep
@@ -79,20 +83,18 @@ ifeq ($(ARCH), lin)
 	LD_LIBRARY_PATH=dep/lib perf record --call-graph dwarf ./Rack
 endif
 
-
 clean:
 	rm -rfv $(TARGET) libRack.a Rack.res build dist
 
+ifeq ($(ARCH), win)
 # For Windows resources
 %.res: %.rc
 	windres $^ -O coff -o $@
-
-include compile.mk
+endif
 
 
 dist: all
 	rm -rf dist
-
 	# Rack distribution
 	$(MAKE) -C plugins/Fundamental dist
 
@@ -226,5 +228,10 @@ distplugins:
 plugins:
 	for f in plugins/*; do (cd "$$f" && ${CMD}); done
 
+
+# Includes
+
+include compile.mk
+
 .PHONY: all dep run debug clean dist allplugins cleanplugins distplugins plugins
 .DEFAULT_GOAL := all
diff --git a/compile.mk b/compile.mk
index 31f9707c..58ddc082 100644
--- a/compile.mk
+++ b/compile.mk
@@ -69,7 +69,7 @@ build/%.m.o: %.m | dep
 	@mkdir -p $(@D)
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-# Do nothing by default
+# Dummy target
 dep:
 
 .PHONY: dep