Fixed parallel build
authorJean-Marc Valin <jean-marc.valin@usherbrooke.ca>
Tue, 11 Dec 2007 07:01:22 +0000 (18:01 +1100)
committerJean-Marc Valin <jean-marc.valin@usherbrooke.ca>
Tue, 11 Dec 2007 07:01:22 +0000 (18:01 +1100)
celt.kdevelop
libcelt/Makefile.am
libentcode/Makefile.am

index 4ff1619..2a30000 100644 (file)
         <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>
   </kdevfileview>
   <kdevdocumentation>
     <projectdoc>
-      <docsystem></docsystem>
-      <docurl></docurl>
-      <usermanualurl></usermanualurl>
+      <docsystem/>
+      <docurl/>
+      <usermanualurl/>
     </projectdoc>
   </kdevdocumentation>
 </kdevelop>
index 63616e9..708f601 100644 (file)
@@ -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
index 45a8f26..043f8a1 100644 (file)
@@ -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