ref: 02e186fd22db937482d9afffa8908fb92f9c2903
parent: 84e7141f5510349315d79fdddc1bfd7ff797212d
author: Erik de Castro Lopo <erikd@miles>
date: Wed Oct 6 05:14:54 EDT 2004
Fix win32/mingw building of DLLs.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-06 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
+
+ * src/configure.ac src/makefile.am
+ Finally fix the bulding of DLLs on Win32/MinGW.
+
+ * tests/makefile.am
+ Fix running of tests on Win32/MinGW.
+
2004-09-30 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* configure.ac Win32/Makefile.mingw.in
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
AC_INIT
AC_CONFIG_SRCDIR([src/samplerate.c])
AC_CANONICAL_TARGET([])
-AM_INIT_AUTOMAKE(libsamplerate,0.1.3pre1)
+AM_INIT_AUTOMAKE(libsamplerate,0.1.3pre2)
AM_CONFIG_HEADER(src/config.h)
#------------------------------------------------------------------------------------
@@ -302,19 +302,11 @@
Pkgconfig directory : ......... ${prefix}/lib/pkgconfig])
-if test "x-$build_os-$host_os-$target_os" = x-mingw32-mingw32-mingw32 ; then
- echo "Using a Win32 specific Makefile."
- cp -f Win32/Makefile.mingw Makefile
- exit 0
- fi
-
if test x$prefix != "x/usr" ; then
echo "Compiling some other packages against ${PACKAGE} may require " echo -e "the addition of \"${prefix}/lib/pkgconfig\" to the "echo -e "PKG_CONFIG_PATH environment variable.\n"
fi
-
-
ifelse(dnl
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -41,7 +41,7 @@
src_evaluate_CFLAGS = @SNDFILE_CFLAGS@ @FFTW3_CFLAGS@
src_evaluate_LDADD = $(SNDFILE_LIBS) $(FFTW3_LIBS)
-benchmark_CFLAGS = $(AM_CFLAGS)
+benchmark_CFLAGS = $(AM_CFLAGS) @FFTW3_CFLAGS@
benchmark_SOURCES = benchmark.c util.c calc_snr.c
benchmark_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS)
@@ -50,14 +50,14 @@
check: $(noinst_PROGRAMS)
date
uname -a
- ./misc_test$(EXEEXT)
- ./termination_test$(EXEEXT)
- ./simple_test$(EXEEXT)
- ./callback_test$(EXEEXT)
- ./reset_test$(EXEEXT)
- ./multi_channel_test$(EXEEXT)
- ./float_short_test$(EXEEXT)
- ./snr_bw_test$(EXEEXT)
+ ./misc_test
+ ./termination_test
+ ./simple_test
+ ./callback_test
+ ./reset_test
+ ./multi_channel_test
+ ./float_short_test
+ ./snr_bw_test
@echo "-----------------------------------------------------------------"
@echo " ${PACKAGE}-${VERSION} passed all tests."@echo "-----------------------------------------------------------------"