From 7617b3a744a11aeb4840339ca43e1cfb2d3358b7 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Mon, 20 Oct 2008 00:25:32 +0000
Subject: Actually use installation location variables for everything. Add
./waf configure --build which builds a (soon-to-be) relocatable independent
bundle with all data/progs/libs in it (OSX bundle directory structure, should
be possible to make a 'real' OSX bundle out of this...). Fix include paths to
use "" and definitely build against local versions of libraries.
git-svn-id: http://svn.drobilla.net/lad/trunk/raul@1689 a436a847-0d15-0410-975c-d299462d15a1
---
raul/AtomLiblo.hpp | 2 +-
raul/AtomRDF.hpp | 4 ++--
raul/Command.hpp | 2 +-
raul/DoubleBuffer.hpp | 4 ++--
raul/EventRingBuffer.hpp | 4 ++--
raul/List.hpp | 6 +++---
raul/MIDISink.hpp | 4 ++--
raul/Maid.hpp | 8 ++++----
raul/Path.hpp | 2 +-
raul/PathTable.hpp | 4 ++--
raul/Quantizer.hpp | 2 +-
raul/SMFReader.hpp | 2 +-
raul/SMFWriter.hpp | 4 ++--
raul/SRMWQueue.hpp | 2 +-
raul/SRSWQueue.hpp | 2 +-
raul/Slave.hpp | 4 ++--
raul/Stateful.hpp | 2 +-
raul/TableImpl.hpp | 2 +-
raul/TimeSlice.hpp | 4 ++--
wscript | 9 ++++-----
20 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/raul/AtomLiblo.hpp b/raul/AtomLiblo.hpp
index f339b10..677c7d4 100644
--- a/raul/AtomLiblo.hpp
+++ b/raul/AtomLiblo.hpp
@@ -20,7 +20,7 @@
#include <iostream>
#include <lo/lo.h>
-#include <raul/Atom.hpp>
+#include "raul/Atom.hpp"
namespace Raul {
diff --git a/raul/AtomRDF.hpp b/raul/AtomRDF.hpp
index 544a34d..a0eb98d 100644
--- a/raul/AtomRDF.hpp
+++ b/raul/AtomRDF.hpp
@@ -22,8 +22,8 @@
#include <string>
#include <sstream>
-#include <redlandmm/Node.hpp>
-#include <redlandmm/World.hpp>
+#include "redlandmm/Node.hpp"
+#include "redlandmm/World.hpp"
#define CUC(x) ((const unsigned char*)(x))
diff --git a/raul/Command.hpp b/raul/Command.hpp
index 572d3d9..0632f63 100644
--- a/raul/Command.hpp
+++ b/raul/Command.hpp
@@ -18,7 +18,7 @@
#ifndef RAUL_COMMAND_HPP
#define RAUL_COMMAND_HPP
-#include <raul/Semaphore.hpp>
+#include "raul/Semaphore.hpp"
#include <boost/utility.hpp>
namespace Raul {
diff --git a/raul/DoubleBuffer.hpp b/raul/DoubleBuffer.hpp
index 4f8f152..3d02730 100644
--- a/raul/DoubleBuffer.hpp
+++ b/raul/DoubleBuffer.hpp
@@ -18,8 +18,8 @@
#ifndef RAUL_DOUBLE_BUFFER_HPP
#define RAUL_DOUBLE_BUFFER_HPP
-#include <raul/AtomicInt.hpp>
-#include <raul/AtomicPtr.hpp>
+#include "raul/AtomicInt.hpp"
+#include "raul/AtomicPtr.hpp"
namespace Raul {
diff --git a/raul/EventRingBuffer.hpp b/raul/EventRingBuffer.hpp
index 9a28084..b065dae 100644
--- a/raul/EventRingBuffer.hpp
+++ b/raul/EventRingBuffer.hpp
@@ -21,8 +21,8 @@
#include <cassert>
#include <algorithm>
#include <glib.h>
-#include <raul/RingBuffer.hpp>
-#include <raul/TimeStamp.hpp>
+#include "raul/RingBuffer.hpp"
+#include "raul/TimeStamp.hpp"
namespace Raul {
diff --git a/raul/List.hpp b/raul/List.hpp
index 45e1101..05fdb1e 100644
--- a/raul/List.hpp
+++ b/raul/List.hpp
@@ -21,9 +21,9 @@
#include <cstddef>
#include <cassert>
#include <boost/utility.hpp>
-#include <raul/Deletable.hpp>
-#include <raul/AtomicPtr.hpp>
-#include <raul/AtomicInt.hpp>
+#include "raul/Deletable.hpp"
+#include "raul/AtomicPtr.hpp"
+#include "raul/AtomicInt.hpp"
namespace Raul {
diff --git a/raul/MIDISink.hpp b/raul/MIDISink.hpp
index 05c8747..434dd82 100644
--- a/raul/MIDISink.hpp
+++ b/raul/MIDISink.hpp
@@ -19,8 +19,8 @@
#define RAUL_MIDI_SINK_HPP
#include <stdexcept>
-#include <raul/TimeStamp.hpp>
-#include <raul/Deletable.hpp>
+#include "raul/TimeStamp.hpp"
+#include "raul/Deletable.hpp"
namespace Raul {
diff --git a/raul/Maid.hpp b/raul/Maid.hpp
index 0643062..e485b50 100644
--- a/raul/Maid.hpp
+++ b/raul/Maid.hpp
@@ -19,10 +19,10 @@
#define RAUL_MAID_HPP
#include <boost/utility.hpp>
-#include <raul/SharedPtr.hpp>
-#include <raul/SRSWQueue.hpp>
-#include <raul/Deletable.hpp>
-#include <raul/List.hpp>
+#include "raul/SharedPtr.hpp"
+#include "raul/SRSWQueue.hpp"
+#include "raul/Deletable.hpp"
+#include "raul/List.hpp"
namespace Raul {
diff --git a/raul/Path.hpp b/raul/Path.hpp
index 704cead..5994ef3 100644
--- a/raul/Path.hpp
+++ b/raul/Path.hpp
@@ -24,7 +24,7 @@
#include <cstring>
#include <cassert>
-#include <raul/Symbol.hpp>
+#include "raul/Symbol.hpp"
namespace Raul {
diff --git a/raul/PathTable.hpp b/raul/PathTable.hpp
index 65b7cc8..f7ff916 100644
--- a/raul/PathTable.hpp
+++ b/raul/PathTable.hpp
@@ -18,8 +18,8 @@
#ifndef RAUL_PATH_TABLE_HPP
#define RAUL_PATH_TABLE_HPP
-#include <raul/Path.hpp>
-#include <raul/Table.hpp>
+#include "raul/Path.hpp"
+#include "raul/Table.hpp"
namespace Raul {
diff --git a/raul/Quantizer.hpp b/raul/Quantizer.hpp
index 0fe9640..9a40751 100644
--- a/raul/Quantizer.hpp
+++ b/raul/Quantizer.hpp
@@ -19,7 +19,7 @@
#define RAUL_QUANTIZER_HPP
#include <cmath>
-#include <raul/TimeStamp.hpp>
+#include "raul/TimeStamp.hpp"
namespace Raul {
diff --git a/raul/SMFReader.hpp b/raul/SMFReader.hpp
index 1bd1f0d..b554368 100644
--- a/raul/SMFReader.hpp
+++ b/raul/SMFReader.hpp
@@ -21,7 +21,7 @@
#include <stdexcept>
#include <string>
#include <inttypes.h>
-#include <raul/TimeStamp.hpp>
+#include "raul/TimeStamp.hpp"
namespace Raul {
diff --git a/raul/SMFWriter.hpp b/raul/SMFWriter.hpp
index 3661ffd..ec29abf 100644
--- a/raul/SMFWriter.hpp
+++ b/raul/SMFWriter.hpp
@@ -19,8 +19,8 @@
#define RAUL_SMF_WRITER_HPP
#include <stdexcept>
-#include <raul/MIDISink.hpp>
-#include <raul/TimeStamp.hpp>
+#include "raul/MIDISink.hpp"
+#include "raul/TimeStamp.hpp"
namespace Raul {
diff --git a/raul/SRMWQueue.hpp b/raul/SRMWQueue.hpp
index ebdce5b..ea8858e 100644
--- a/raul/SRMWQueue.hpp
+++ b/raul/SRMWQueue.hpp
@@ -22,7 +22,7 @@
#include <cstdlib>
#include <cmath>
#include <boost/utility.hpp>
-#include <raul/AtomicInt.hpp>
+#include "raul/AtomicInt.hpp"
#include <iostream>
using namespace std;
diff --git a/raul/SRSWQueue.hpp b/raul/SRSWQueue.hpp
index ad615e0..572da2e 100644
--- a/raul/SRSWQueue.hpp
+++ b/raul/SRSWQueue.hpp
@@ -21,7 +21,7 @@
#include <cassert>
#include <cstdlib>
#include <boost/utility.hpp>
-#include <raul/AtomicInt.hpp>
+#include "raul/AtomicInt.hpp"
namespace Raul {
diff --git a/raul/Slave.hpp b/raul/Slave.hpp
index 387a6c5..2830e3f 100644
--- a/raul/Slave.hpp
+++ b/raul/Slave.hpp
@@ -19,8 +19,8 @@
#define RAUL_SLAVE_HPP
#include <pthread.h>
-#include <raul/Semaphore.hpp>
-#include <raul/Thread.hpp>
+#include "raul/Semaphore.hpp"
+#include "raul/Thread.hpp"
namespace Raul {
diff --git a/raul/Stateful.hpp b/raul/Stateful.hpp
index be1491c..41b165f 100644
--- a/raul/Stateful.hpp
+++ b/raul/Stateful.hpp
@@ -18,7 +18,7 @@
#ifndef STATEFUL_H
#define STATEFUL_H
-#include <redlandmm/Model.hpp>
+#include "redlandmm/Model.hpp"
namespace Raul {
diff --git a/raul/TableImpl.hpp b/raul/TableImpl.hpp
index e8053c5..c314022 100644
--- a/raul/TableImpl.hpp
+++ b/raul/TableImpl.hpp
@@ -22,7 +22,7 @@
#include <stdexcept>
#include <algorithm>
#include <iostream>
-#include <raul/Table.hpp>
+#include "raul/Table.hpp"
namespace Raul {
diff --git a/raul/TimeSlice.hpp b/raul/TimeSlice.hpp
index e8570e1..8f1ba66 100644
--- a/raul/TimeSlice.hpp
+++ b/raul/TimeSlice.hpp
@@ -21,8 +21,8 @@
#include <cassert>
#include <cmath>
#include <boost/utility.hpp>
-#include <raul/TimeStamp.hpp>
-#include <raul/lv2_event.h>
+#include "raul/TimeStamp.hpp"
+#include "raul/lv2_event.h"
namespace Raul {
diff --git a/wscript b/wscript
index cb11573..1eafdc4 100644
--- a/wscript
+++ b/wscript
@@ -25,8 +25,6 @@ blddir = 'build'
def set_options(opt):
autowaf.set_options(opt)
- opt.tool_options('compiler_cc')
- opt.tool_options('compiler_cxx')
def configure(conf):
autowaf.configure(conf)
@@ -37,8 +35,8 @@ def configure(conf):
def build(bld):
# Headers
- install_files('PREFIX', 'include/raul', 'raul/*.hpp')
- install_files('PREFIX', 'include/raul', 'raul/*.h')
+ install_files('INCLUDEDIR', 'raul', 'raul/*.hpp')
+ install_files('INCLUDEDIR', 'raul', 'raul/*.h')
# Pkgconfig file
autowaf.build_pc(bld, 'RAUL', RAUL_VERSION, 'GLIBMM GTHREAD')
@@ -57,6 +55,7 @@ def build(bld):
obj.name = 'libraul'
obj.target = 'raul'
obj.uselib = 'GLIBMM GTHREAD'
+ obj.inst_dir = bld.env()['LIBDIRNAME']
obj.vnum = RAUL_LIB_VERSION
# Unit tests
@@ -64,7 +63,7 @@ def build(bld):
# Documentation
autowaf.build_dox(bld, 'RAUL', RAUL_VERSION, srcdir, blddir)
- install_files('PREFIX', 'share/doc/raul', blddir + '/default/doc/html/*')
+ install_files('HTMLDIR', '', blddir + '/default/doc/html/*')
def shutdown():
autowaf.shutdown()
--
cgit v1.2.1