From cf1c161a0209cdce869a3e8c3b48b1d53c1bab00 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 24 Jul 2007 06:48:02 +0000 Subject: 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/ingen@610 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/Makefile.am | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'src/libs/engine/Makefile.am') diff --git a/src/libs/engine/Makefile.am b/src/libs/engine/Makefile.am index 7b873c93..7ef0bdaf 100644 --- a/src/libs/engine/Makefile.am +++ b/src/libs/engine/Makefile.am @@ -5,9 +5,16 @@ MAINTAINERCLEANFILES = Makefile.in moduledir = $(libdir)/ingen module_LTLIBRARIES = libingen_engine.la -libingen_engine_la_CXXFLAGS = @RAUL_CFLAGS@ @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine/events +libingen_engine_la_CXXFLAGS = \ + -I$(top_srcdir)/slv2 \ + -I$(top_srcdir)/raul \ + -I$(top_srcdir)/ingen/src/common \ + -I$(top_srcdir)/ingen/src/libs \ + -I$(top_srcdir)/ingen/src/libs/engine/events \ + @JACK_CFLAGS@ @LIBLO_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @GLIBMM_CFLAGS@ + libingen_engine_la_LDFLAGS = -no-undefined -module -avoid-version -libingen_engine_la_LIBADD = @RAUL_LIBS@ @JACK_LIBS@ @LOSC_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @SLV2_LIBS@ +libingen_engine_la_LIBADD = @RAUL_LIBS@ @JACK_LIBS@ @LIBLO_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @SLV2_LIBS@ @GLIBMM_LIBS@ AM_CFLAGS=-std=c99 @@ -91,6 +98,7 @@ libingen_engine_la_SOURCES = \ Driver.h \ AudioDriver.h \ MidiDriver.h \ + OSCDriver.h \ instantiations.cpp \ events/RegisterClientEvent.h \ events/RegisterClientEvent.cpp \ @@ -200,9 +208,9 @@ libingen_engine_la_SOURCES += \ LV2Node.cpp endif -if WITH_LASH -libingen_engine_la_SOURCES += \ - LashDriver.h \ - LashDriver.cpp -endif +#if WITH_LASH +#libingen_engine_la_SOURCES += \ +# LashDriver.h \ +# LashDriver.cpp +#endif -- cgit v1.2.1