Commit 7cc99da7 authored by conrad's avatar conrad
Browse files

ensure -I$(top_builddir) $(FLAC_CFLAGS) and $(FLAC_LIBS) are used in

Makefile.am throughout


git-svn-id: http://svn.annodex.net/libfishsound/trunk@3595 8158c8cd-e7e1-0310-9fa4-c5954c97daef
parent 5592d92a
......@@ -2,11 +2,13 @@
AM_CFLAGS = -Wall -pedantic -g
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/libfishsound \
$(VORBIS_CFLAGS) $(SPEEX_CFLAGS) $(OGGZ_CFLAGS)
INCLUDES = -I$(top_builddir) \
-I$(top_srcdir)/include -I$(top_srcdir)/src/libfishsound \
$(VORBIS_CFLAGS) $(SPEEX_CFLAGS) $(FLAC_CFLAGS) $(OGGZ_CFLAGS)
FISHSOUNDDIR = ../libfishsound
FISHSOUND_LIBS = $(FISHSOUNDDIR)/libfishsound.la $(VORBIS_LIBS) $(SPEEX_LIBS)
FISHSOUND_LIBS = $(FISHSOUNDDIR)/libfishsound.la \
$(VORBIS_LIBS) $(SPEEX_LIBS) $(FLAC_LIBS)
if HAVE_OGGZ
oggz_examples = fishsound-identify fishsound-info fishsound-decenc
......
......@@ -2,7 +2,10 @@
AM_CFLAGS = -Wall -pedantic
INCLUDES = $(INCLTDL) -I$(top_srcdir)/include $(VORBIS_CFLAGS) $(SPEEX_CFLAGS)
INCLUDES = $(INCLTDL) \
-I$(top_builddir) \
-I$(top_srcdir)/include \
$(VORBIS_CFLAGS) $(SPEEX_CFLAGS) $(FLAC_CFLAGS)
EXTRA_DIST = Version_script.in
......
......@@ -2,10 +2,13 @@
AM_CFLAGS = -Wall -pedantic
INCLUDES = -I$(top_srcdir)/include $(VORBIS_CFLAGS) $(SPEEX_CFLAGS)
INCLUDES = -I$(top_builddir) \
-I$(top_srcdir)/include \
$(VORBIS_CFLAGS) $(SPEEX_CFLAGS) $(FLAC_CFLAGS)
FISHSOUNDDIR = ../libfishsound
FISHSOUND_LIBS = $(FISHSOUNDDIR)/libfishsound.la $(VORBIS_LIBS) $(SPEEX_LIBS)
FISHSOUND_LIBS = $(FISHSOUNDDIR)/libfishsound.la \
$(VORBIS_LIBS) $(SPEEX_LIBS) $(FLAC_LIBS)
# Test programs
......
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