fixed makefiles (damn kdevelop)

git-svn-id: http://svn.xiph.org/trunk/speex@14026 0101bb08-14d6-0310-b084-bc0e0c8e3800

Author: jmvalin

Speex.kdevelop

@@ -9,16 +9,16 @@
     <ignoreparts/>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description></description>
+    <description/>
     <secondaryLanguages/>
     <versioncontrol>kdevsubversion</versioncontrol>
-    <defaultencoding></defaultencoding>
+    <defaultencoding/>
     <projectname>Speex</projectname>
   </general>
   <kdevautoproject>
     <general>
       <activetarget>libspeex/libspeex.la</activetarget>
-      <useconfiguration>fixed</useconfiguration>
+      <useconfiguration>float</useconfiguration>
     </general>
     <run>
       <mainprogram>src/Speex</mainprogram>
@@ -40,14 +40,14 @@
         <cflags>-O2 -g -Wall</cflags>
         <envvars/>
         <configargs>--disable-shared</configargs>
-        <topsourcedir></topsourcedir>
-        <cppflags></cppflags>
-        <ldflags></ldflags>
-        <ccompilerbinary></ccompilerbinary>
-        <cxxcompilerbinary></cxxcompilerbinary>
-        <f77compilerbinary></f77compilerbinary>
-        <cxxflags></cxxflags>
-        <f77flags></f77flags>
+        <topsourcedir/>
+        <cppflags/>
+        <ldflags/>
+        <ccompilerbinary/>
+        <cxxcompilerbinary/>
+        <f77compilerbinary/>
+        <cxxflags/>
+        <f77flags/>
       </float>
       <fixed>
         <configargs>--enable-fixed-point --disable-shared</configargs>
@@ -57,14 +57,14 @@
         <f77compiler>kdevpgf77options</f77compiler>
         <cflags>-O2 -g -Wall</cflags>
         <envvars/>
-        <topsourcedir></topsourcedir>
-        <cppflags></cppflags>
-        <ldflags></ldflags>
-        <ccompilerbinary></ccompilerbinary>
-        <cxxcompilerbinary></cxxcompilerbinary>
-        <f77compilerbinary></f77compilerbinary>
-        <cxxflags></cxxflags>
-        <f77flags></f77flags>
+        <topsourcedir/>
+        <cppflags/>
+        <ldflags/>
+        <ccompilerbinary/>
+        <cxxcompilerbinary/>
+        <f77compilerbinary/>
+        <cxxflags/>
+        <f77flags/>
       </fixed>
       <default>
         <envvars/>
@@ -87,10 +87,10 @@
     <general>
       <dbgshell>libtool</dbgshell>
       <programargs/>
-      <gdbpath></gdbpath>
-      <configGdbScript></configGdbScript>
-      <runShellScript></runShellScript>
-      <runGdbScript></runGdbScript>
+      <gdbpath/>
+      <configGdbScript/>
+      <runShellScript/>
+      <runGdbScript/>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
       <floatingtoolbar>false</floatingtoolbar>
@@ -136,6 +136,8 @@
       <usePermanentCaching>true</usePermanentCaching>
       <alwaysIncludeNamespaces>true</alwaysIncludeNamespaces>
       <includePaths>.;</includePaths>
+      <parseMissingHeadersExperimental>false</parseMissingHeadersExperimental>
+      <resolveIncludePathsUsingMakeExperimental>false</resolveIncludePathsUsingMakeExperimental>
     </codecompletion>
     <qt>
       <used>false</used>
@@ -148,7 +150,7 @@
       <designerpluginpaths/>
     </qt>
     <creategettersetter>
-      <prefixGet></prefixGet>
+      <prefixGet/>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
       <parameterName>theValue</parameterName>

include/speex/Makefile.am

@@ -3,14 +3,7 @@
 
 nodist_pkginclude_HEADERS = speex_config_types.h
 
-pkginclude_HEADERS =  speex.h \
-	speex_types.h \
-	speex_bits.h \
-	speex_header.h \
-	speex_callbacks.h \
-	speex_stereo.h \
-	speex_preprocess.h \
-	speex_jitter.h \
-	speex_echo.h \
-	speex_resampler.h
+pkginclude_HEADERS = speex.h speex_bits.h speex_buffer.h speex_callbacks.h \
+	speex_echo.h speex_header.h speex_jitter.h speex_preprocess.h speex_resampler.h \
+	speex_stereo.h speex_types.h
 

libspeex/Makefile.am

@@ -9,12 +9,14 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @
 lib_LTLIBRARIES = libspeex.la libspeexdsp.la
 
 # Sources for compilation in the library
-libspeex_la_SOURCES = nb_celp.c 	sb_celp.c 	lpc.c 	ltp.c 	lsp.c 	quant_lsp.c \
-				lsp_tables_nb.c 	gain_table.c 	gain_table_lbr.c 	cb_search.c 	filters.c 	bits.c \
-				modes.c 	speex.c 	vq.c 	high_lsp_tables.c 	vbr.c 	hexc_table.c \
-				exc_5_256_table.c 	exc_5_64_table.c 	exc_8_128_table.c 	exc_10_32_table.c \
-				exc_10_16_table.c 	exc_20_32_table.c 	hexc_10_32_table.c 	speex_header.c \
-				speex_callbacks.c 	stereo.c window.c
+libspeex_la_SOURCES = bits.c 	cb_search.c 	exc_10_32_table.c exc_20_32_table.c \
+	exc_5_64_table.c 	exc_8_128_table.c 	filters.c 	gain_table.c gain_table_lbr.c \
+	hexc_10_32_table.c 	hexc_table.c 	high_lsp_tables.c 	lbr_48k_tables.c lpc.c 	lsp.c 	ltp.c \
+	mdf.c 	preprocess.c 	quant_lsp.c sb_celp.c 	smallft.c 	speex.c \
+	speex_header.c 	stereo.c 	vbr.c 	vq.c _kiss_fft_guts.h buffer.c exc_10_16_table.c \
+	exc_5_256_table.c fftwrap.c filterbank.c jitter.c kiss_fft.c kiss_fft.h kiss_fftr.c \
+	kiss_fftr.h lsp_tables_nb.c modes.c nb_celp.c resample.c speex_callbacks.c \
+	vorbis_psy.c window.c
 
 libspeexdsp_la_SOURCES = preprocess.c 	smallft.c 	lbr_48k_tables.c \
 				jitter.c 	mdf.c fftwrap.c kiss_fft.c _kiss_fft_guts.h kiss_fft.h \