diff options
Diffstat (limited to 'src')
| l--------- | src/common/lv2ext/lv2_osc.h | 1 | ||||
| -rw-r--r-- | src/libs/client/Makefile.am | 5 | ||||
| -rw-r--r-- | src/libs/client/PluginModel.cpp | 2 | ||||
| -rw-r--r-- | src/libs/engine/Makefile.am | 10 | ||||
| -rw-r--r-- | src/libs/engine/events/SetPortValueEvent.cpp | 2 | ||||
| -rw-r--r-- | src/libs/gui/Makefile.am | 6 | ||||
| -rw-r--r-- | src/libs/serialisation/Makefile.am | 3 | ||||
| -rw-r--r-- | src/progs/ingen/Makefile.am | 2 |
8 files changed, 11 insertions, 20 deletions
diff --git a/src/common/lv2ext/lv2_osc.h b/src/common/lv2ext/lv2_osc.h new file mode 120000 index 00000000..8c97f7b8 --- /dev/null +++ b/src/common/lv2ext/lv2_osc.h @@ -0,0 +1 @@ +../../../../lv2/extensions/osc/lv2_osc.h
\ No newline at end of file diff --git a/src/libs/client/Makefile.am b/src/libs/client/Makefile.am index ba8afd89..730140ca 100644 --- a/src/libs/client/Makefile.am +++ b/src/libs/client/Makefile.am @@ -6,11 +6,8 @@ moduledir = $(libdir)/ingen module_LTLIBRARIES = libingen_client.la libingen_client_la_CXXFLAGS = \ - -I$(top_srcdir)/slv2 \ - -I$(top_srcdir)/raul \ - -I$(top_srcdir)/ingen/src/common \ - -I$(top_srcdir)/lv2/extensions/osc \ -DPKGDATADIR=\"$(pkgdatadir)\" \ + @INGEN_CFLAGS@ \ @LIBLO_CFLAGS@ \ @LXML2_CFLAGS@ @RASQAL_CFLAGS@ @RAPTOR_CFLAGS@ \ @LSIGCPP_CFLAGS@ @GLIBMM_CFLAGS@ diff --git a/src/libs/client/PluginModel.cpp b/src/libs/client/PluginModel.cpp index 0e6c06b3..069c0157 100644 --- a/src/libs/client/PluginModel.cpp +++ b/src/libs/client/PluginModel.cpp @@ -17,7 +17,7 @@ #include <sstream> #include <raul/Path.hpp> -#include "lv2_osc_print.h" +//#include "lv2_osc_print.h" #include "PluginModel.hpp" #include "PatchModel.hpp" diff --git a/src/libs/engine/Makefile.am b/src/libs/engine/Makefile.am index bbc621ae..4921b0c1 100644 --- a/src/libs/engine/Makefile.am +++ b/src/libs/engine/Makefile.am @@ -6,15 +6,11 @@ moduledir = $(libdir)/ingen module_LTLIBRARIES = libingen_engine.la libingen_engine_la_CXXFLAGS = \ - @SLV2_CFLAGS@ @RAUL_CFLAGS@ \ - -I$(top_srcdir)/ingen/src/common \ - -I$(top_srcdir)/ingen/src/libs \ - -I$(top_srcdir)/ingen/src/libs/engine/events \ - -I$(top_srcdir)/lv2/extensions/osc \ - @JACK_CFLAGS@ @LIBLO_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @GLIBMM_CFLAGS@ + @SLV2_CFLAGS@ @RAUL_CFLAGS@ @INGEN_CFLAGS@ \ + @JACK_CFLAGS@ @LIBLO_CFLAGS@ @LASH_CFLAGS@ @GLIBMM_CFLAGS@ libingen_engine_la_LDFLAGS = -no-undefined -module -avoid-version -libingen_engine_la_LIBADD = @RAUL_LIBS@ @JACK_LIBS@ @LIBLO_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @SLV2_LIBS@ @GLIBMM_LIBS@ +libingen_engine_la_LIBADD = @RAUL_LIBS@ @JACK_LIBS@ @LIBLO_LIBS@ @LASH_LIBS@ @SLV2_LIBS@ @GLIBMM_LIBS@ AM_CFLAGS=-std=c99 diff --git a/src/libs/engine/events/SetPortValueEvent.cpp b/src/libs/engine/events/SetPortValueEvent.cpp index 592c09b3..b4d2571c 100644 --- a/src/libs/engine/events/SetPortValueEvent.cpp +++ b/src/libs/engine/events/SetPortValueEvent.cpp @@ -16,7 +16,7 @@ */ #include <sstream> -#include "lv2_osc_print.h" +#include <lv2ext/lv2-midiport.h> #include "Responder.hpp" #include "SetPortValueEvent.hpp" #include "Engine.hpp" diff --git a/src/libs/gui/Makefile.am b/src/libs/gui/Makefile.am index d0d07fd8..e45b095a 100644 --- a/src/libs/gui/Makefile.am +++ b/src/libs/gui/Makefile.am @@ -12,12 +12,10 @@ moduledir = $(libdir)/ingen module_LTLIBRARIES = libingen_gui.la libingen_gui_la_CXXFLAGS = \ - @SLV2_CFLAGS@ @RAUL_CFLAGS@ @FLOWCANVAS_CFLAGS@ \ - -I$(top_srcdir)/ingen/src/common \ - -I$(top_srcdir)/ingen/src/libs \ -DPKGDATADIR=\"$(pkgdatadir)\" \ + @SLV2_CFLAGS@ @RAUL_CFLAGS@ @FLOWCANVAS_CFLAGS@ \ + @INGEN_CFLAGS@ \ -DINGEN_MODULE_DIR=\"$(libdir)/ingen\" \ - -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \ @LIBLO_CFLAGS@ @CURL_CFLAGS@ \ @GTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ diff --git a/src/libs/serialisation/Makefile.am b/src/libs/serialisation/Makefile.am index 0ceae510..0f5df646 100644 --- a/src/libs/serialisation/Makefile.am +++ b/src/libs/serialisation/Makefile.am @@ -5,8 +5,7 @@ moduledir = $(libdir)/ingen module_LTLIBRARIES = libingen_serialisation.la libingen_serialisation_la_CXXFLAGS = \ - -I$(top_srcdir)/ingen/src/common \ - -I$(top_srcdir)/ingen/src/libs \ + @INGEN_CFLAGS@ \ @RAUL_CFLAGS@ \ @GLIBMM_CFLAGS@ \ @SLV2_CFLAGS@ diff --git a/src/progs/ingen/Makefile.am b/src/progs/ingen/Makefile.am index 2a471c73..9705fd9f 100644 --- a/src/progs/ingen/Makefile.am +++ b/src/progs/ingen/Makefile.am @@ -1,4 +1,4 @@ -AM_CXXFLAGS = @GTHREAD_CFLAGS@ @GLIBMM_CFLAGS@ @RAUL_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/ingen/src/common -I$(top_srcdir)/ingen/src/libs -I$(top_srcdir)/ingen/src -DINGEN_MODULE_DIR=\"$(libdir)/ingen\" +AM_CXXFLAGS = @GTHREAD_CFLAGS@ @GLIBMM_CFLAGS@ @RAUL_CFLAGS@ @SLV2_CFLAGS@ @INGEN_CFLAGS@ -DINGEN_MODULE_DIR=\"$(libdir)/ingen\" MAINTAINERCLEANFILES = Makefile.in |