diff options
| author | David Robillard <d@drobilla.net> | 2007-07-24 06:48:02 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-07-24 06:48:02 +0000 |
| commit | f8b4b09e42318eed8b7cd1fe6746fa4bc542771f (patch) | |
| tree | d3abbf14b982d8176fa2810a47116c60fcf966b7 /src | |
| parent | b74cf92e1f101412df6071ee7c8bc5ed3fe4485e (diff) | |
| download | patchage-f8b4b09e42318eed8b7cd1fe6746fa4bc542771f.tar.gz patchage-f8b4b09e42318eed8b7cd1fe6746fa4bc542771f.tar.bz2 patchage-f8b4b09e42318eed8b7cd1fe6746fa4bc542771f.zip | |
Removed recursive autohell, except for SLv2.
Always build against local copies, hopefully fixing broken compilation against outdated system versions.
git-svn-id: http://svn.drobilla.net/lad/patchage@610 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
| -rw-r--r-- | src/JackDriver.h | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/Patchage.cpp | 2 | ||||
| -rw-r--r-- | src/PatchageCanvas.h | 2 | ||||
| -rw-r--r-- | src/PatchageEvent.cpp | 2 | ||||
| -rw-r--r-- | src/PatchageEvent.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/JackDriver.h b/src/JackDriver.h index d036276..1c03972 100644 --- a/src/JackDriver.h +++ b/src/JackDriver.h @@ -24,7 +24,7 @@ #include <jack/jack.h> #include <jack/statistics.h> #include <glibmm/thread.h> -#include <raul/AtomicPtr.h> +#include "raul/AtomicPtr.h" #include "Driver.h" class Patchage; class PatchageEvent; diff --git a/src/Makefile.am b/src/Makefile.am index b0915f1..485aec6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ -AM_CXXFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" @GTHREAD_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @JACK_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @FLOWCANVAS_CFLAGS@ @RAUL_CFLAGS@ -patchage_LDADD = @GTHREAD_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @JACK_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @FLOWCANVAS_LIBS@ @RAUL_LIBS@ +AM_CXXFLAGS = -I.. -I$(top_srcdir)/raul -I$(top_srcdir)/flowcanvas -DPKGDATADIR=\"$(pkgdatadir)\" @GTHREAD_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @JACK_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ +patchage_LDADD = @RAUL_LIBS@ @FLOWCANVAS_LIBS@ @GTHREAD_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @JACK_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ EXTRA_DIST = patchage.gladep diff --git a/src/Patchage.cpp b/src/Patchage.cpp index 8e2dd3a..b6e7f84 100644 --- a/src/Patchage.cpp +++ b/src/Patchage.cpp @@ -19,7 +19,7 @@ #include <sstream> #include "Patchage.h" #include "PatchageEvent.h" -#include "../config.h" +#include "../../config/config.h" #include <libgnomecanvasmm.h> #include <libglademm/xml.h> #include <fstream> diff --git a/src/PatchageCanvas.h b/src/PatchageCanvas.h index 96e8912..4ac5c62 100644 --- a/src/PatchageCanvas.h +++ b/src/PatchageCanvas.h @@ -18,7 +18,7 @@ #ifndef PATCHAGECANVAS_H #define PATCHAGECANVAS_H -#include "../config.h" +#include "../../config/config.h" #include <string> #ifdef HAVE_ALSA #include <alsa/asoundlib.h> diff --git a/src/PatchageEvent.cpp b/src/PatchageEvent.cpp index 9450770..493050a 100644 --- a/src/PatchageEvent.cpp +++ b/src/PatchageEvent.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "../config.h" +#include "../../config/config.h" #include "raul/SharedPtr.h" #include "Patchage.h" #include "PatchageCanvas.h" diff --git a/src/PatchageEvent.h b/src/PatchageEvent.h index 79fb711..24dd7ba 100644 --- a/src/PatchageEvent.h +++ b/src/PatchageEvent.h @@ -20,7 +20,7 @@ #include <string> #include <jack/jack.h> -#include "../config.h" +#include "../../config/config.h" #ifdef HAVE_ALSA #include <alsa/asoundlib.h> #endif |