[xiph-commits] r3595 - in libfishsound/trunk/src: examples libfishsound tests

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-05-05 01:31:56 -0700 (Mon, 05 May 2008)
New Revision: 3595

Modified:
   libfishsound/trunk/src/examples/Makefile.am
   libfishsound/trunk/src/libfishsound/Makefile.am
   libfishsound/trunk/src/tests/Makefile.am
Log:
ensure -I$(top_builddir) $(FLAC_CFLAGS) and $(FLAC_LIBS) are used in
Makefile.am throughout


Modified: libfishsound/trunk/src/examples/Makefile.am
===================================================================
--- libfishsound/trunk/src/examples/Makefile.am	2008-05-05 08:07:05 UTC (rev 3594)
+++ libfishsound/trunk/src/examples/Makefile.am	2008-05-05 08:31:56 UTC (rev 3595)
@@ -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

Modified: libfishsound/trunk/src/libfishsound/Makefile.am
===================================================================
--- libfishsound/trunk/src/libfishsound/Makefile.am	2008-05-05 08:07:05 UTC (rev 3594)
+++ libfishsound/trunk/src/libfishsound/Makefile.am	2008-05-05 08:31:56 UTC (rev 3595)
@@ -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
 

Modified: libfishsound/trunk/src/tests/Makefile.am
===================================================================
--- libfishsound/trunk/src/tests/Makefile.am	2008-05-05 08:07:05 UTC (rev 3594)
+++ libfishsound/trunk/src/tests/Makefile.am	2008-05-05 08:31:56 UTC (rev 3595)
@@ -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