From bbbfa7690c00fb6c4d22cb83e556477beaadb2c4 Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Sat, 6 Jun 2015 20:19:58 -0700
Subject: [PATCH] move -ladspa/-vst suffixes to directory prefixes

---
 Makefile               | 24 ++++++++++++------------
 README.md              |  1 -
 bin/.gitignore         |  2 ++
 bin/ladspa/.gitignore  |  2 ++
 bin/vst/.gitignore     |  2 ++
 crap/ladspa/.gitignore |  2 ++
 crap/vst/.gitignore    |  2 ++
 7 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 bin/ladspa/.gitignore
 create mode 100644 bin/vst/.gitignore
 create mode 100644 crap/ladspa/.gitignore
 create mode 100644 crap/vst/.gitignore

diff --git a/Makefile b/Makefile
index 85da750..b7d5acc 100644
--- a/Makefile
+++ b/Makefile
@@ -19,11 +19,11 @@ BENCH_AGAINST = eq_const
 PROGRAM = ${UTILS:%=$(BIN)/%}
 HEADERS = ${INCLUDES:%=include/%.hpp}
 
-LADSPA_SHOBJ = ${LADSPA:%=$(BIN)/$(DISTNAME)_%-ladspa.so}
-VST_SHOBJ = ${VST:%=$(BIN)/$(DISTNAME)_%-vst.so}
+LADSPA_SHOBJ = ${LADSPA:%=$(BIN)/ladspa/$(DISTNAME)_%.so}
+VST_SHOBJ = ${VST:%=$(BIN)/vst/$(DISTNAME)_%.so}
 SHOBJ = $(LADSPA_SHOBJ) $(VST_SHOBJ)
 OBJ = ${SHOBJ:.so=.o}
-AGAINST = $(BIN)/$(DISTNAME)_$(BENCH_AGAINST)-ladspa.so
+AGAINST = $(BIN)/ladspa/$(DISTNAME)_$(BENCH_AGAINST).so
 #EXE = ${PROGRAM:=.exe}
 EXE = $(BIN)/design.exe
 DLL = ${SHOBJ:.so=.dll}
@@ -34,7 +34,7 @@ VST_SRC = ${VST_CPP:%=$(VST_CPP_DIR)/%}
 VST_OBJ = ${VST_CPP:%.cpp=$(BIN)/%.o}
 VST_DEF = $(VST_SDK_DIR)/public.sdk/samples/vst2.x/win/vstplug.def
 
-GENERAL_FLAGS = -Wall -Winline -Wno-unused-function -Wno-sign-compare -I include
+GENERAL_FLAGS = -Wall -Winline -Wno-unused-function -Wno-sign-compare -I . -I include
 ALL_CXXFLAGS = $(GENERAL_FLAGS) -std=gnu++11 $(CXXFLAGS)
 ALL_LDFLAGS = -lm $(LDFLAGS)
 
@@ -98,29 +98,29 @@ $(BIN)/%.dll: $(BIN)/%.so
 	@echo '  OBJCOPY '$@
 	@$(OBJCOPY) -S $< $@
 
-$(BIN)/%-ladspa.so: $(BIN)/%-ladspa.o
+$(BIN)/ladspa/%.so: $(BIN)/ladspa/%.o
 	@echo '  CXXLD   '$@
 	@$(CXX) $(ALL_CXXFLAGS) $(LADSPA_FLAGS) -shared $^ -o $@ $(ALL_LDFLAGS)
 
-$(BIN)/%-vst.so: $(BIN)/%-vst.o $(BIN)/vstsdk.o
+$(BIN)/vst/%.so: $(BIN)/vst/%.o $(BIN)/vstsdk.o
 	@echo '  CXXLD   '$@
 	@$(CXX) $(ALL_CXXFLAGS) $(VST_FLAGS) -shared $^ -o $@ $(ALL_LDFLAGS)
 
-$(BIN)/$(DISTNAME)_%-ladspa.o: crap/%-ladspa.cpp $(HEADERS) include/ladspa.hpp
+$(BIN)/ladspa/$(DISTNAME)_%.o: crap/ladspa/%.cpp $(HEADERS) include/ladspa.hpp
 	@echo '  CXX     '$@
 	@$(CXX) -c $(ALL_CXXFLAGS) $(LADSPA_FLAGS) $(CPPFLAGS) $< -o $@
 
-$(BIN)/$(DISTNAME)_%-vst.o: crap/%-vst.cpp $(HEADERS)
+$(BIN)/vst/$(DISTNAME)_%.o: crap/vst/%.cpp $(HEADERS)
 	@echo '  CXX     '$@
 	@$(CXX) -c $(ALL_CXXFLAGS) $(VST_FLAGS) $(CPPFLAGS) $< -o $@
 
-crap/%-ladspa.cpp: crap/%.hpp template/ladspa.cpp util/generate
+crap/ladspa/%.cpp: crap/%.hpp template/ladspa.cpp util/generate
 	@echo '  GEN     '$@
-	@util/generate $(notdir $<) $@ template/ladspa.cpp
+	@util/generate crap/$(notdir $<) $@ template/ladspa.cpp
 
-crap/%-vst.cpp: crap/%.hpp template/vst.cpp util/generate
+crap/vst/%.cpp: crap/%.hpp template/vst.cpp util/generate
 	@echo '  GEN     '$@
-	@util/generate $(notdir $<) $@ template/vst.cpp
+	@util/generate crap/$(notdir $<) $@ template/vst.cpp
 
 $(BIN)/vstsdk.o: $(VST_OBJ)
 	@echo '  LD      '$@
diff --git a/README.md b/README.md
index 94742c4..7215016 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,5 @@ other targets:
 * LV2 support
 * automatically generate markdown table based on crap contents
 * rename plugins (fix capitalization consistency and such)
-* don't suffix -ladspa and -vst on built libraries; it's annoying
 * scrap overly-complex makefile for a shell script
 * support for CPUs without SSE/NEON
diff --git a/bin/.gitignore b/bin/.gitignore
index d6b7ef3..2eb5f3f 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1,2 +1,4 @@
 *
 !.gitignore
+!vst
+!ladspa
diff --git a/bin/ladspa/.gitignore b/bin/ladspa/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/bin/ladspa/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/bin/vst/.gitignore b/bin/vst/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/bin/vst/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/crap/ladspa/.gitignore b/crap/ladspa/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/crap/ladspa/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/crap/vst/.gitignore b/crap/vst/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/crap/vst/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore