From f347dd3b3d9c1ffef4f707d39208ffa4750370ab Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jean-marc.valin@usherbrooke.ca>
Date: Tue, 11 Dec 2007 18:01:22 +1100
Subject: [PATCH] Fixed parallel build
---
celt.kdevelop | 12 +++++++++---
libcelt/Makefile.am | 2 +-
libentcode/Makefile.am | 2 +-
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/celt.kdevelop b/celt.kdevelop
index 4ff1619ad..2a30000e3 100644
--- 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>
diff --git a/libcelt/Makefile.am b/libcelt/Makefile.am
index 63616e949..708f6018a 100644
--- a/libcelt/Makefile.am
+++ b/libcelt/Makefile.am
@@ -22,6 +22,6 @@ noinst_HEADERS = arch.h bands.h celt.h cwrs.h fftwrap.h mdct.h modes.h \
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
diff --git a/libentcode/Makefile.am b/libentcode/Makefile.am
index 45a8f2651..043f8a146 100644
--- a/libentcode/Makefile.am
+++ b/libentcode/Makefile.am
@@ -5,6 +5,6 @@ libentcode_la_SOURCES = bitrdec.c bitree.c bitrenc.c ecintrin.h entcode.c \
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
--
GitLab