|
 |
3989e3 |
diff -up libshout-2.2.2/src/Makefile.in.fix_speex libshout-2.2.2/src/Makefile.in
|
|
|
3989e3 |
--- libshout-2.2.2/src/Makefile.in.fix_speex 2007-12-07 15:03:46.000000000 +0100
|
|
|
3989e3 |
+++ libshout-2.2.2/src/Makefile.in 2007-12-07 15:04:43.000000000 +0100
|
|
|
3989e3 |
@@ -65,7 +65,8 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
|
|
|
3989e3 |
am__DEPENDENCIES_2 =
|
|
|
3989e3 |
libshout_la_DEPENDENCIES = net/libicenet.la timing/libicetiming.la \
|
|
|
3989e3 |
avl/libiceavl.la httpp/libicehttpp.la $(am__DEPENDENCIES_1) \
|
|
|
3989e3 |
- $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2)
|
|
|
3989e3 |
+ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
|
|
|
3989e3 |
+ $(am__DEPENDENCIES_2)
|
|
|
3989e3 |
am__libshout_la_SOURCES_DIST = shout.c util.c ogg.c vorbis.c mp3.c \
|
|
|
3989e3 |
theora.c speex.c
|
|
|
3989e3 |
@HAVE_THEORA_TRUE@am__objects_1 = theora.lo
|
|
|
3989e3 |
@@ -128,6 +129,7 @@ EXEEXT = @EXEEXT@
|
|
|
3989e3 |
F77 = @F77@
|
|
|
3989e3 |
FFLAGS = @FFLAGS@
|
|
|
3989e3 |
FGREP = @FGREP@
|
|
|
3989e3 |
+GREP = @GREP@
|
|
|
3989e3 |
HAVE_PKGCONFIG_FALSE = @HAVE_PKGCONFIG_FALSE@
|
|
|
3989e3 |
HAVE_PKGCONFIG_TRUE = @HAVE_PKGCONFIG_TRUE@
|
|
|
3989e3 |
HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
|
|
|
3989e3 |
@@ -199,13 +201,9 @@ VORBIS_LIBS = @VORBIS_LIBS@
|
|
|
3989e3 |
VORBIS_PREFIX = @VORBIS_PREFIX@
|
|
|
3989e3 |
XIPH_CFLAGS = @XIPH_CFLAGS@
|
|
|
3989e3 |
XIPH_CPPFLAGS = @XIPH_CPPFLAGS@
|
|
|
3989e3 |
-ac_ct_AR = @ac_ct_AR@
|
|
|
3989e3 |
ac_ct_CC = @ac_ct_CC@
|
|
|
3989e3 |
ac_ct_CXX = @ac_ct_CXX@
|
|
|
3989e3 |
ac_ct_F77 = @ac_ct_F77@
|
|
|
3989e3 |
-ac_ct_RANLIB = @ac_ct_RANLIB@
|
|
|
3989e3 |
-ac_ct_STRIP = @ac_ct_STRIP@
|
|
|
3989e3 |
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
|
|
3989e3 |
acx_pthread_config = @acx_pthread_config@
|
|
|
3989e3 |
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
|
|
3989e3 |
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
|
|
3989e3 |
@@ -223,23 +221,30 @@ build_cpu = @build_cpu@
|
|
|
3989e3 |
build_os = @build_os@
|
|
|
3989e3 |
build_vendor = @build_vendor@
|
|
|
3989e3 |
datadir = @datadir@
|
|
|
3989e3 |
+datarootdir = @datarootdir@
|
|
|
3989e3 |
+docdir = @docdir@
|
|
|
3989e3 |
+dvidir = @dvidir@
|
|
|
3989e3 |
exec_prefix = @exec_prefix@
|
|
|
3989e3 |
host = @host@
|
|
|
3989e3 |
host_alias = @host_alias@
|
|
|
3989e3 |
host_cpu = @host_cpu@
|
|
|
3989e3 |
host_os = @host_os@
|
|
|
3989e3 |
host_vendor = @host_vendor@
|
|
|
3989e3 |
+htmldir = @htmldir@
|
|
|
3989e3 |
includedir = @includedir@
|
|
|
3989e3 |
infodir = @infodir@
|
|
|
3989e3 |
install_sh = @install_sh@
|
|
|
3989e3 |
libdir = @libdir@
|
|
|
3989e3 |
libexecdir = @libexecdir@
|
|
|
3989e3 |
+localedir = @localedir@
|
|
|
3989e3 |
localstatedir = @localstatedir@
|
|
|
3989e3 |
mandir = @mandir@
|
|
|
3989e3 |
mkdir_p = @mkdir_p@
|
|
|
3989e3 |
oldincludedir = @oldincludedir@
|
|
|
3989e3 |
+pdfdir = @pdfdir@
|
|
|
3989e3 |
prefix = @prefix@
|
|
|
3989e3 |
program_transform_name = @program_transform_name@
|
|
|
3989e3 |
+psdir = @psdir@
|
|
|
3989e3 |
sbindir = @sbindir@
|
|
|
3989e3 |
sharedstatedir = @sharedstatedir@
|
|
|
3989e3 |
shout_cflags = @shout_cflags@
|
|
|
3989e3 |
@@ -261,7 +266,7 @@ noinst_HEADERS = shout_ogg.h shout_priva
|
|
|
3989e3 |
libshout_la_SOURCES = shout.c util.c ogg.c vorbis.c mp3.c $(MAYBE_THEORA) $(MAYBE_SPEEX)
|
|
|
3989e3 |
AM_CFLAGS = @XIPH_CFLAGS@
|
|
|
3989e3 |
libshout_la_LIBADD = net/libicenet.la timing/libicetiming.la avl/libiceavl.la\
|
|
|
3989e3 |
- httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS)
|
|
|
3989e3 |
+ httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS) $(SPEEX_LIBS)
|
|
|
3989e3 |
|
|
|
3989e3 |
INCLUDES = -I$(top_builddir)/include
|
|
|
3989e3 |
all: all-recursive
|
|
|
3989e3 |
diff -up libshout-2.2.2/src/Makefile.am.fix_speex libshout-2.2.2/src/Makefile.am
|
|
|
3989e3 |
--- libshout-2.2.2/src/Makefile.am.fix_speex 2007-12-07 15:03:39.000000000 +0100
|
|
|
3989e3 |
+++ libshout-2.2.2/src/Makefile.am 2007-12-07 15:04:35.000000000 +0100
|
|
|
3989e3 |
@@ -26,7 +26,7 @@ libshout_la_SOURCES = shout.c util.c ogg
|
|
|
3989e3 |
AM_CFLAGS = @XIPH_CFLAGS@
|
|
|
3989e3 |
|
|
|
3989e3 |
libshout_la_LIBADD = net/libicenet.la timing/libicetiming.la avl/libiceavl.la\
|
|
|
3989e3 |
- httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS)
|
|
|
3989e3 |
+ httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS) $(SPEEX_LIBS)
|
|
|
3989e3 |
|
|
|
3989e3 |
INCLUDES = -I$(top_builddir)/include
|
|
|
3989e3 |
|