From abc0e39d2e132bb56a5688d8d4d8545052f138a9 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 7 Jan 2008 17:56:49 +0000 Subject: Build fixes. git-svn-id: http://svn.drobilla.net/lad/machina@1035 a436a847-0d15-0410-975c-d299462d15a1 --- src/Makefile.am | 4 ++-- src/engine/Makefile.am | 4 ++-- src/gui/Makefile.am | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 5334bc2..1016317 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,7 @@ endif machina_SOURCES = machina.cpp -AM_CXXFLAGS = @REDLANDMM_CFLAGS@ @RAUL_CFLAGS@ @JACK_CFLAGS@ @GLIBMM_CFLAGS@ -I$(top_srcdir)/machina/src/engine -LDADD = @REDLANDMM_LIBS@ @RAUL_LIBS@ @JACK_LIBS@ @GLIBMM_LIBS@ engine/libmachina.la +AM_CXXFLAGS = @REDLAND_CFLAGS@ @REDLANDMM_CFLAGS@ @RAUL_CFLAGS@ @JACK_CFLAGS@ @GLIBMM_CFLAGS@ -I$(top_srcdir)/machina/src/engine +LDADD = @REDLAND_LIBS@ @REDLANDMM_LIBS@ @RAUL_LIBS@ @JACK_LIBS@ @GLIBMM_LIBS@ engine/libmachina.la midi2machina_SOURCES = midi2machina.cpp diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am index a97ba1b..48a46e6 100644 --- a/src/engine/Makefile.am +++ b/src/engine/Makefile.am @@ -2,8 +2,8 @@ SUBDIRS = machina lib_LTLIBRARIES = libmachina.la -libmachina_la_CXXFLAGS = @EUGENE_CFLAGS@ @REDLANDMM_CFLAGS@ @RAUL_CFLAGS@ @JACK_CFLAGS@ @GLIBMM_CFLAGS@ -libmachina_la_LIBADD = @EUGENE_LIBS@ @REDLANDMM_LIBS@ @RAUL_LIBS@ @JACK_LIBS@ @GLIBMM_LIBS@ +libmachina_la_CXXFLAGS = @EUGENE_CFLAGS@ @REDLAND_CFLAGS@ @REDLANDMM_CFLAGS@ @RAUL_CFLAGS@ @JACK_CFLAGS@ @GLIBMM_CFLAGS@ +libmachina_la_LIBADD = @EUGENE_LIBS@ @REDLAND_LIBS@ @REDLANDMM_LIBS@ @RAUL_LIBS@ @JACK_LIBS@ @GLIBMM_LIBS@ libmachina_la_SOURCES = \ Action.cpp \ diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 9458e89..7197ee8 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -8,6 +8,7 @@ AM_CXXFLAGS = \ @JACK_CFLAGS@ \ @LIBGLADEMM_CFLAGS@ \ @RAUL_CFLAGS@ \ + @REDLAND_CFLAGS@ @REDLANDMM_CFLAGS@ EXTRA_DIST = machina.gladep @@ -41,6 +42,7 @@ machina_gui_LDADD = \ @JACK_LIBS@ \ @LIBGLADEMM_LIBS@ \ @RAUL_LIBS@ \ + @REDLAND_LIBS@ @REDLANDMM_LIBS@ bin_PROGRAMS = machina_gui -- cgit v1.2.1