ref: f347dd3b3d9c1ffef4f707d39208ffa4750370ab
parent: f8db800c44a5f12f6bf88288e6d4886e0858570c
author: Jean-Marc Valin <[email protected]>
date: Tue Dec 11 13:01:22 EST 2007
Fixed parallel build
--- a/celt.kdevelop
+++ b/celt.kdevelop
@@ -52,6 +52,12 @@
<envvar value="1" name="WANT_AUTOCONF_2_5" />
<envvar value="1" name="WANT_AUTOMAKE_1_6" />
</envvars>
+ <abortonerror>true</abortonerror>
+ <runmultiplejobs>true</runmultiplejobs>
+ <numberofjobs>4</numberofjobs>
+ <dontact>false</dontact>
+ <makebin></makebin>
+ <prio>0</prio>
</make>
</kdevautoproject>
<kdevdebugger>
@@ -191,9 +197,9 @@
</kdevfileview>
<kdevdocumentation>
<projectdoc>
- <docsystem></docsystem>
- <docurl></docurl>
- <usermanualurl></usermanualurl>
+ <docsystem/>
+ <docurl/>
+ <usermanualurl/>
</projectdoc>
</kdevdocumentation>
</kdevelop>
--- a/libcelt/Makefile.am
+++ b/libcelt/Makefile.am
@@ -22,6 +22,6 @@
noinst_PROGRAMS = testcelt
testcelt_SOURCES = testcelt.c
testcelt_LDADD = $(top_builddir)/libentcode/libentcode.la \
- $(top_builddir)/libcelt/libcelt.la
+ libcelt.la
INCLUDES = -I$(top_srcdir)/libentcode
libcelt_la_LIBADD = $(top_builddir)/libentcode/libentcode.la
--- a/libentcode/Makefile.am
+++ b/libentcode/Makefile.am
@@ -5,6 +5,6 @@
entdec.c entenc.c laplace.c rangedec.c rangeenc.c probdec.c probenc.c probmod.c
bin_PROGRAMS = ectest
ectest_SOURCES = ectest.c
-ectest_LDADD = $(top_builddir)/libentcode/libentcode.la
+ectest_LDADD = libentcode.la
noinst_HEADERS = bitrdec.h bitree.h bitrenc.h ecintrin.h entcode.h entdec.h \
entenc.h laplace.h mfrngcod.h probdec.h probenc.h probmod.h