diff options
| author | David Robillard <d@drobilla.net> | 2006-10-05 02:40:43 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-10-05 02:40:43 +0000 |
| commit | d185c37bf049afdd006351a3707662a19677ab37 (patch) | |
| tree | 98073de0c3ade0acaf3caac2b6692c08cc5bdcfe /src/progs | |
| parent | 30cb85c307b4c1273791721a782337742ade222c (diff) | |
| download | ingen-d185c37bf049afdd006351a3707662a19677ab37.tar.gz ingen-d185c37bf049afdd006351a3707662a19677ab37.tar.bz2 ingen-d185c37bf049afdd006351a3707662a19677ab37.zip | |
More build system fixes, everything now builds against the local copy if toplevel scripts are used.
git-svn-id: http://svn.drobilla.net/lad/ingen@158 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/progs')
| -rw-r--r-- | src/progs/ingenuity/Makefile.am | 4 | ||||
| -rw-r--r-- | src/progs/patch_loader/Makefile.am | 4 | ||||
| -rw-r--r-- | src/progs/server/Makefile.am | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/progs/ingenuity/Makefile.am b/src/progs/ingenuity/Makefile.am index 24b818cb..85a23011 100644 --- a/src/progs/ingenuity/Makefile.am +++ b/src/progs/ingenuity/Makefile.am @@ -6,8 +6,8 @@ MAINTAINERCLEANFILES = Makefile.in sharefilesdir = $(pkgdatadir) dist_sharefiles_DATA = ingenuity.glade om-icon.png -ingenuity_CXXFLAGS = -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/client -DPKGDATADIR=\"$(pkgdatadir)\" @GTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @LOSC_CFLAGS@ @LASH_CFLAGS@ @FLOWCANVAS_CFLAGS@ -ingenuity_LDADD = @GTKMM_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @LOSC_LIBS@ @LASH_LIBS@ @FLOWCANVAS_LIBS@ ../../libs/client/libingenclient.la +ingenuity_CXXFLAGS = -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/client -DPKGDATADIR=\"$(pkgdatadir)\" @GTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @LOSC_CFLAGS@ @LASH_CFLAGS@ @FLOWCANVAS_CFLAGS@ @RAUL_CFLAGS@ +ingenuity_LDADD = @GTKMM_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @LOSC_LIBS@ @LASH_LIBS@ @FLOWCANVAS_LIBS@ @RAUL_LIBS@ ../../libs/client/libingenclient.la ingenuity_DEPENDENCIES = ../../libs/client/libingenclient.la # FIXME: make engine have a separate include dir diff --git a/src/progs/patch_loader/Makefile.am b/src/progs/patch_loader/Makefile.am index 33947a36..5b5d5db9 100644 --- a/src/progs/patch_loader/Makefile.am +++ b/src/progs/patch_loader/Makefile.am @@ -1,7 +1,7 @@ EXTRA_DIST = README -ingen_load_CXXFLAGS = -I$(top_srcdir)/src/libs/client -I$(top_srcdir)/src/common @LSIGCPP_CFLAGS@ -ingen_load_LDADD = ../../libs/client/libingenclient.la +ingen_load_CXXFLAGS = -I$(top_srcdir)/src/libs/client -I$(top_srcdir)/src/common @LSIGCPP_CFLAGS@ @RAUL_CFLAGS@ +ingen_load_LDADD = ../../libs/client/libingenclient.la @RAUL_LIBS@ @LSIGCPP_LIBS@ bin_PROGRAMS = ingen_load diff --git a/src/progs/server/Makefile.am b/src/progs/server/Makefile.am index e2a38742..9388b12a 100644 --- a/src/progs/server/Makefile.am +++ b/src/progs/server/Makefile.am @@ -1,4 +1,4 @@ -AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine -I$(top_srcdir)/src/libs/engine/events +AM_CXXFLAGS = @RAUL_CFLAGS@ @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine -I$(top_srcdir)/src/libs/engine/events MAINTAINERCLEANFILES = Makefile.in |