From 6ff2870f78123eceecedbd06b174584328f82df0 Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Sat, 3 Jun 2006 19:55:57 +0000 Subject: [PATCH] use top_{build,src}dir instead of ../ use top_{build,src}dir instead of ../ --- examples/Makefile.am | 4 ++-- examples/tests/Makefile.am | 5 ++--- ext/Makefile.am | 2 +- plugins/puredata/Makefile.am | 2 +- python/aubio/Makefile.am | 8 +++++--- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index d14afb4a..b1d8950e 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -3,8 +3,8 @@ SUBDIRS = tests endif # global flags -AM_CFLAGS = -DAUBIO_PREFIX=\"$(prefix)\" -I$(srcdir)/../src -I$(srcdir)/../ext @LADCCA_CFLAGS@ @FFTWLIB_CFLAGS@ -AM_LDFLAGS = -L../src -L../ext @LADCCA_LIBS@ -laubioext -laubio +AM_CFLAGS = -DAUBIO_PREFIX=\"$(prefix)\" -I$(top_srcdir)/src -I$(top_srcdir)/ext @LADCCA_CFLAGS@ @FFTWLIB_CFLAGS@ +AM_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/ext -laubioext -laubio @LADCCA_LIBS@ #AM_SOURCES = utils.c # add your programs to this list diff --git a/examples/tests/Makefile.am b/examples/tests/Makefile.am index b521cabb..21e60ff6 100644 --- a/examples/tests/Makefile.am +++ b/examples/tests/Makefile.am @@ -1,6 +1,5 @@ -AM_CFLAGS = -I$(srcdir)/../../src -I$(srcdir)/../../ext @LADCCA_CFLAGS@ -AM_LDFLAGS = -L../../src -L../../ext @LADCCA_LIBS@ -laubioext -laubio -LDADD = @JACK_LIBS@ +AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/ext @LADCCA_CFLAGS@ +AM_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/ext -laubioext -laubio @JACK_LIBS@ @LADCCA_LIBS@ bin_PROGRAMS = \ test-fft \ diff --git a/ext/Makefile.am b/ext/Makefile.am index 28ef9772..f1dbdfa9 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -42,6 +42,6 @@ libaubioext_la_SOURCES = aubioext.h \ midi/midi_driver.h \ midi/midi_driver.c -AM_CFLAGS = -I$(srcdir)/../src @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ @ALSA_CFLAGS@ @LADCCA_CFLAGS@ +AM_CFLAGS = -I$(top_srcdir)/src @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ @ALSA_CFLAGS@ @LADCCA_CFLAGS@ libaubioext_la_LIBADD = @SNDLIB_LIBS@ @JACK_LIBS@ @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @ALSA_LIBS@ @LADCCA_LIBS@ @LTLIBOBJS@ libaubioext_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ diff --git a/plugins/puredata/Makefile.am b/plugins/puredata/Makefile.am index 2d34d663..c6016f41 100644 --- a/plugins/puredata/Makefile.am +++ b/plugins/puredata/Makefile.am @@ -30,7 +30,7 @@ LIBTOOL=$(SHELL) $(srcdir)/libtoolkludge INCLUDES = -I$(top_srcdir)/src -I$(pdincludedir) AM_CFLAGS = -DPD -fPIC -DPIC -AM_LDFLAGS = -L../../src/.libs -laubio -export_dynamic -shared +AM_LDFLAGS = -L$(top_builddir)/src/.libs -laubio -export_dynamic -shared ## Install the documentation. diff --git a/python/aubio/Makefile.am b/python/aubio/Makefile.am index 689e9038..97da3bda 100644 --- a/python/aubio/Makefile.am +++ b/python/aubio/Makefile.am @@ -48,16 +48,18 @@ NOWARN_CFLAGS = -Wno-missing-prototypes -Wno-missing-declarations \ -Wno-strict-aliasing AM_CFLAGS = $(SWCFLAGS) -fPIC -DPIC \ - -I../../src -I$(srcdir)/../../src -I$(srcdir)/../../ext \ + -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_srcdir)/ext \ -I/usr/include/python${PYTHON_VERSION} \ -I${prefix}/include/python${PYTHON_VERSION} \ -I/usr/include \ -I${prefix}/include -AM_LDFLAGS = $(SWLDFLAGS) -L../../ext/.libs -laubioext -L../../src/.libs -laubio +AM_LDFLAGS = $(SWLDFLAGS) \ + -L$(top_builddir)/ext/.libs -laubioext \ + -L$(top_builddir)/src/.libs -laubio aubio_wrap.c: - $(SWIG) -outdir . -o aubio_wrap.c -python $(srcdir)/../../swig/aubio.i + $(SWIG) -outdir . -o aubio_wrap.c -python $(top_srcdir)/swig/aubio.i _aubiowrapper.so: aubio_wrap.c $(CC) $(AM_CFLAGS) $(CFLAGS) $(NOWARN_CFLAGS) -c aubio_wrap.c -- 2.26.2