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

Use config.h rather than passing all defs in CFLAGS

Browse Source
This commit is contained in:
Matt Zimmerman
2002-10-10 16:51:06 +00:00
parent 87099c08f3
commit e525917900
20 changed files with 71 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/flac/Makefile.am
View File

@@ -16,7 +16,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
bin_PROGRAMS = flac
CFLAGS = @CFLAGS@ @OGG_CFLAGS@
CFLAGS = @ CFLAGS@ @ OGG_CFLAGS@
if FLaC__HAS_OGG
NEED_OGGFLAC_LIB = $(top_builddir)/src/libOggFLAC/libOggFLAC.la
@@ -39,4 +39,4 @@ flac_SOURCES = \
file.h \
vorbiscomment.h
flac_LDADD = $(NEED_OGGFLAC_LIB) $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ @SHARE_LIBS@ @LIBICONV@ -lm
flac_LDADD = $(NEED_OGGFLAC_LIB) $(top_builddir)/src/libFLAC/libFLAC.la @ OGG_LIBS@ @ SHARE_LIBS@ @ LIBICONV@ -lm

5
src/flac/decode.c
View File

@@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#if defined _WIN32 && !defined __CYGWIN__
/* where MSVC puts unlink() */
# include <io.h>
@@ -28,6 +32,7 @@
#include "FLAC/all.h"
#include "decode.h"
#include "file.h"
#ifdef FLAC__HAS_OGG
#include "OggFLAC/stream_decoder.h"
#endif

5
src/flac/encode.c
View File

@@ -31,6 +31,11 @@
#include "FLAC/all.h"
#include "encode.h"
#include "file.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef FLAC__HAS_OGG
#include "OggFLAC/stream_encoder.h"
#endif

4
src/flac/encode.h
View File

@@ -21,6 +21,10 @@
#include "FLAC/metadata.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
typedef struct {
FLAC__bool verbose;
FLAC__uint64 skip;

5
src/flac/main.c
View File

@@ -22,6 +22,11 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#if !defined _MSC_VER && !defined __MINGW32__
/* unlink is in stdio.h in VC++ */
#include <unistd.h> /* for unlink() */

2
src/libFLAC/Makefile.am
View File

@@ -20,7 +20,7 @@ lib_LTLIBRARIES = libFLAC.la
if DEBUG
DEBUGCFLAGS = -DFLAC__OVERFLOW_DETECT
endif
CFLAGS = @CFLAGS@ $(DEBUGCFLAGS)
CFLAGS = @ CFLAGS@ $(DEBUGCFLAGS)
if FLaC__NO_ASM
else

4
src/libFLAC/format.c
View File

@@ -23,6 +23,10 @@
#include "FLAC/format.h"
#include "private/format.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef min
#undef min
#endif

2
src/libOggFLAC/Makefile.am
View File

@@ -20,7 +20,7 @@ lib_LTLIBRARIES = libOggFLAC.la
if DEBUG
DEBUGCFLAGS =
endif
CFLAGS = @CFLAGS@ $(DEBUGCFLAGS)
CFLAGS = @ CFLAGS@ $(DEBUGCFLAGS)
SUBDIRS = include .

4
src/metaflac/Makefile.am
View File

@@ -16,7 +16,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
bin_PROGRAMS = metaflac
CFLAGS = @CFLAGS@
CFLAGS = @ CFLAGS@
EXTRA_DIST = \
Makefile.lite \
@@ -26,4 +26,4 @@ metaflac_SOURCES = \
main.c
metaflac_LDFLAGS =
metaflac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la @SHARE_LIBS@ @LIBICONV@ -lm
metaflac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la @ SHARE_LIBS@ @ LIBICONV@ -lm

4
src/plugin_common/charset.c
View File

@@ -25,6 +25,10 @@
#include <string.h>
#include <errno.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_ICONV
#include <iconv.h>
#endif

6
src/plugin_xmms/Makefile.am
View File

@@ -27,9 +27,9 @@ noinst_HEADERS = \
configure.h \
wrap_id3.h
CFLAGS = @CFLAGS@ @ID3LIB_CFLAGS@ @XMMS_CFLAGS@
CFLAGS = @ CFLAGS@ @ ID3LIB_CFLAGS@ @ XMMS_CFLAGS@
INCLUDES = -I$(top_srcdir)/src
xmmsinputplugindir = @XMMS_INPUT_PLUGIN_DIR@
xmmsinputplugindir = @ XMMS_INPUT_PLUGIN_DIR@
# Don't build a static library
LIBTOOL = $(top_builddir)/libtool-disable-static
@@ -52,5 +52,5 @@ endif
# for fix info see:
# http://lists.freshrpms.net/pipermail/rpm-list/2002-April/000746.html
# the workaround is the extra '-L$(top_builddir)/src/libFLAC/.libs'
libxmms_flac_la_LIBADD = $(top_builddir)/src/plugin_common/libplugin_common.a $(top_builddir)/src/libFLAC/libFLAC.la -L$(top_builddir)/src/libFLAC/.libs @XMMS_LIBS@ @ID3LIB_LIBS@
libxmms_flac_la_LIBADD = $(top_builddir)/src/plugin_common/libplugin_common.a $(top_builddir)/src/libFLAC/libFLAC.la -L$(top_builddir)/src/libFLAC/.libs @ XMMS_LIBS@ @ ID3LIB_LIBS@
libxmms_flac_la_LDFLAGS = -module -avoid-version

4
src/plugin_xmms/plugin.c
View File

@@ -27,6 +27,10 @@
#include <xmms/configfile.h>
#include <xmms/titlestring.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_LANGINFO_CODESET
#include <langinfo.h>
#endif

4
src/share/iconvert.c
View File

@@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef HAVE_ICONV
#include <assert.h>

4
src/share/utf8.c
View File

@@ -24,6 +24,10 @@
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "utf8.h"
#include "charset.h"

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

@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
CFLAGS = @CFLAGS@
CFLAGS = @ CFLAGS@
EXTRA_DIST = \
Makefile.lite \

2
src/test_libFLAC/Makefile.am
View File

@@ -19,7 +19,7 @@ EXTRA_DIST = \
Makefile.lite \
Makefile.vc
CFLAGS = @CFLAGS@
CFLAGS = @ CFLAGS@
INCLUDES = -I$(top_srcdir)/src/libFLAC/include
noinst_PROGRAMS = test_libFLAC

4
src/test_libOggFLAC++/Makefile.am
View File

@@ -20,10 +20,10 @@ EXTRA_DIST = \
Makefile.vc \
README
CFLAGS = @CFLAGS@ @OGG_CFLAGS@
CFLAGS = @ CFLAGS@ @ OGG_CFLAGS@
noinst_PROGRAMS = test_libOggFLAC++
test_libOggFLAC___LDADD = $(top_builddir)/src/libOggFLAC++/libOggFLAC++.la $(top_builddir)/src/libOggFLAC/libOggFLAC.la $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ -lm
test_libOggFLAC___LDADD = $(top_builddir)/src/libOggFLAC++/libOggFLAC++.la $(top_builddir)/src/libOggFLAC/libOggFLAC.la $(top_builddir)/src/libFLAC/libFLAC.la @ OGG_LIBS@ -lm
test_libOggFLAC___SOURCES = \
decoders.cc \
encoders.cc \

4
src/test_libOggFLAC/Makefile.am
View File

@@ -19,11 +19,11 @@ EXTRA_DIST = \
Makefile.lite \
Makefile.vc
CFLAGS = @CFLAGS@ @OGG_CFLAGS@
CFLAGS = @ CFLAGS@ @ OGG_CFLAGS@
INCLUDES =
noinst_PROGRAMS = test_libOggFLAC
test_libOggFLAC_LDADD = $(top_builddir)/src/libOggFLAC/libOggFLAC.la $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ -lm
test_libOggFLAC_LDADD = $(top_builddir)/src/libOggFLAC/libOggFLAC.la $(top_builddir)/src/libFLAC/libFLAC.la @ OGG_LIBS@ -lm
test_libOggFLAC_SOURCES = \
decoders.c \
encoders.c \

2
src/test_streams/Makefile.am
View File

@@ -19,7 +19,7 @@ EXTRA_DIST = \
Makefile.lite \
Makefile.vc
CFLAGS = @CFLAGS@
CFLAGS = @ CFLAGS@
noinst_PROGRAMS = test_streams
test_streams_SOURCES = \