From 698ee5c7ede9d3cb1a18a32962af5711c40e85aa Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Sun, 5 Feb 2012 16:25:22 +1100 Subject: [PATCH] Purge MINGW_WINSOCK_LIBS config variable. This was only needed for ntohl() function which has already been removed. --- configure.ac | 4 ---- examples/c/decode/file/Makefile.am | 8 ++++---- examples/c/encode/file/Makefile.am | 8 ++++---- examples/cpp/decode/file/Makefile.am | 8 ++++---- examples/cpp/encode/file/Makefile.am | 8 ++++---- src/flac/Makefile.am | 1 - src/libFLAC/Makefile.am | 2 +- src/metaflac/Makefile.am | 3 +-- src/test_libFLAC++/Makefile.am | 2 +- src/test_libFLAC/Makefile.am | 2 +- src/test_seeking/Makefile.am | 4 ++-- 11 files changed, 22 insertions(+), 28 deletions(-) diff --git a/configure.ac b/configure.ac index 3d875c19..12fb9108 100644 --- a/configure.ac +++ b/configure.ac @@ -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) diff --git a/examples/c/decode/file/Makefile.am b/examples/c/decode/file/Makefile.am index abde0c71..11a48bf6 100644 --- a/examples/c/decode/file/Makefile.am +++ b/examples/c/decode/file/Makefile.am @@ -1,16 +1,16 @@ # 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 diff --git a/examples/c/encode/file/Makefile.am b/examples/c/encode/file/Makefile.am index 9540d05f..5ae7a639 100644 --- a/examples/c/encode/file/Makefile.am +++ b/examples/c/encode/file/Makefile.am @@ -1,16 +1,16 @@ # 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 diff --git a/examples/cpp/decode/file/Makefile.am b/examples/cpp/decode/file/Makefile.am index 441ea929..7b807e60 100644 --- a/examples/cpp/decode/file/Makefile.am +++ b/examples/cpp/decode/file/Makefile.am @@ -1,16 +1,16 @@ # 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 diff --git a/examples/cpp/encode/file/Makefile.am b/examples/cpp/encode/file/Makefile.am index ec48ba04..42589f06 100644 --- a/examples/cpp/encode/file/Makefile.am +++ b/examples/cpp/encode/file/Makefile.am @@ -1,16 +1,16 @@ # 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 diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am index 55aca3a9..17cfcce5 100644 --- a/src/flac/Makefile.am +++ b/src/flac/Makefile.am @@ -54,5 +54,4 @@ flac_LDADD = \ $(top_builddir)/src/libFLAC/libFLAC.la \ @OGG_LIBS@ \ @LIBICONV@ \ - @MINGW_WINSOCK_LIBS@ \ -lm diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am index 1653381f..636d4abc 100644 --- a/src/libFLAC/Makefile.am +++ b/src/libFLAC/Makefile.am @@ -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 . diff --git a/src/metaflac/Makefile.am b/src/metaflac/Makefile.am index b36675b6..76feb384 100644 --- a/src/metaflac/Makefile.am +++ b/src/metaflac/Makefile.am @@ -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 diff --git a/src/test_libFLAC++/Makefile.am b/src/test_libFLAC++/Makefile.am index 27b924a6..07132216 100644 --- a/src/test_libFLAC++/Makefile.am +++ b/src/test_libFLAC++/Makefile.am @@ -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 \ diff --git a/src/test_libFLAC/Makefile.am b/src/test_libFLAC/Makefile.am index 8f04b7f8..8eb9cfa3 100644 --- a/src/test_libFLAC/Makefile.am +++ b/src/test_libFLAC/Makefile.am @@ -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 \ diff --git a/src/test_seeking/Makefile.am b/src/test_seeking/Makefile.am index daea2059..8be7579b 100644 --- a/src/test_seeking/Makefile.am +++ b/src/test_seeking/Makefile.am @@ -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