From df69ba0d51bbb44e32fc9de784791edff0974a06 Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Mon, 23 Oct 2017 06:22:37 -0400
Subject: [PATCH] Clean up build system

---
 Makefile   |  2 +-
 compile.mk | 10 ----------
 plugin.mk  | 12 +++++++-----
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 0555600f..70ffcf23 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ include compile.mk
 
 dist: all
 ifndef VERSION
-	$(error VERSION must be defined when calling make)
+	$(error VERSION must be defined when making distributables)
 endif
 	rm -rf dist
 	$(MAKE) -C plugins/Fundamental dist
diff --git a/compile.mk b/compile.mk
index 9ec706a3..0ebc1501 100644
--- a/compile.mk
+++ b/compile.mk
@@ -42,16 +42,6 @@ DEPS = $(patsubst %, build/%.d, $(SOURCES))
 $(TARGET): $(OBJECTS)
 	$(CXX) -o $@ $^ $(LDFLAGS)
 
-%.so:
-	$(CXX) -o $@ $^ $(LDFLAGS)
-
-%.dylib:
-	$(CXX) -o $@ $^ $(LDFLAGS)
-
-%.dll:
-	$(CXX) -o $@ $^ $(LDFLAGS)
-
-# Object targets
 
 -include $(DEPS)
 
diff --git a/plugin.mk b/plugin.mk
index cdb1776f..1977a1d0 100644
--- a/plugin.mk
+++ b/plugin.mk
@@ -8,21 +8,23 @@ include ../../arch.mk
 
 ifeq ($(ARCH), lin)
 	LDFLAGS += -shared
-	PLUGIN_EXTENSION = so
+	TARGET = plugin.so
 endif
 
 ifeq ($(ARCH), mac)
 	LDFLAGS += -shared -undefined dynamic_lookup
-	PLUGIN_EXTENSION = dylib
+	TARGET = plugin.dylib
 endif
 
 ifeq ($(ARCH), win)
 	LDFLAGS += -shared -L../../ -lRack
-	PLUGIN_EXTENSION = dll
+	TARGET = plugin.dll
 endif
 
 
-clean:
-	rm -rfv build *.$(PLUGIN_EXTENSION) dist
+all: $(TARGET)
 
 include ../../compile.mk
+
+clean:
+	rm -rfv build $(TARGET) dist