src/{dec,enc,utils}: give filenames a unique suffix

this avoids duplicates between these trees and dsp/, e.g., enc/tree.c,
dec/tree.c, making pulling the whole library source tree into one target
possible

BUG=webp:279

Change-Id: I060a614833c7c24ddd37bf641702ae6a5eef1775

src/utils/Makefile.am

@@ -14,34 +14,34 @@ noinst_HEADERS += ../webp/encode.h
 noinst_HEADERS += ../webp/format_constants.h
 
 COMMON_SOURCES =
-COMMON_SOURCES += bit_reader.c
-COMMON_SOURCES += bit_reader.h
-COMMON_SOURCES += bit_reader_inl.h
-COMMON_SOURCES += color_cache.c
-COMMON_SOURCES += color_cache.h
-COMMON_SOURCES += endian_inl.h
-COMMON_SOURCES += filters.c
-COMMON_SOURCES += filters.h
-COMMON_SOURCES += huffman.c
-COMMON_SOURCES += huffman.h
-COMMON_SOURCES += quant_levels_dec.c
-COMMON_SOURCES += quant_levels_dec.h
-COMMON_SOURCES += rescaler.c
-COMMON_SOURCES += rescaler.h
-COMMON_SOURCES += random.c
-COMMON_SOURCES += random.h
-COMMON_SOURCES += thread.c
-COMMON_SOURCES += thread.h
+COMMON_SOURCES += bit_reader_utils.c
+COMMON_SOURCES += bit_reader_utils.h
+COMMON_SOURCES += bit_reader_inl_utils.h
+COMMON_SOURCES += color_cache_utils.c
+COMMON_SOURCES += color_cache_utils.h
+COMMON_SOURCES += endian_inl_utils.h
+COMMON_SOURCES += filters_utils.c
+COMMON_SOURCES += filters_utils.h
+COMMON_SOURCES += huffman_utils.c
+COMMON_SOURCES += huffman_utils.h
+COMMON_SOURCES += quant_levels_dec_utils.c
+COMMON_SOURCES += quant_levels_dec_utils.h
+COMMON_SOURCES += rescaler_utils.c
+COMMON_SOURCES += rescaler_utils.h
+COMMON_SOURCES += random_utils.c
+COMMON_SOURCES += random_utils.h
+COMMON_SOURCES += thread_utils.c
+COMMON_SOURCES += thread_utils.h
 COMMON_SOURCES += utils.c
 COMMON_SOURCES += utils.h
 
 ENC_SOURCES =
-ENC_SOURCES += bit_writer.c
-ENC_SOURCES += bit_writer.h
-ENC_SOURCES += huffman_encode.c
-ENC_SOURCES += huffman_encode.h
-ENC_SOURCES += quant_levels.c
-ENC_SOURCES += quant_levels.h
+ENC_SOURCES += bit_writer_utils.c
+ENC_SOURCES += bit_writer_utils.h
+ENC_SOURCES += huffman_encode_utils.c
+ENC_SOURCES += huffman_encode_utils.h
+ENC_SOURCES += quant_levels_utils.c
+ENC_SOURCES += quant_levels_utils.h
 
 libwebputils_la_SOURCES = $(COMMON_SOURCES) $(ENC_SOURCES)
 

src/utils/bit_reader_inl_utils.h

@@ -23,8 +23,8 @@
 #include <string.h>  // for memcpy
 
 #include "../dsp/dsp.h"
-#include "./bit_reader.h"
-#include "./endian_inl.h"
+#include "./bit_reader_utils.h"
+#include "./endian_inl_utils.h"
 #include "./utils.h"
 
 #ifdef __cplusplus

src/utils/bit_reader_utils.c

@@ -15,7 +15,7 @@
 #include "../webp/config.h"
 #endif
 
-#include "./bit_reader_inl.h"
+#include "./bit_reader_inl_utils.h"
 #include "../utils/utils.h"
 
 //------------------------------------------------------------------------------

src/utils/bit_writer_utils.c

@@ -16,8 +16,8 @@
 #include <string.h>   // for memcpy()
 #include <stdlib.h>
 
-#include "./bit_writer.h"
-#include "./endian_inl.h"
+#include "./bit_writer_utils.h"
+#include "./endian_inl_utils.h"
 #include "./utils.h"
 
 //------------------------------------------------------------------------------

src/utils/color_cache_utils.c

@@ -14,7 +14,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include "./color_cache.h"
+#include "./color_cache_utils.h"
 #include "./utils.h"
 
 //------------------------------------------------------------------------------

src/utils/filters_utils.c

@@ -11,7 +11,7 @@
 //
 // Author: Urvang (urvang@google.com)
 
-#include "./filters.h"
+#include "./filters_utils.h"
 #include <stdlib.h>
 #include <string.h>
 

src/utils/huffman_encode_utils.c

@@ -14,7 +14,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include "./huffman_encode.h"
+#include "./huffman_encode_utils.h"
 #include "./utils.h"
 #include "../webp/format_constants.h"
 

src/utils/huffman_utils.c

@@ -14,7 +14,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include "./huffman.h"
+#include "./huffman_utils.h"
 #include "./utils.h"
 #include "../webp/format_constants.h"
 

src/utils/quant_levels_dec_utils.c

@@ -14,7 +14,7 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./quant_levels_dec.h"
+#include "./quant_levels_dec_utils.h"
 
 #include <string.h>   // for memset
 

src/utils/quant_levels_utils.c

@@ -14,7 +14,7 @@
 
 #include <assert.h>
 
-#include "./quant_levels.h"
+#include "./quant_levels_utils.h"
 
 #define NUM_SYMBOLS     256
 

src/utils/random_utils.c

@@ -12,7 +12,7 @@
 // Author: Skal (pascal.massimino@gmail.com)
 
 #include <string.h>
-#include "./random.h"
+#include "./random_utils.h"
 
 //------------------------------------------------------------------------------
 

src/utils/rescaler_utils.c

@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "../dsp/dsp.h"
-#include "./rescaler.h"
+#include "./rescaler_utils.h"
 
 //------------------------------------------------------------------------------
 

src/utils/thread_utils.c

@@ -13,7 +13,7 @@
 
 #include <assert.h>
 #include <string.h>   // for memset()
-#include "./thread.h"
+#include "./thread_utils.h"
 #include "./utils.h"
 
 #ifdef WEBP_USE_THREAD