mirror of
https://github.com/claunia/flac.git
synced 2025-12-16 18:54:26 +00:00
Purge MINGW_WINSOCK_LIBS config variable.
This was only needed for ntohl() function which has already been removed.
This commit is contained in:
@@ -107,16 +107,12 @@ case "$host" in
|
||||
*-*-cygwin|*mingw*)
|
||||
# define this variable for enabling strict exports with libtool; for now, it's only supported by Win32
|
||||
LT_NO_UNDEFINED="-no-undefined"
|
||||
# -lwsock32 only needed because of ntohl() usage, can get rid of after that's gone:
|
||||
MINGW_WINSOCK_LIBS=-lwsock32
|
||||
;;
|
||||
*)
|
||||
LT_NO_UNDEFINED=
|
||||
MINGW_WINSOCK_LIBS=
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(LT_NO_UNDEFINED)
|
||||
AC_SUBST(MINGW_WINSOCK_LIBS)
|
||||
|
||||
case "$host" in
|
||||
*-pc-linux-gnu)
|
||||
|
||||
@@ -24,6 +24,6 @@ noinst_PROGRAMS = example_c_decode_file
|
||||
example_c_decode_file_LDADD = \
|
||||
$(top_builddir)/src/libFLAC/libFLAC.la \
|
||||
@OGG_LIBS@ \
|
||||
@MINGW_WINSOCK_LIBS@ \
|
||||
-lm
|
||||
|
||||
example_c_decode_file_SOURCES = main.c
|
||||
|
||||
@@ -24,6 +24,6 @@ noinst_PROGRAMS = example_c_encode_file
|
||||
example_c_encode_file_LDADD = \
|
||||
$(top_builddir)/src/libFLAC/libFLAC.la \
|
||||
@OGG_LIBS@ \
|
||||
@MINGW_WINSOCK_LIBS@ \
|
||||
-lm
|
||||
|
||||
example_c_encode_file_SOURCES = main.c
|
||||
|
||||
@@ -25,6 +25,6 @@ example_cpp_decode_file_LDADD = \
|
||||
$(top_builddir)/src/libFLAC++/libFLAC++.la \
|
||||
$(top_builddir)/src/libFLAC/libFLAC.la \
|
||||
@OGG_LIBS@ \
|
||||
@MINGW_WINSOCK_LIBS@ \
|
||||
-lm
|
||||
|
||||
example_cpp_decode_file_SOURCES = main.cpp
|
||||
|
||||
@@ -25,6 +25,6 @@ example_cpp_encode_file_LDADD = \
|
||||
$(top_builddir)/src/libFLAC++/libFLAC++.la \
|
||||
$(top_builddir)/src/libFLAC/libFLAC.la \
|
||||
@OGG_LIBS@ \
|
||||
@MINGW_WINSOCK_LIBS@ \
|
||||
-lm
|
||||
|
||||
example_cpp_encode_file_SOURCES = main.cpp
|
||||
|
||||
@@ -54,5 +54,4 @@ flac_LDADD = \
|
||||
$(top_builddir)/src/libFLAC/libFLAC.la \
|
||||
@OGG_LIBS@ \
|
||||
@LIBICONV@ \
|
||||
@MINGW_WINSOCK_LIBS@ \
|
||||
-lm
|
||||
|
||||
@@ -69,7 +69,7 @@ endif
|
||||
endif
|
||||
endif
|
||||
|
||||
libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@ @MINGW_WINSOCK_LIBS@
|
||||
libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@
|
||||
|
||||
SUBDIRS = $(ARCH_SUBDIRS) include .
|
||||
|
||||
|
||||
@@ -50,5 +50,4 @@ metaflac_LDADD = \
|
||||
$(top_builddir)/src/libFLAC/libFLAC.la \
|
||||
@OGG_LIBS@ \
|
||||
@LIBICONV@ \
|
||||
@MINGW_WINSOCK_LIBS@ \
|
||||
-lm
|
||||
|
||||
@@ -28,8 +28,8 @@ test_libFLAC___LDADD = \
|
||||
$(top_builddir)/src/libFLAC++/libFLAC++.la \
|
||||
$(top_builddir)/src/libFLAC/libFLAC.la \
|
||||
@OGG_LIBS@ \
|
||||
@MINGW_WINSOCK_LIBS@ \
|
||||
-lm
|
||||
|
||||
test_libFLAC___SOURCES = \
|
||||
decoders.cpp \
|
||||
encoders.cpp \
|
||||
|
||||
@@ -29,8 +29,8 @@ test_libFLAC_LDADD = \
|
||||
$(top_builddir)/src/test_libs_common/libtest_libs_common.la \
|
||||
$(top_builddir)/src/libFLAC/libFLAC.la \
|
||||
@OGG_LIBS@ \
|
||||
@MINGW_WINSOCK_LIBS@ \
|
||||
-lm
|
||||
|
||||
test_libFLAC_SOURCES = \
|
||||
bitwriter.c \
|
||||
decoders.c \
|
||||
|
||||
@@ -28,7 +28,7 @@ noinst_PROGRAMS = test_seeking
|
||||
test_seeking_LDADD = \
|
||||
$(top_builddir)/src/libFLAC/libFLAC.la \
|
||||
@OGG_LIBS@ \
|
||||
@MINGW_WINSOCK_LIBS@ \
|
||||
-lm
|
||||
|
||||
test_seeking_SOURCES = \
|
||||
main.c
|
||||
|
||||
Reference in New Issue
Block a user