From 33baddae4cfaadbac35a00f39fa3b94b6e42d322 Mon Sep 17 00:00:00 2001 From: drowe67 Date: Sun, 5 Aug 2012 21:53:00 +0000 Subject: [PATCH] removed tphinterp to stop it breaking make process git-svn-id: https://svn.code.sf.net/p/freetel/code@602 01035d8c-6547-0410-b346-abe4f91aad63 --- codec2-dev/unittest/Makefile.am | 7 +------ codec2-dev/unittest/Makefile.in | 24 ++++++------------------ 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/codec2-dev/unittest/Makefile.am b/codec2-dev/unittest/Makefile.am index ad2ca3ed..120d04d2 100644 --- a/codec2-dev/unittest/Makefile.am +++ b/codec2-dev/unittest/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTS = gnu NAME = libcodec2 AM_CPPFLAGS = $(AM_CFLAGS) -noinst_PROGRAMS = genres genlsp extract vqtrain vqtrainjnd tnlp tinterp tquant vq_train_jvm scalarlsptest tfdmdv t48_8 lspsync create_interleaver tlspsens tphinterp vqtrainph genphdata polar2rect +noinst_PROGRAMS = genres genlsp extract vqtrain vqtrainjnd tnlp tinterp tquant vq_train_jvm scalarlsptest tfdmdv t48_8 lspsync create_interleaver tlspsens vqtrainph genphdata polar2rect genres_SOURCES = genres.c ../src/lpc.c genres_LDADD = $(lib_LTLIBRARIES) @@ -79,8 +79,3 @@ create_interleaver_LDFLAGS = $(LIBS) tlspsens_SOURCES = tlspsens.c ../src/quantise.c ../src/lpc.c ../src/lsp.c ../src/dump.c ../src/kiss_fft.c ../src/codec2.c ../src/sine.c ../src/nlp.c ../src/pack.c ../src/interp.c ../src/postfilter.c ../src/phase.c $(CODEBOOKS) tlspsens_LDADD = $(lib_LTLIBRARIES) tlspsens_LDFLAGS = $(LIBS) - -tphinterp_SOURCES = tphinterp.c ../src/nlp.c ../src/sine.c ../src/kiss_fft.c ../src/dump.c -tphinterp_LDADD = $(lib_LTLIBRARIES) -tphinterp_LDFLAGS = $(LIBS) - diff --git a/codec2-dev/unittest/Makefile.in b/codec2-dev/unittest/Makefile.in index f969a2e0..90d103f2 100644 --- a/codec2-dev/unittest/Makefile.in +++ b/codec2-dev/unittest/Makefile.in @@ -41,10 +41,9 @@ noinst_PROGRAMS = genres$(EXEEXT) genlsp$(EXEEXT) extract$(EXEEXT) \ tinterp$(EXEEXT) tquant$(EXEEXT) vq_train_jvm$(EXEEXT) \ scalarlsptest$(EXEEXT) tfdmdv$(EXEEXT) t48_8$(EXEEXT) \ lspsync$(EXEEXT) create_interleaver$(EXEEXT) tlspsens$(EXEEXT) \ - tphinterp$(EXEEXT) vqtrainph$(EXEEXT) genphdata$(EXEEXT) \ - polar2rect$(EXEEXT) + vqtrainph$(EXEEXT) genphdata$(EXEEXT) polar2rect$(EXEEXT) subdir = unittest -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -110,10 +109,6 @@ am_tnlp_OBJECTS = tnlp.$(OBJEXT) sine.$(OBJEXT) nlp.$(OBJEXT) \ kiss_fft.$(OBJEXT) dump.$(OBJEXT) tnlp_OBJECTS = $(am_tnlp_OBJECTS) tnlp_DEPENDENCIES = -am_tphinterp_OBJECTS = tphinterp.$(OBJEXT) nlp.$(OBJEXT) \ - sine.$(OBJEXT) kiss_fft.$(OBJEXT) dump.$(OBJEXT) -tphinterp_OBJECTS = $(am_tphinterp_OBJECTS) -tphinterp_DEPENDENCIES = am_tquant_OBJECTS = tquant.$(OBJEXT) quantise.$(OBJEXT) lpc.$(OBJEXT) \ lsp.$(OBJEXT) dump.$(OBJEXT) kiss_fft.$(OBJEXT) \ $(am__objects_1) @@ -147,15 +142,15 @@ SOURCES = $(create_interleaver_SOURCES) $(extract_SOURCES) \ $(lspsync_SOURCES) $(polar2rect_SOURCES) \ $(scalarlsptest_SOURCES) $(t48_8_SOURCES) $(tfdmdv_SOURCES) \ $(tinterp_SOURCES) $(tlspsens_SOURCES) $(tnlp_SOURCES) \ - $(tphinterp_SOURCES) $(tquant_SOURCES) $(vq_train_jvm_SOURCES) \ - $(vqtrain_SOURCES) $(vqtrainjnd_SOURCES) $(vqtrainph_SOURCES) + $(tquant_SOURCES) $(vq_train_jvm_SOURCES) $(vqtrain_SOURCES) \ + $(vqtrainjnd_SOURCES) $(vqtrainph_SOURCES) DIST_SOURCES = $(create_interleaver_SOURCES) $(extract_SOURCES) \ $(genlsp_SOURCES) $(genphdata_SOURCES) $(genres_SOURCES) \ $(lspsync_SOURCES) $(polar2rect_SOURCES) \ $(scalarlsptest_SOURCES) $(t48_8_SOURCES) $(tfdmdv_SOURCES) \ $(tinterp_SOURCES) $(tlspsens_SOURCES) $(tnlp_SOURCES) \ - $(tphinterp_SOURCES) $(tquant_SOURCES) $(vq_train_jvm_SOURCES) \ - $(vqtrain_SOURCES) $(vqtrainjnd_SOURCES) $(vqtrainph_SOURCES) + $(tquant_SOURCES) $(vq_train_jvm_SOURCES) $(vqtrain_SOURCES) \ + $(vqtrainjnd_SOURCES) $(vqtrainph_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -324,9 +319,6 @@ create_interleaver_LDFLAGS = $(LIBS) tlspsens_SOURCES = tlspsens.c ../src/quantise.c ../src/lpc.c ../src/lsp.c ../src/dump.c ../src/kiss_fft.c ../src/codec2.c ../src/sine.c ../src/nlp.c ../src/pack.c ../src/interp.c ../src/postfilter.c ../src/phase.c $(CODEBOOKS) tlspsens_LDADD = $(lib_LTLIBRARIES) tlspsens_LDFLAGS = $(LIBS) -tphinterp_SOURCES = tphinterp.c ../src/nlp.c ../src/sine.c ../src/kiss_fft.c ../src/dump.c -tphinterp_LDADD = $(lib_LTLIBRARIES) -tphinterp_LDFLAGS = $(LIBS) all: all-am .SUFFIXES: @@ -406,9 +398,6 @@ tlspsens$(EXEEXT): $(tlspsens_OBJECTS) $(tlspsens_DEPENDENCIES) tnlp$(EXEEXT): $(tnlp_OBJECTS) $(tnlp_DEPENDENCIES) @rm -f tnlp$(EXEEXT) $(LINK) $(tnlp_LDFLAGS) $(tnlp_OBJECTS) $(tnlp_LDADD) $(LIBS) -tphinterp$(EXEEXT): $(tphinterp_OBJECTS) $(tphinterp_DEPENDENCIES) - @rm -f tphinterp$(EXEEXT) - $(LINK) $(tphinterp_LDFLAGS) $(tphinterp_OBJECTS) $(tphinterp_LDADD) $(LIBS) tquant$(EXEEXT): $(tquant_OBJECTS) $(tquant_DEPENDENCIES) @rm -f tquant$(EXEEXT) $(LINK) $(tquant_LDFLAGS) $(tquant_OBJECTS) $(tquant_LDADD) $(LIBS) @@ -465,7 +454,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinterp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tlspsens.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tnlp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tphinterp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tquant.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vq_train_jvm.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vqtrain.Po@am__quote@ -- 2.25.1