From 28ca63087f40ca3f1e8e75ccf48096058882ad9d Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Thu, 28 Jun 2012 15:21:01 +0300 Subject: [PATCH] Add an _enc suffix to the sbr_ram/rom files in libSBRenc This avoids name clashes with the similarly named files in libSBRdec, when building all libraries with one single automake file. --- Makefile.am | 4 ++-- libSBRenc/src/{sbr_ram.cpp => sbr_ram_enc.cpp} | 0 libSBRenc/src/{sbr_rom.cpp => sbr_rom_enc.cpp} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename libSBRenc/src/{sbr_ram.cpp => sbr_ram_enc.cpp} (100%) rename libSBRenc/src/{sbr_rom.cpp => sbr_rom_enc.cpp} (100%) diff --git a/Makefile.am b/Makefile.am index 2ceb22d..c5b320f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -152,7 +152,7 @@ SBRENC_SRC = \ $(SBRENC_DIR)/ps_encode.cpp \ $(SBRENC_DIR)/resampler.cpp \ $(SBRENC_DIR)/sbr_encoder.cpp \ - $(SBRENC_DIR)/sbr_ram.cpp \ + $(SBRENC_DIR)/sbr_ram_enc.cpp \ $(SBRENC_DIR)/ton_corr.cpp \ $(SBRENC_DIR)/code_env.cpp \ $(SBRENC_DIR)/env_est.cpp \ @@ -161,7 +161,7 @@ SBRENC_SRC = \ $(SBRENC_DIR)/ps_main.cpp \ $(SBRENC_DIR)/sbrenc_freq_sca.cpp \ $(SBRENC_DIR)/sbr_misc.cpp \ - $(SBRENC_DIR)/sbr_rom.cpp \ + $(SBRENC_DIR)/sbr_rom_enc.cpp \ $(SBRENC_DIR)/tran_det.cpp SYS_DIR = $(top_srcdir)/libSYS/src diff --git a/libSBRenc/src/sbr_ram.cpp b/libSBRenc/src/sbr_ram_enc.cpp similarity index 100% rename from libSBRenc/src/sbr_ram.cpp rename to libSBRenc/src/sbr_ram_enc.cpp diff --git a/libSBRenc/src/sbr_rom.cpp b/libSBRenc/src/sbr_rom_enc.cpp similarity index 100% rename from libSBRenc/src/sbr_rom.cpp rename to libSBRenc/src/sbr_rom_enc.cpp