diff options
| -rw-r--r-- | src/share/Makefile.am | 1 | ||||
| -rw-r--r-- | src/test_libFLAC/Makefile.am | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/share/Makefile.am b/src/share/Makefile.am index 32c39312..412a7dff 100644 --- a/src/share/Makefile.am +++ b/src/share/Makefile.am @@ -44,7 +44,6 @@ noinst_LTLIBRARIES = \ if OS_IS_WINDOWS win_utf8_io_libwin_utf8_io_la_SOURCES = win_utf8_io/win_utf8_io.c libwin_utf8_io = win_utf8_io/libwin_utf8_io.la -win_utf8_io_libwin_utf8_io_la_LIBADD = $(top_builddir)/src/libFLAC/libFLAC.la -lm else win_utf8_io_libwin_utf8_io_la_SOURCES = libwin_utf8_io = diff --git a/src/test_libFLAC/Makefile.am b/src/test_libFLAC/Makefile.am index 5b82f494..bbbf6c6c 100644 --- a/src/test_libFLAC/Makefile.am +++ b/src/test_libFLAC/Makefile.am @@ -19,14 +19,15 @@ EXTRA_DIST = \ CMakeLists.txt -AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src/libFLAC/include - check_PROGRAMS = test_libFLAC if OS_IS_WINDOWS win_utf8_lib = $(top_builddir)/src/share/win_utf8_io/libwin_utf8_io.la +flac__no_dll = -DFLAC__NO_DLL endif +AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src/libFLAC/include $(flac__no_dll) + test_libFLAC_LDADD = \ $(top_builddir)/src/share/grabbag/libgrabbag.la \ $(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \ |