Merge 2e3e63789f into 45f6f7e85d

Makefile

@@ -18,6 +18,7 @@ DEPS += $(libsamplerate)
 $(libsamplerate):
 	cd dep && $(WGET) http://www.mega-nerd.com/SRC/libsamplerate-0.1.9.tar.gz
 	cd dep && $(UNTAR) libsamplerate-0.1.9.tar.gz
+	cd dep/libsamplerate-0.1.9 && patch -p0 < ../../libsamplerate_Makefile.in.diff
 	cd dep/libsamplerate-0.1.9 && $(CONFIGURE)
 	cd dep/libsamplerate-0.1.9/src && $(MAKE)
 	cd dep/libsamplerate-0.1.9/src && $(MAKE) install

libsamplerate_Makefile.in.diff

@@ -0,0 +1,11 @@
+--- examples/Makefile.in.orig	2011-08-15 22:12:30.000000000 +1000
++++ examples/Makefile.in	2012-03-25 15:31:07.000000000 +1100
+@@ -56,7 +56,7 @@
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ am__installdirs = "$(DESTDIR)$(bindir)"
+-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
++PROGRAMS = $(bin_PROGRAMS)
+ am_sndfile_resample_OBJECTS = sndfile-resample.$(OBJEXT)
+ sndfile_resample_OBJECTS = $(am_sndfile_resample_OBJECTS)
+ am__DEPENDENCIES_1 =