Commit 698ee5c7 authored by Erik de Castro Lopo's avatar Erik de Castro Lopo
Browse files

Purge MINGW_WINSOCK_LIBS config variable.

This was only needed for ntohl() function which has already been removed.
parent 79828211
......@@ -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)
......
# example_c_decode_file - Simple FLAC file decoder using libFLAC
# Copyright (C) 2007,2008,2009 Josh Coalson
#
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
......@@ -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
# example_c_encode_file - Simple FLAC file encoder using libFLAC
# Copyright (C) 2007,2008,2009 Josh Coalson
#
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
......@@ -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
# example_cpp_decode_file - Simple FLAC file decoder using libFLAC
# Copyright (C) 2007,2008,2009 Josh Coalson
#
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
......@@ -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
# example_cpp_encode_file - Simple FLAC file encoder using libFLAC
# Copyright (C) 2007,2008,2009 Josh Coalson
#
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
......@@ -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 .
......
......@@ -40,7 +40,7 @@ metaflac_SOURCES = \
options.h \
usage.h \
utils.h
metaflac_LDFLAGS =
metaflac_LDFLAGS =
metaflac_LDADD = \
$(top_builddir)/src/share/grabbag/libgrabbag.la \
......@@ -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 \
......
......@@ -22,13 +22,13 @@ EXTRA_DIST = \
AM_CFLAGS = @OGG_CFLAGS@
INCLUDES =
INCLUDES =
noinst_PROGRAMS = test_seeking
test_seeking_LDADD = \
$(top_builddir)/src/libFLAC/libFLAC.la \
@OGG_LIBS@ \
@MINGW_WINSOCK_LIBS@ \
-lm
test_seeking_SOURCES = \
main.c
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment