use top_{build,src}dir instead of ../

use top_{build,src}dir instead of ../

diff --git a/examples/Makefile.am b/examples/Makefile.am
index d14afb4a39cd6f230178cb36b0b31e85be54058a..b1d8950e81e21c04a7ffc9e87add753a178c3a13 100644 (file)
--- 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 b521cabbca3e0d077d533370becda9f859af2aa2..21e60ff6968071a5146264324be9228074ab9895 100644 (file)
--- 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 28ef977242c3a2a520ba613b66bd499de6c4add8..f1dbdfa947aa3b1fff292d4593a6c8884b0540fe 100644 (file)
--- 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 2d34d663b0960dfd40f39399cfcc26c717128fb0..c6016f4192e001080c2d58f34bd0af5073f18cee 100644 (file)
--- 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 689e90380e4a235c27f340e4ff64651999ca645e..97da3bdade9c0886a6d7bacd84a9260fe5dd4546 100644 (file)
--- 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