# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1421258434 0
# Node ID 8a1d240ac5426590e9928ba26accb6e5eca5a3c6
# Parent  0f2edd13ea2db4bed1651f02858d227c13124d96
Some renames

diff -r 0f2edd13ea2d -r 8a1d240ac542 Makefile.inc
--- a/Makefile.inc	Tue Dec 02 17:36:41 2014 +0000
+++ b/Makefile.inc	Wed Jan 14 18:00:34 2015 +0000
@@ -98,7 +98,7 @@
 
 default:   all
 
-all:	   libs test $(PF)
+all:	   libs $(PF) test
 
 libs:	   $(LIB) $(PLUGIN)
 
diff -r 0f2edd13ea2d -r 8a1d240ac542 Makefile.osx
--- a/Makefile.osx	Tue Dec 02 17:36:41 2014 +0000
+++ b/Makefile.osx	Wed Jan 14 18:00:34 2015 +0000
@@ -4,7 +4,8 @@
 CFLAGS 		:= $(ARCHFLAGS) -Wall -O3 -ftree-vectorize
 CXXFLAGS  	:= $(CFLAGS)
 
-PLUGIN_LDFLAGS	  := $(ARCHFLAGS) -dynamiclib -exported_symbols_list vamp/vamp-plugin.list
+LDFLAGS		:= $(ARCHFLAGS)
+PLUGIN_LDFLAGS	  := -dynamiclib -exported_symbols_list vamp/vamp-plugin.list
 
 VAMPSDK_DIR := ../vamp-plugin-sdk
 
diff -r 0f2edd13ea2d -r 8a1d240ac542 vamp/CQChromaVamp.cpp
--- a/vamp/CQChromaVamp.cpp	Tue Dec 02 17:36:41 2014 +0000
+++ b/vamp/CQChromaVamp.cpp	Wed Jan 14 18:00:34 2015 +0000
@@ -76,7 +76,7 @@
 string
 CQChromaVamp::getName() const
 {
-    return "Chromagram";
+    return "CQ Chromagram";
 }
 
 string
diff -r 0f2edd13ea2d -r 8a1d240ac542 vamp/CQVamp.cpp
--- a/vamp/CQVamp.cpp	Tue Dec 02 17:36:41 2014 +0000
+++ b/vamp/CQVamp.cpp	Wed Jan 14 18:00:34 2015 +0000
@@ -89,9 +89,9 @@
 CQVamp::getName() const
 {
     if (m_midiPitchParameters) {
-        return "Constant-Q Spectrogram (MIDI pitch range)";
+        return "CQ Constant-Q Spectrogram (MIDI pitch range)";
     } else {
-        return "Constant-Q Spectrogram (Hz range)";
+        return "CQ Constant-Q Spectrogram (Hz range)";
     }
 }