claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Purge MINGW_WINSOCK_LIBS config variable.

Browse Source 
This was only needed for ntohl() function which has already been removed.
This commit is contained in:
Erik de Castro Lopo
2012-02-05 16:25:22 +11:00
parent 79828211ed
commit 698ee5c7ed
11 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -107,16 +107,12 @@ case "$host" in
*-*-cygwin|*mingw*) *-*-cygwin|*mingw*)
# define this variable for enabling strict exports with libtool; for now, it's only supported by Win32 # define this variable for enabling strict exports with libtool; for now, it's only supported by Win32
LT_NO_UNDEFINED="-no-undefined" 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= LT_NO_UNDEFINED=
MINGW_WINSOCK_LIBS=
;; ;;
esac esac
AC_SUBST(LT_NO_UNDEFINED) AC_SUBST(LT_NO_UNDEFINED)
AC_SUBST(MINGW_WINSOCK_LIBS)
case "$host" in case "$host" in
*-pc-linux-gnu) *-pc-linux-gnu)

8
examples/c/decode/file/Makefile.am
View File

@@ -1,16 +1,16 @@
# example_c_decode_file - Simple FLAC file decoder using libFLAC # example_c_decode_file - Simple FLAC file decoder using libFLAC
# Copyright (C) 2007,2008,2009 Josh Coalson # Copyright (C) 2007,2008,2009 Josh Coalson
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2 # as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version. # of the License, or (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # 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 = \ example_c_decode_file_LDADD = \
$(top_builddir)/src/libFLAC/libFLAC.la \ $(top_builddir)/src/libFLAC/libFLAC.la \
@OGG_LIBS@ \ @OGG_LIBS@ \
@MINGW_WINSOCK_LIBS@ \
-lm -lm
example_c_decode_file_SOURCES = main.c example_c_decode_file_SOURCES = main.c

8
examples/c/encode/file/Makefile.am
View File

@@ -1,16 +1,16 @@
# example_c_encode_file - Simple FLAC file encoder using libFLAC # example_c_encode_file - Simple FLAC file encoder using libFLAC
# Copyright (C) 2007,2008,2009 Josh Coalson # Copyright (C) 2007,2008,2009 Josh Coalson
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2 # as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version. # of the License, or (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # 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 = \ example_c_encode_file_LDADD = \
$(top_builddir)/src/libFLAC/libFLAC.la \ $(top_builddir)/src/libFLAC/libFLAC.la \
@OGG_LIBS@ \ @OGG_LIBS@ \
@MINGW_WINSOCK_LIBS@ \
-lm -lm
example_c_encode_file_SOURCES = main.c example_c_encode_file_SOURCES = main.c

8
examples/cpp/decode/file/Makefile.am
View File

@@ -1,16 +1,16 @@
# example_cpp_decode_file - Simple FLAC file decoder using libFLAC # example_cpp_decode_file - Simple FLAC file decoder using libFLAC
# Copyright (C) 2007,2008,2009 Josh Coalson # Copyright (C) 2007,2008,2009 Josh Coalson
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2 # as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version. # of the License, or (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # 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 \
$(top_builddir)/src/libFLAC/libFLAC.la \ $(top_builddir)/src/libFLAC/libFLAC.la \
@OGG_LIBS@ \ @OGG_LIBS@ \
@MINGW_WINSOCK_LIBS@ \
-lm -lm
example_cpp_decode_file_SOURCES = main.cpp example_cpp_decode_file_SOURCES = main.cpp

8
examples/cpp/encode/file/Makefile.am
View File

@@ -1,16 +1,16 @@
# example_cpp_encode_file - Simple FLAC file encoder using libFLAC # example_cpp_encode_file - Simple FLAC file encoder using libFLAC
# Copyright (C) 2007,2008,2009 Josh Coalson # Copyright (C) 2007,2008,2009 Josh Coalson
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2 # as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version. # of the License, or (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # 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 \
$(top_builddir)/src/libFLAC/libFLAC.la \ $(top_builddir)/src/libFLAC/libFLAC.la \
@OGG_LIBS@ \ @OGG_LIBS@ \
@MINGW_WINSOCK_LIBS@ \
-lm -lm
example_cpp_encode_file_SOURCES = main.cpp example_cpp_encode_file_SOURCES = main.cpp

1
src/flac/Makefile.am
View File

@@ -54,5 +54,4 @@ flac_LDADD = \
$(top_builddir)/src/libFLAC/libFLAC.la \ $(top_builddir)/src/libFLAC/libFLAC.la \
@OGG_LIBS@ \ @OGG_LIBS@ \
@LIBICONV@ \ @LIBICONV@ \
@MINGW_WINSOCK_LIBS@ \
-lm -lm

2
src/libFLAC/Makefile.am
View File

@@ -69,7 +69,7 @@ endif
endif 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 . SUBDIRS = $(ARCH_SUBDIRS) include .

3
src/metaflac/Makefile.am
View File

@@ -40,7 +40,7 @@ metaflac_SOURCES = \
options.h \ options.h \
usage.h \ usage.h \
utils.h utils.h
metaflac_LDFLAGS = metaflac_LDFLAGS =
metaflac_LDADD = \ metaflac_LDADD = \
$(top_builddir)/src/share/grabbag/libgrabbag.la \ $(top_builddir)/src/share/grabbag/libgrabbag.la \
@@ -50,5 +50,4 @@ metaflac_LDADD = \
$(top_builddir)/src/libFLAC/libFLAC.la \ $(top_builddir)/src/libFLAC/libFLAC.la \
@OGG_LIBS@ \ @OGG_LIBS@ \
@LIBICONV@ \ @LIBICONV@ \
@MINGW_WINSOCK_LIBS@ \
-lm -lm

2
src/test_libFLAC++/Makefile.am
View File

@@ -28,8 +28,8 @@ test_libFLAC___LDADD = \
$(top_builddir)/src/libFLAC++/libFLAC++.la \ $(top_builddir)/src/libFLAC++/libFLAC++.la \
$(top_builddir)/src/libFLAC/libFLAC.la \ $(top_builddir)/src/libFLAC/libFLAC.la \
@OGG_LIBS@ \ @OGG_LIBS@ \
@MINGW_WINSOCK_LIBS@ \
-lm -lm
test_libFLAC___SOURCES = \ test_libFLAC___SOURCES = \
decoders.cpp \ decoders.cpp \
encoders.cpp \ encoders.cpp \

2
src/test_libFLAC/Makefile.am
View File

@@ -29,8 +29,8 @@ test_libFLAC_LDADD = \
$(top_builddir)/src/test_libs_common/libtest_libs_common.la \ $(top_builddir)/src/test_libs_common/libtest_libs_common.la \
$(top_builddir)/src/libFLAC/libFLAC.la \ $(top_builddir)/src/libFLAC/libFLAC.la \
@OGG_LIBS@ \ @OGG_LIBS@ \
@MINGW_WINSOCK_LIBS@ \
-lm -lm
test_libFLAC_SOURCES = \ test_libFLAC_SOURCES = \
bitwriter.c \ bitwriter.c \
decoders.c \ decoders.c \

4
src/test_seeking/Makefile.am
View File

@@ -22,13 +22,13 @@ EXTRA_DIST = \
AM_CFLAGS = @OGG_CFLAGS@ AM_CFLAGS = @OGG_CFLAGS@
INCLUDES = INCLUDES =
noinst_PROGRAMS = test_seeking noinst_PROGRAMS = test_seeking
test_seeking_LDADD = \ test_seeking_LDADD = \
$(top_builddir)/src/libFLAC/libFLAC.la \ $(top_builddir)/src/libFLAC/libFLAC.la \
@OGG_LIBS@ \ @OGG_LIBS@ \
@MINGW_WINSOCK_LIBS@ \
-lm -lm
test_seeking_SOURCES = \ test_seeking_SOURCES = \
main.c main.c