Use 'standard' bundle paths for #include directives.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2155 a436a847-0d15-0410-975c-d299462d15a1

15 files changed, 17 insertions, 18 deletions

diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index 4ea5a9e2..405dd099 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -16,7 +16,7 @@
  */
 
 #include <iostream>
-#include "lv2ext/lv2_event_helpers.h"
+#include "event.lv2/event-helpers.h"
 #include "shared/LV2Features.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "PluginUI.hpp"
diff --git a/src/common/event.lv2 b/src/common/event.lv2
new file mode 120000
index 00000000..223f3b04
--- /dev/null
+++ b/src/common/event.lv2
@@ -0,0 +1 @@
+../../../lv2/ext/event.lv2/
\ No newline at end of file
diff --git a/src/common/lv2ext/lv2_event.h b/src/common/lv2ext/lv2_event.h
deleted file mode 120000
index 33ae2639..00000000
--- a/src/common/lv2ext/lv2_event.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../../lv2/ext/event/lv2_event.h
\ No newline at end of file
diff --git a/src/common/lv2ext/lv2_event_helpers.h b/src/common/lv2ext/lv2_event_helpers.h
deleted file mode 120000
index 657cfb26..00000000
--- a/src/common/lv2ext/lv2_event_helpers.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../../lv2/ext/event/lv2_event_helpers.h
\ No newline at end of file
diff --git a/src/common/lv2ext/lv2_uri_map.h b/src/common/lv2ext/lv2_uri_map.h
deleted file mode 100644
index 5ea045e7..00000000
--- a/src/common/lv2ext/lv2_uri_map.h
+++ /dev/null
@@ -1 +0,0 @@
-link ../../../../lv2/ext/uri-map/lv2_uri_map.h
\ No newline at end of file
diff --git a/src/common/uri-map.lv2 b/src/common/uri-map.lv2
new file mode 120000
index 00000000..922af68f
--- /dev/null
+++ b/src/common/uri-map.lv2
@@ -0,0 +1 @@
+../../../lv2/ext/uri-map.lv2/
\ No newline at end of file
diff --git a/src/engine/EventBuffer.cpp b/src/engine/EventBuffer.cpp
index 5e3e8b4a..f8b97595 100644
--- a/src/engine/EventBuffer.cpp
+++ b/src/engine/EventBuffer.cpp
@@ -20,8 +20,8 @@
 #include <iostream>
 #include "ingen-config.h"
 #include "EventBuffer.hpp"
-#include "lv2ext/lv2_event.h"
-#include "lv2ext/lv2_event_helpers.h"
+#include "event.lv2/event.h"
+#include "event.lv2/event-helpers.h"
 
 using namespace std;
 
diff --git a/src/engine/EventBuffer.hpp b/src/engine/EventBuffer.hpp
index 5f33f2de..b35fb13e 100644
--- a/src/engine/EventBuffer.hpp
+++ b/src/engine/EventBuffer.hpp
@@ -18,8 +18,8 @@
 #ifndef EVENTBUFFER_H
 #define EVENTBUFFER_H
 
-#include "lv2ext/lv2_event.h"
-#include "lv2ext/lv2_event_helpers.h"
+#include "event.lv2/event.h"
+#include "event.lv2/event-helpers.h"
 #include "interface/DataType.hpp"
 #include "Buffer.hpp"
 #include "LV2EventBuffer.hpp"
diff --git a/src/engine/JackMidiDriver.cpp b/src/engine/JackMidiDriver.cpp
index 8c6a7020..61aacc06 100644
--- a/src/engine/JackMidiDriver.cpp
+++ b/src/engine/JackMidiDriver.cpp
@@ -22,7 +22,7 @@
 #include "raul/midi_events.h"
 #include "module/World.hpp"
 #include "shared/LV2Features.hpp"
-#include "lv2ext/lv2_event_helpers.h"
+#include "event.lv2/event-helpers.h"
 #include "shared/LV2URIMap.hpp"
 #include "JackMidiDriver.hpp"
 #include "JackAudioDriver.hpp"
diff --git a/src/engine/LV2EventBuffer.cpp b/src/engine/LV2EventBuffer.cpp
index 88b7ad22..3f11790e 100644
--- a/src/engine/LV2EventBuffer.cpp
+++ b/src/engine/LV2EventBuffer.cpp
@@ -20,8 +20,8 @@
 #include <iostream>
 #include "ingen-config.h"
 #include "LV2EventBuffer.hpp"
-#include "lv2ext/lv2_event.h"
-#include "lv2ext/lv2_event_helpers.h"
+#include "event.lv2/event.h"
+#include "event.lv2/event-helpers.h"
 
 using namespace std;
 
diff --git a/src/engine/LV2EventBuffer.hpp b/src/engine/LV2EventBuffer.hpp
index 755352c6..ce75d7cb 100644
--- a/src/engine/LV2EventBuffer.hpp
+++ b/src/engine/LV2EventBuffer.hpp
@@ -18,8 +18,8 @@
 #ifndef LV2EVENTBUFFER_H
 #define LV2EVENTBUFFER_H
 
-#include "lv2ext/lv2_event.h"
-#include "lv2ext/lv2_event_helpers.h"
+#include "event.lv2/event.h"
+#include "event.lv2/event-helpers.h"
 
 namespace Ingen {
 
diff --git a/src/engine/LV2Info.hpp b/src/engine/LV2Info.hpp
index f689e45f..2486efca 100644
--- a/src/engine/LV2Info.hpp
+++ b/src/engine/LV2Info.hpp
@@ -29,8 +29,8 @@
 #include "module/World.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "shared/LV2Features.hpp"
-#include "lv2ext/lv2_uri_map.h"
-#include "lv2ext/lv2_event.h"
+#include "uri-map.lv2/uri-map.h"
+#include "event.lv2/event.h"
 
 namespace Ingen {
 
diff --git a/src/engine/events/SetPortValue.cpp b/src/engine/events/SetPortValue.cpp
index cd845d3f..55919828 100644
--- a/src/engine/events/SetPortValue.cpp
+++ b/src/engine/events/SetPortValue.cpp
@@ -16,7 +16,7 @@
  */
 
 #include <sstream>
-#include "lv2ext/lv2_event.h"
+#include "event.lv2/event.h"
 #include "shared/LV2URIMap.hpp"
 #include "shared/LV2Features.hpp"
 #include "module/World.hpp"
diff --git a/src/engine/lv2_contexts.h b/src/engine/lv2_contexts.h
index a9c613f2..14e54b3b 120000..100644
--- a/src/engine/lv2_contexts.h
+++ b/src/engine/lv2_contexts.h
@@ -1 +1 @@
-../../../lv2/ext/contexts/lv2_contexts.h
\ No newline at end of file
+link ../../../lv2/ext/contexts.lv2/contexts.h
\ No newline at end of file
diff --git a/src/shared/LV2URIMap.hpp b/src/shared/LV2URIMap.hpp
index bf050f48..f1b9c919 100644
--- a/src/shared/LV2URIMap.hpp
+++ b/src/shared/LV2URIMap.hpp
@@ -27,7 +27,7 @@
 #include <string>
 #include <boost/utility.hpp>
 #include "slv2/slv2.h"
-#include "common/lv2ext/lv2_uri_map.h"
+#include "uri-map.lv2/uri-map.h"
 
 namespace Ingen {
 namespace Shared {