Unified · Split
| @@ -1,3 +1,11 @@ | |||
| 1 | 2004-10-06 Erik de Castro Lopo <erikd AT mega-nerd DOT com> | ||
| 2 | |||
| 3 | * src/configure.ac src/makefile.am | ||
| 4 | Finally fix the bulding of DLLs on Win32/MinGW. | ||
| 5 | |||
| 6 | * tests/makefile.am | ||
| 7 | Fix running of tests on Win32/MinGW. | ||
| 8 | |||
| 1 | 2004-09-30 Erik de Castro Lopo <erikd AT mega-nerd DOT com> | 9 | 2004-09-30 Erik de Castro Lopo <erikd AT mega-nerd DOT com> |
| 2 | 10 | ||
| 3 | * configure.ac Win32/Makefile.mingw.in | 11 | * configure.ac Win32/Makefile.mingw.in |
| @@ -6,7 +6,7 @@ AC_PREREQ(2.54) · 5 unmodified lines | |||
| 6 | AC_INIT | 6 | AC_INIT |
| 7 | AC_CONFIG_SRCDIR([src/samplerate.c]) | 7 | AC_CONFIG_SRCDIR([src/samplerate.c]) |
| 8 | AC_CANONICAL_TARGET([]) | 8 | AC_CANONICAL_TARGET([]) |
| 9 | AM_INIT_AUTOMAKE(libsamplerate,0.1.3pre1) | 9 | AM_INIT_AUTOMAKE(libsamplerate,0.1.3pre2) |
| 10 | AM_CONFIG_HEADER(src/config.h) | 10 | AM_CONFIG_HEADER(src/config.h) |
| 11 | 11 | ||
| 12 | #------------------------------------------------------------------------------------ | 12 | #------------------------------------------------------------------------------------ |
| @@ -302,20 +302,12 @@ AC_MSG_RESULT([ Installation directories : · 289 unmodified lines | |||
| 302 | Pkgconfig directory : ......... ${prefix}/lib/pkgconfig | 302 | Pkgconfig directory : ......... ${prefix}/lib/pkgconfig |
| 303 | ]) | 303 | ]) |
| 304 | 304 | ||
| 305 | if test "x-$build_os-$host_os-$target_os" = x-mingw32-mingw32-mingw32 ; then | ||
| 306 | echo "Using a Win32 specific Makefile." | ||
| 307 | cp -f Win32/Makefile.mingw Makefile | ||
| 308 | exit 0 | ||
| 309 | fi | ||
| 310 | |||
| 311 | if test x$prefix != "x/usr" ; then | 305 | if test x$prefix != "x/usr" ; then |
| 312 | echo "Compiling some other packages against ${PACKAGE} may require " | 306 | echo "Compiling some other packages against ${PACKAGE} may require " |
| 313 | echo -e "the addition of \"${prefix}/lib/pkgconfig\" to the " | 307 | echo -e "the addition of \"${prefix}/lib/pkgconfig\" to the " |
| 314 | echo -e "PKG_CONFIG_PATH environment variable.\n" | 308 | echo -e "PKG_CONFIG_PATH environment variable.\n" |
| 315 | fi | 309 | fi |
| 316 | 310 | ||
| 317 | |||
| 318 | |||
| 319 | ifelse(dnl | 311 | ifelse(dnl |
| 320 | 312 | ||
| 321 | Do not edit or modify anything in this comment block. | 313 | Do not edit or modify anything in this comment block. |
| @@ -41,7 +41,7 @@ src_evaluate_SOURCES = src-evaluate.c calc_snr.c util.c · 40 unmodified lines | |||
| 41 | src_evaluate_CFLAGS = @SNDFILE_CFLAGS@ @FFTW3_CFLAGS@ | 41 | src_evaluate_CFLAGS = @SNDFILE_CFLAGS@ @FFTW3_CFLAGS@ |
| 42 | src_evaluate_LDADD = $(SNDFILE_LIBS) $(FFTW3_LIBS) | 42 | src_evaluate_LDADD = $(SNDFILE_LIBS) $(FFTW3_LIBS) |
| 43 | 43 | ||
| 44 | benchmark_CFLAGS = $(AM_CFLAGS) | 44 | benchmark_CFLAGS = $(AM_CFLAGS) @FFTW3_CFLAGS@ |
| 45 | benchmark_SOURCES = benchmark.c util.c calc_snr.c | 45 | benchmark_SOURCES = benchmark.c util.c calc_snr.c |
| 46 | benchmark_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS) | 46 | benchmark_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS) |
| 47 | 47 | ||
| @@ -50,14 +50,14 @@ benchmark_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS) · 2 unmodified lines | |||
| 50 | check: $(noinst_PROGRAMS) | 50 | check: $(noinst_PROGRAMS) |
| 51 | date | 51 | date |
| 52 | uname -a | 52 | uname -a |
| 53 | ./misc_test$(EXEEXT) | 53 | ./misc_test |
| 54 | ./termination_test$(EXEEXT) | 54 | ./termination_test |
| 55 | ./simple_test$(EXEEXT) | 55 | ./simple_test |
| 56 | ./callback_test$(EXEEXT) | 56 | ./callback_test |
| 57 | ./reset_test$(EXEEXT) | 57 | ./reset_test |
| 58 | ./multi_channel_test$(EXEEXT) | 58 | ./multi_channel_test |
| 59 | ./float_short_test$(EXEEXT) | 59 | ./float_short_test |
| 60 | ./snr_bw_test$(EXEEXT) | 60 | ./snr_bw_test |
| 61 | @echo "-----------------------------------------------------------------" | 61 | @echo "-----------------------------------------------------------------" |
| 62 | @echo " ${PACKAGE}-${VERSION} passed all tests." | 62 | @echo " ${PACKAGE}-${VERSION} passed all tests." |
| 63 | @echo "-----------------------------------------------------------------" | 63 | @echo "-----------------------------------------------------------------" |