[SCM] opencore-amr packaging branch, master, updated. upstream/0.1.2-10-g7bf1e45

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5a853fa65cbc77971664f71f394d67e998bfb6c7
Author: Martin Storsjo <martin at martin.st>
Date:   Tue Sep 1 12:54:47 2009 +0200

    Rerun autoreconf -fi

diff --git a/amrnb/Makefile.in b/amrnb/Makefile.in
index e15a68c..d0cdf48 100644
--- a/amrnb/Makefile.in
+++ b/amrnb/Makefile.in
@@ -77,9 +77,9 @@ am_libopencore_amrnb_la_OBJECTS = wrapper.lo agc.lo amrdecode.lo \
 	lag_wind_tab.lo l_comp.lo levinson.lo l_extract.lo lflg_upd.lo \
 	l_negate.lo lpc.lo ol_ltp.lo pitch_fr.lo pitch_ol.lo \
 	p_ol_wgh.lo pre_big.lo pre_proc.lo prm2bits.lo qgain475.lo \
-	qgain795.lo q_gain_c.lo q_gain_p.lo qua_gain.lo r_fft.lo \
-	s10_8pf.lo set_sign.lo sid_sync.lo sp_enc.lo spreproc.lo \
-	spstproc.lo ton_stab.lo vad1.lo add.lo az_lsp.lo bitno_tab.lo \
+	qgain795.lo q_gain_c.lo q_gain_p.lo qua_gain.lo s10_8pf.lo \
+	set_sign.lo sid_sync.lo sp_enc.lo spreproc.lo spstproc.lo \
+	ton_stab.lo vad1.lo add.lo az_lsp.lo bitno_tab.lo \
 	bitreorder_tab.lo bytesused.lo c2_9pf_tab.lo div_s.lo \
 	extract_h.lo extract_l.lo gains_tbl.lo gc_pred.lo \
 	get_const_tbls.lo gmed_n.lo gray_tbl.lo grid_tbl.lo int_lpc.lo \
@@ -264,12 +264,13 @@ libopencore_amrnb_la_LDFLAGS = -version-info @OPENCORE_AMRNB_VERSION@
 # $(DEC_SRC_DIR)/decoder_gsm_amr.cpp
 # $(DEC_SRC_DIR)/pvgsmamrdecoder.cpp
 # $(ENC_SRC_DIR)/gsmamr_encoder_wrapper.cpp
-# $(ENC_SRC_DIR)/vad2.cpp
 # $(COMMON_SRC_DIR)/bits2prm.cpp
 # $(COMMON_SRC_DIR)/copy.cpp
 # $(COMMON_SRC_DIR)/div_32.cpp
 # $(COMMON_SRC_DIR)/l_abs.cpp
+# $(COMMON_SRC_DIR)/r_fft.cpp
 # $(COMMON_SRC_DIR)/vad1.cpp
+# $(COMMON_SRC_DIR)/vad2.cpp
 libopencore_amrnb_la_SOURCES = \
     wrapper.cpp \
     $(DEC_SRC_DIR)/agc.cpp \
@@ -360,7 +361,6 @@ libopencore_amrnb_la_SOURCES = \
         $(ENC_SRC_DIR)/q_gain_c.cpp \
         $(ENC_SRC_DIR)/q_gain_p.cpp \
         $(ENC_SRC_DIR)/qua_gain.cpp \
-        $(ENC_SRC_DIR)/r_fft.cpp \
         $(ENC_SRC_DIR)/s10_8pf.cpp \
         $(ENC_SRC_DIR)/set_sign.cpp \
         $(ENC_SRC_DIR)/sid_sync.cpp \
@@ -630,7 +630,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/qgain795.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/qua_gain.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/qua_gain_tbl.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/r_fft.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/reorder.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/residu.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/round.Plo at am__quote@
@@ -1292,13 +1291,6 @@ qua_gain.lo: $(ENC_SRC_DIR)/qua_gain.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o qua_gain.lo `test -f '$(ENC_SRC_DIR)/qua_gain.cpp' || echo '$(srcdir)/'`$(ENC_SRC_DIR)/qua_gain.cpp
 
-r_fft.lo: $(ENC_SRC_DIR)/r_fft.cpp
- at am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT r_fft.lo -MD -MP -MF $(DEPDIR)/r_fft.Tpo -c -o r_fft.lo `test -f '$(ENC_SRC_DIR)/r_fft.cpp' || echo '$(srcdir)/'`$(ENC_SRC_DIR)/r_fft.cpp
- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/r_fft.Tpo $(DEPDIR)/r_fft.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(ENC_SRC_DIR)/r_fft.cpp' object='r_fft.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o r_fft.lo `test -f '$(ENC_SRC_DIR)/r_fft.cpp' || echo '$(srcdir)/'`$(ENC_SRC_DIR)/r_fft.cpp
-
 s10_8pf.lo: $(ENC_SRC_DIR)/s10_8pf.cpp
 @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT s10_8pf.lo -MD -MP -MF $(DEPDIR)/s10_8pf.Tpo -c -o s10_8pf.lo `test -f '$(ENC_SRC_DIR)/s10_8pf.cpp' || echo '$(srcdir)/'`$(ENC_SRC_DIR)/s10_8pf.cpp
 @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/s10_8pf.Tpo $(DEPDIR)/s10_8pf.Plo

-- 
opencore-amr packaging