WIP: list includes as descendants of the project dir

#include "(.|..)/..." -> #include "src/..."

Change-Id: I772880aa097a770722043c8a4393552ba38a89b6

CMakeLists.txt

@@ -104,7 +104,7 @@ endforeach()
 ### Define the mandatory libraries.
 # Build the webpdecoder library.
 add_definitions(-Wall)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/ ${WEBP_DEP_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${WEBP_DEP_INCLUDE_DIRS})
 add_library(webpdecode OBJECT ${WEBP_DEC_SRCS})
 add_library(webpdspdecode OBJECT ${WEBP_DSP_COMMON_SRCS} ${WEBP_DSP_DEC_SRCS})
 add_library(webputilsdecode OBJECT ${WEBP_UTILS_COMMON_SRCS}
@@ -195,6 +195,10 @@ if(WEBP_BUILD_CWEBP OR WEBP_BUILD_DWEBP OR
     "imageenc_[^ ]*")
   add_library(imageenc ${IMAGEENC_SRCS})
   target_link_libraries(imageenc webp)
+
+  set_property(TARGET exampleutil imageioutil imagedec imageenc
+    PROPERTY INCLUDE_DIRECTORIES
+    ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
 endif()
 
 if(WEBP_BUILD_DWEBP)
@@ -205,6 +209,8 @@ if(WEBP_BUILD_DWEBP)
   add_executable(dwebp ${DWEBP_SRCS})
   target_link_libraries(dwebp exampleutil imagedec imageenc webpdecoder)
   install(TARGETS dwebp RUNTIME DESTINATION bin)
+  set_property(TARGET dwebp PROPERTY INCLUDE_DIRECTORIES
+    ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
 endif()
 
 if(WEBP_BUILD_CWEBP)
@@ -215,6 +221,8 @@ if(WEBP_BUILD_CWEBP)
   add_executable(cwebp ${CWEBP_SRCS})
   target_link_libraries(cwebp exampleutil imagedec webp)
   install(TARGETS cwebp RUNTIME DESTINATION bin)
+  set_property(TARGET cwebp PROPERTY INCLUDE_DIRECTORIES
+    ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
 endif()
 
 if(WEBP_BUILD_GIF2WEBP AND NOT GIF_FOUND)
@@ -241,6 +249,8 @@ if(WEBP_BUILD_GIF2WEBP)
   target_link_libraries(gif2webp exampleutil imageioutil webp webpmux
     ${WEBP_DEP_GIF_LIBRARIES})
   install(TARGETS gif2webp RUNTIME DESTINATION bin)
+  set_property(TARGET gif2webp PROPERTY INCLUDE_DIRECTORIES
+    ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
 endif()
 
 if(WEBP_BUILD_IMG2WEBP)
@@ -251,6 +261,8 @@ if(WEBP_BUILD_IMG2WEBP)
   add_executable(img2webp ${IMG2WEBP_SRCS})
   target_link_libraries(img2webp exampleutil imagedec imageioutil webp webpmux)
   install(TARGETS img2webp RUNTIME DESTINATION bin)
+  set_property(TARGET img2webp PROPERTY INCLUDE_DIRECTORIES
+    ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
 endif()
 
 if (WEBP_BUILD_WEBPINFO)
@@ -261,6 +273,8 @@ if (WEBP_BUILD_WEBPINFO)
   add_executable(webpinfo ${WEBPINFO_SRCS})
   target_link_libraries(webpinfo exampleutil imageioutil)
   install(TARGETS webpinfo RUNTIME DESTINATION bin)
+  set_property(TARGET webpinfo PROPERTY INCLUDE_DIRECTORIES
+    ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
 endif()
 
 if(WEBP_BUILD_WEBP_JS)
@@ -288,13 +302,11 @@ endif()
 
 # Generate the config.h file.
 configure_file(${CMAKE_CURRENT_LIST_DIR}/cmake/config.h.in
-  ${CMAKE_CURRENT_BINARY_DIR}/include/webp/config.h)
+  ${CMAKE_CURRENT_BINARY_DIR}/src/webp/config.h)
 add_definitions(-DHAVE_CONFIG_H)
 # The webp folder is included as we reference config.h as
 # ../webp/config.h or webp/config.h
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/include
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
-  ${CMAKE_CURRENT_BINARY_DIR}/include/webp
-)
 
 # Install the different headers and libraries.
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/decode.h

Makefile.vc

@@ -29,7 +29,7 @@ PLATFORM_LDFLAGS = /SAFESEH
 NOLOGO     = /nologo
 CCNODBG    = cl.exe $(NOLOGO) /O2 /DNDEBUG
 CCDEBUG    = cl.exe $(NOLOGO) /Od /Gm /Zi /D_DEBUG /RTC1
-CFLAGS     = /Isrc $(NOLOGO) /W3 /EHsc /c
+CFLAGS     = /I. /Isrc $(NOLOGO) /W3 /EHsc /c
 CFLAGS     = $(CFLAGS) /DWIN32 /D_CRT_SECURE_NO_WARNINGS /DWIN32_LEAN_AND_MEAN
 LDFLAGS    = /LARGEADDRESSAWARE /MANIFEST /NXCOMPAT /DYNAMICBASE
 LDFLAGS    = $(LDFLAGS) $(PLATFORM_LDFLAGS)

build.gradle

@@ -88,6 +88,8 @@ model {
       } else {
         NEON = "c"
       }
+
+      cCompiler.args "-I" + file(".").absolutePath
     }
     // Link to pthread for shared libraries.
     withType(SharedLibraryBinarySpec) {

cmake/cpu.cmake

@@ -1,4 +1,5 @@
 ## Check for SIMD extensions.
+include(CMakePushCheckState)
 
 function(webp_check_compiler_flag WEBP_SIMD_FLAG ENABLE_SIMD)
   if(NOT ENABLE_SIMD)
@@ -7,6 +8,8 @@ function(webp_check_compiler_flag WEBP_SIMD_FLAG ENABLE_SIMD)
     return()
   endif()
   unset(WEBP_HAVE_FLAG_${WEBP_SIMD_FLAG} CACHE)
+  cmake_push_check_state()
+  set(CMAKE_REQUIRED_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR})
   check_c_source_compiles("
       #include \"${CMAKE_CURRENT_LIST_DIR}/../src/dsp/dsp.h\"
       int main(void) {
@@ -17,6 +20,7 @@ function(webp_check_compiler_flag WEBP_SIMD_FLAG ENABLE_SIMD)
       }
     " WEBP_HAVE_FLAG_${WEBP_SIMD_FLAG}
   )
+  cmake_pop_check_state()
   if(WEBP_HAVE_FLAG_${WEBP_SIMD_FLAG})
     set(WEBP_HAVE_${WEBP_SIMD_FLAG} 1 PARENT_SCOPE)
   else()
@@ -54,7 +58,6 @@ endif()
 list(LENGTH WEBP_SIMD_FLAGS WEBP_SIMD_FLAGS_LENGTH)
 math(EXPR WEBP_SIMD_FLAGS_RANGE "${WEBP_SIMD_FLAGS_LENGTH} - 1")
 
-include(CMakePushCheckState)
 foreach(I_SIMD RANGE ${WEBP_SIMD_FLAGS_RANGE})
   list(GET WEBP_SIMD_FLAGS ${I_SIMD} WEBP_SIMD_FLAG)
 

extras/Makefile.am

@@ -1,3 +1,4 @@
+AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir)
 AM_CPPFLAGS += -I$(top_builddir)/src -I$(top_srcdir)/src
 noinst_LTLIBRARIES = libwebpextras.la
 

extras/extras.c

@@ -10,7 +10,7 @@
 //  Additional WebP utilities.
 //
 
-#include "./extras.h"
+#include "extras/extras.h"
 #include "webp/format_constants.h"
 
 #include <assert.h>

extras/get_disto.c

@@ -24,8 +24,8 @@
 #include <string.h>
 
 #include "webp/encode.h"
-#include "../imageio/image_dec.h"
+#include "imageio/image_dec.h"
-#include "../imageio/imageio_util.h"
+#include "imageio/imageio_util.h"
 
 static size_t ReadPicture(const char* const filename, WebPPicture* const pic,
                           int keep_alpha) {

extras/quality_estimate.c

@@ -11,7 +11,7 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./extras.h"
+#include "extras/extras.h"
 #include "webp/decode.h"
 
 #include <math.h>

extras/vwebp_sdl.c

@@ -24,7 +24,7 @@
 
 #include "webp_to_sdl.h"
 #include "webp/decode.h"
-#include "../imageio/imageio_util.h"
+#include "imageio/imageio_util.h"
 
 #if defined(WEBP_HAVE_JUST_SDL_H)
 #include <SDL.h>

extras/webp_quality.c

@@ -11,8 +11,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "./extras.h"
+#include "extras/extras.h"
-#include "../imageio/imageio_util.h"
+#include "imageio/imageio_util.h"
 
 int main(int argc, const char *argv[]) {
   int c;

makefile.unix

@@ -113,7 +113,7 @@ endif
 
 AR = ar
 ARFLAGS = r
-CPPFLAGS = -Isrc/ -Wall
+CPPFLAGS = -I. -Isrc/ -Wall
 CFLAGS = -O3 -DNDEBUG $(EXTRA_FLAGS)
 CC = gcc
 INSTALL = install

src/dec/Makefile.am

@@ -1,3 +1,4 @@
+AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir)
 noinst_LTLIBRARIES = libwebpdecode.la
 
 libwebpdecode_la_SOURCES =

src/dec/alpha_dec.c

@@ -12,13 +12,13 @@
 // Author: Skal (pascal.massimino@gmail.com)
 
 #include <stdlib.h>
-#include "./alphai_dec.h"
+#include "src/dec/alphai_dec.h"
-#include "./vp8i_dec.h"
+#include "src/dec/vp8i_dec.h"
-#include "./vp8li_dec.h"
+#include "src/dec/vp8li_dec.h"
-#include "../dsp/dsp.h"
+#include "src/dsp/dsp.h"
-#include "../utils/quant_levels_dec_utils.h"
+#include "src/utils/quant_levels_dec_utils.h"
-#include "../utils/utils.h"
+#include "src/utils/utils.h"
-#include "../webp/format_constants.h"
+#include "src/webp/format_constants.h"
 
 //------------------------------------------------------------------------------
 // ALPHDecoder object.

src/dec/alphai_dec.h

@@ -14,8 +14,8 @@
 #ifndef WEBP_DEC_ALPHAI_H_
 #define WEBP_DEC_ALPHAI_H_
 
-#include "./webpi_dec.h"
+#include "src/dec/webpi_dec.h"
-#include "../utils/filters_utils.h"
+#include "src/utils/filters_utils.h"
 
 #ifdef __cplusplus
 extern "C" {

src/dec/buffer_dec.c

@@ -13,9 +13,9 @@
 
 #include <stdlib.h>
 
-#include "./vp8i_dec.h"
+#include "src/dec/vp8i_dec.h"
-#include "./webpi_dec.h"
+#include "src/dec/webpi_dec.h"
-#include "../utils/utils.h"
+#include "src/utils/utils.h"
 
 //------------------------------------------------------------------------------
 // WebPDecBuffer

src/dec/frame_dec.c

@@ -12,8 +12,8 @@
 // Author: Skal (pascal.massimino@gmail.com)
 
 #include <stdlib.h>
-#include "./vp8i_dec.h"
+#include "src/dec/vp8i_dec.h"
-#include "../utils/utils.h"
+#include "src/utils/utils.h"
 
 //------------------------------------------------------------------------------
 // Main reconstruction function.

src/dec/idec_dec.c

@@ -15,10 +15,10 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "./alphai_dec.h"
+#include "src/dec/alphai_dec.h"
-#include "./webpi_dec.h"
+#include "src/dec/webpi_dec.h"
-#include "./vp8i_dec.h"
+#include "src/dec/vp8i_dec.h"
-#include "../utils/utils.h"
+#include "src/utils/utils.h"
 
 // In append mode, buffer allocations increase as multiples of this value.
 // Needs to be a power of 2.

src/dec/io_dec.c

@@ -13,11 +13,11 @@
 
 #include <assert.h>
 #include <stdlib.h>
-#include "../dec/vp8i_dec.h"
+#include "src/dec/vp8i_dec.h"
-#include "./webpi_dec.h"
+#include "src/dec/webpi_dec.h"
-#include "../dsp/dsp.h"
+#include "src/dsp/dsp.h"
-#include "../dsp/yuv.h"
+#include "src/dsp/yuv.h"
-#include "../utils/utils.h"
+#include "src/utils/utils.h"
 
 //------------------------------------------------------------------------------
 // Main YUV<->RGB conversion functions

src/dec/quant_dec.c

@@ -11,7 +11,7 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./vp8i_dec.h"
+#include "src/dec/vp8i_dec.h"
 
 static WEBP_INLINE int clip(int v, int M) {
   return v < 0 ? 0 : v > M ? M : v;

src/dec/tree_dec.c

@@ -11,8 +11,8 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./vp8i_dec.h"
+#include "src/dec/vp8i_dec.h"
-#include "../utils/bit_reader_inl_utils.h"
+#include "src/utils/bit_reader_inl_utils.h"
 
 #if !defined(USE_GENERIC_TREE)
 #if !defined(__arm__) && !defined(_M_ARM) && !defined(__aarch64__)

src/dec/vp8_dec.c

@@ -13,12 +13,12 @@
 
 #include <stdlib.h>
 
-#include "./alphai_dec.h"
+#include "src/dec/alphai_dec.h"
-#include "./vp8i_dec.h"
+#include "src/dec/vp8i_dec.h"
-#include "./vp8li_dec.h"
+#include "src/dec/vp8li_dec.h"
-#include "./webpi_dec.h"
+#include "src/dec/webpi_dec.h"
-#include "../utils/bit_reader_inl_utils.h"
+#include "src/utils/bit_reader_inl_utils.h"
-#include "../utils/utils.h"
+#include "src/utils/utils.h"
 
 //------------------------------------------------------------------------------
 

src/dec/vp8_dec.h

@@ -14,7 +14,7 @@
 #ifndef WEBP_WEBP_DECODE_VP8_H_
 #define WEBP_WEBP_DECODE_VP8_H_
 
-#include "../webp/decode.h"
+#include "src/webp/decode.h"
 
 #ifdef __cplusplus
 extern "C" {

src/dec/vp8i_dec.h

@@ -15,12 +15,12 @@
 #define WEBP_DEC_VP8I_H_
 
 #include <string.h>     // for memcpy()
-#include "./common_dec.h"
+#include "src/dec/common_dec.h"
-#include "./vp8li_dec.h"
+#include "src/dec/vp8li_dec.h"
-#include "../utils/bit_reader_utils.h"
+#include "src/utils/bit_reader_utils.h"
-#include "../utils/random_utils.h"
+#include "src/utils/random_utils.h"
-#include "../utils/thread_utils.h"
+#include "src/utils/thread_utils.h"
-#include "../dsp/dsp.h"
+#include "src/dsp/dsp.h"
 
 #ifdef __cplusplus
 extern "C" {

src/dec/vp8l_dec.c

@@ -14,15 +14,15 @@
 
 #include <stdlib.h>
 
-#include "./alphai_dec.h"
+#include "src/dec/alphai_dec.h"
-#include "./vp8li_dec.h"
+#include "src/dec/vp8li_dec.h"
-#include "../dsp/dsp.h"
+#include "src/dsp/dsp.h"
-#include "../dsp/lossless.h"
+#include "src/dsp/lossless.h"
-#include "../dsp/lossless_common.h"
+#include "src/dsp/lossless_common.h"
-#include "../dsp/yuv.h"
+#include "src/dsp/yuv.h"
-#include "../utils/endian_inl_utils.h"
+#include "src/utils/endian_inl_utils.h"
-#include "../utils/huffman_utils.h"
+#include "src/utils/huffman_utils.h"
-#include "../utils/utils.h"
+#include "src/utils/utils.h"
 
 #define NUM_ARGB_CACHE_ROWS          16
 

src/dec/vp8li_dec.h

@@ -16,10 +16,10 @@
 #define WEBP_DEC_VP8LI_H_
 
 #include <string.h>     // for memcpy()
-#include "./webpi_dec.h"
+#include "src/dec/webpi_dec.h"
-#include "../utils/bit_reader_utils.h"
+#include "src/utils/bit_reader_utils.h"
-#include "../utils/color_cache_utils.h"
+#include "src/utils/color_cache_utils.h"
-#include "../utils/huffman_utils.h"
+#include "src/utils/huffman_utils.h"
 
 #ifdef __cplusplus
 extern "C" {

src/dec/webp_dec.c

@@ -13,11 +13,11 @@
 
 #include <stdlib.h>
 
-#include "./vp8i_dec.h"
+#include "src/dec/vp8i_dec.h"
-#include "./vp8li_dec.h"
+#include "src/dec/vp8li_dec.h"
-#include "./webpi_dec.h"
+#include "src/dec/webpi_dec.h"
-#include "../utils/utils.h"
+#include "src/utils/utils.h"
-#include "../webp/mux_types.h"  // ALPHA_FLAG
+#include "src/webp/mux_types.h"  // ALPHA_FLAG
 
 //------------------------------------------------------------------------------
 // RIFF layout is:

src/dec/webpi_dec.h

@@ -18,8 +18,8 @@
 extern "C" {
 #endif
 
-#include "../utils/rescaler_utils.h"
+#include "src/utils/rescaler_utils.h"
-#include "./vp8_dec.h"
+#include "src/dec/vp8_dec.h"
 
 //------------------------------------------------------------------------------
 // WebPDecParams: Decoding output parameters. Transient internal object.

src/demux/Makefile.am

@@ -1,3 +1,4 @@
+AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir)
 lib_LTLIBRARIES = libwebpdemux.la
 
 libwebpdemux_la_SOURCES =

src/demux/anim_decode.c

@@ -11,15 +11,15 @@
 //
 
 #ifdef HAVE_CONFIG_H
-#include "../webp/config.h"
+#include "src/webp/config.h"
 #endif
 
 #include <assert.h>
 #include <string.h>
 
-#include "../utils/utils.h"
+#include "src/utils/utils.h"
-#include "../webp/decode.h"
+#include "src/webp/decode.h"
-#include "../webp/demux.h"
+#include "src/webp/demux.h"
 
 #define NUM_CHANNELS 4
 

src/demux/demux.c

@@ -11,17 +11,17 @@
 //
 
 #ifdef HAVE_CONFIG_H
-#include "../webp/config.h"
+#include "src/webp/config.h"
 #endif
 
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "../utils/utils.h"
+#include "src/utils/utils.h"
-#include "../webp/decode.h"     // WebPGetFeatures
+#include "src/webp/decode.h"     // WebPGetFeatures
-#include "../webp/demux.h"
+#include "src/webp/demux.h"
-#include "../webp/format_constants.h"
+#include "src/webp/format_constants.h"
 
 #define DMUX_MAJ_VERSION 0
 #define DMUX_MIN_VERSION 3

src/dsp/Makefile.am

@@ -1,3 +1,4 @@
+AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir)
 noinst_LTLIBRARIES =
 noinst_LTLIBRARIES += libwebpdsp.la
 noinst_LTLIBRARIES += libwebpdsp_avx2.la

src/dsp/alpha_processing.c

@@ -12,7 +12,7 @@
 // Author: Skal (pascal.massimino@gmail.com)
 
 #include <assert.h>
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 // Tables can be faster on some platform but incur some extra binary size (~2k).
 #if !defined(USE_TABLES_FOR_ALPHA_MULT)

src/dsp/alpha_processing_mips_dsp_r2.c

@@ -12,7 +12,7 @@
 // Author(s): Branimir Vasic (branimir.vasic@imgtec.com)
 //            Djordje Pesut  (djordje.pesut@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MIPS_DSP_R2)
 

src/dsp/alpha_processing_neon.c

@@ -11,11 +11,11 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_NEON)
 
-#include "./neon.h"
+#include "src/dsp/neon.h"
 
 //------------------------------------------------------------------------------
 

src/dsp/alpha_processing_sse2.c

@@ -11,7 +11,7 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE2)
 #include <emmintrin.h>

src/dsp/alpha_processing_sse41.c

@@ -11,7 +11,7 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE41)
 

src/dsp/cost.c

@@ -9,8 +9,8 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
-#include "../enc/cost_enc.h"
+#include "src/enc/cost_enc.h"
 
 //------------------------------------------------------------------------------
 // Boolean-cost cost table

src/dsp/cost_mips32.c

@@ -9,11 +9,11 @@
 //
 // Author: Djordje Pesut (djordje.pesut@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MIPS32)
 
-#include "../enc/cost_enc.h"
+#include "src/enc/cost_enc.h"
 
 static int GetResidualCost_MIPS32(int ctx0, const VP8Residual* const res) {
   int temp0, temp1;

src/dsp/cost_mips_dsp_r2.c

@@ -9,11 +9,11 @@
 //
 // Author: Djordje Pesut (djordje.pesut@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MIPS_DSP_R2)
 
-#include "../enc/cost_enc.h"
+#include "src/enc/cost_enc.h"
 
 static int GetResidualCost_MIPSdspR2(int ctx0, const VP8Residual* const res) {
   int temp0, temp1;

src/dsp/cost_sse2.c

@@ -11,14 +11,14 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE2)
 #include <emmintrin.h>
 
-#include "../enc/cost_enc.h"
+#include "src/enc/cost_enc.h"
-#include "../enc/vp8i_enc.h"
+#include "src/enc/vp8i_enc.h"
-#include "../utils/utils.h"
+#include "src/utils/utils.h"
 
 //------------------------------------------------------------------------------
 

src/dsp/cpu.c

@@ -11,7 +11,7 @@
 //
 // Author: Christian Duvivier (cduvivier@google.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_HAVE_NEON_RTCD)
 #include <stdio.h>

src/dsp/dec.c

@@ -11,9 +11,9 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
-#include "../dec/vp8i_dec.h"
+#include "src/dec/vp8i_dec.h"
-#include "../utils/utils.h"
+#include "src/utils/utils.h"
 
 //------------------------------------------------------------------------------
 

src/dsp/dec_clip_tables.c

@@ -11,7 +11,7 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 // define to 0 to have run-time table initialization
 #if !defined(USE_STATIC_TABLES)

src/dsp/dec_mips32.c

@@ -12,11 +12,11 @@
 // Author(s):  Djordje Pesut    (djordje.pesut@imgtec.com)
 //             Jovan Zelincevic (jovan.zelincevic@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MIPS32)
 
-#include "./mips_macro.h"
+#include "src/dsp/mips_macro.h"
 
 static const int kC1 = 20091 + (1 << 16);
 static const int kC2 = 35468;

src/dsp/dec_mips_dsp_r2.c

@@ -12,11 +12,11 @@
 // Author(s):  Djordje Pesut    (djordje.pesut@imgtec.com)
 //             Jovan Zelincevic (jovan.zelincevic@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MIPS_DSP_R2)
 
-#include "./mips_macro.h"
+#include "src/dsp/mips_macro.h"
 
 static const int kC1 = 20091 + (1 << 16);
 static const int kC2 = 35468;

src/dsp/dec_msa.c

@@ -12,11 +12,11 @@
 // Author(s):  Prashant Patil   (prashant.patil@imgtec.com)
 
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MSA)
 
-#include "./msa_macro.h"
+#include "src/dsp/msa_macro.h"
 
 //------------------------------------------------------------------------------
 // Transforms

src/dsp/dec_neon.c

@@ -12,12 +12,12 @@
 // Authors: Somnath Banerjee (somnath@google.com)
 //          Johann Koenig (johannkoenig@google.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_NEON)
 
-#include "./neon.h"
+#include "src/dsp/neon.h"
-#include "../dec/vp8i_dec.h"
+#include "src/dec/vp8i_dec.h"
 
 //------------------------------------------------------------------------------
 // NxM Loading functions

src/dsp/dec_sse2.c

@@ -12,7 +12,7 @@
 // Author: somnath@google.com (Somnath Banerjee)
 //         cduvivier@google.com (Christian Duvivier)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE2)
 
@@ -23,9 +23,9 @@
 #endif
 
 #include <emmintrin.h>
-#include "./common_sse2.h"
+#include "src/dsp/common_sse2.h"
-#include "../dec/vp8i_dec.h"
+#include "src/dec/vp8i_dec.h"
-#include "../utils/utils.h"
+#include "src/utils/utils.h"
 
 //------------------------------------------------------------------------------
 // Transforms (Paragraph 14.4)

src/dsp/dec_sse41.c

@@ -11,13 +11,13 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE41)
 
 #include <smmintrin.h>
-#include "../dec/vp8i_dec.h"
+#include "src/dec/vp8i_dec.h"
-#include "../utils/utils.h"
+#include "src/utils/utils.h"
 
 static void HE16(uint8_t* dst) {     // horizontal
   int j;

src/dsp/dsp.h

@@ -15,10 +15,10 @@
 #define WEBP_DSP_DSP_H_
 
 #ifdef HAVE_CONFIG_H
-#include "../webp/config.h"
+#include "src/webp/config.h"
 #endif
 
-#include "../webp/types.h"
+#include "src/webp/types.h"
 
 #ifdef __cplusplus
 extern "C" {

src/dsp/enc.c

@@ -14,8 +14,8 @@
 #include <assert.h>
 #include <stdlib.h>  // for abs()
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
-#include "../enc/vp8i_enc.h"
+#include "src/enc/vp8i_enc.h"
 
 static WEBP_INLINE uint8_t clip_8b(int v) {
   return (!(v & ~0xff)) ? v : (v < 0) ? 0 : 255;

src/dsp/enc_avx2.c

@@ -9,7 +9,7 @@
 //
 // AVX2 version of speed-critical encoding functions.
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_AVX2)
 

src/dsp/enc_mips32.c

@@ -13,13 +13,13 @@
 //            Jovan Zelincevic (jovan.zelincevic@imgtec.com)
 //            Slobodan Prijic  (slobodan.prijic@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MIPS32)
 
-#include "./mips_macro.h"
+#include "src/dsp/mips_macro.h"
-#include "../enc/vp8i_enc.h"
+#include "src/enc/vp8i_enc.h"
-#include "../enc/cost_enc.h"
+#include "src/enc/cost_enc.h"
 
 static const int kC1 = 20091 + (1 << 16);
 static const int kC2 = 35468;

src/dsp/enc_mips_dsp_r2.c

@@ -12,13 +12,13 @@
 // Author(s): Darko Laus (darko.laus@imgtec.com)
 //            Mirko Raus (mirko.raus@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MIPS_DSP_R2)
 
-#include "./mips_macro.h"
+#include "src/dsp/mips_macro.h"
-#include "../enc/cost_enc.h"
+#include "src/enc/cost_enc.h"
-#include "../enc/vp8i_enc.h"
+#include "src/enc/vp8i_enc.h"
 
 static const int kC1 = 20091 + (1 << 16);
 static const int kC2 = 35468;

src/dsp/enc_msa.c

@@ -11,13 +11,13 @@
 //
 // Author:  Prashant Patil   (prashant.patil@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MSA)
 
 #include <stdlib.h>
-#include "./msa_macro.h"
+#include "src/dsp/msa_macro.h"
-#include "../enc/vp8i_enc.h"
+#include "src/enc/vp8i_enc.h"
 
 //------------------------------------------------------------------------------
 // Transforms

src/dsp/enc_neon.c

@@ -11,14 +11,14 @@
 //
 // adapted from libvpx (http://www.webmproject.org/code/)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_NEON)
 
 #include <assert.h>
 
-#include "./neon.h"
+#include "src/dsp/neon.h"
-#include "../enc/vp8i_enc.h"
+#include "src/enc/vp8i_enc.h"
 
 //------------------------------------------------------------------------------
 // Transforms (Paragraph 14.4)

src/dsp/enc_sse2.c

@@ -11,16 +11,16 @@
 //
 // Author: Christian Duvivier (cduvivier@google.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE2)
 #include <assert.h>
 #include <stdlib.h>  // for abs()
 #include <emmintrin.h>
 
-#include "./common_sse2.h"
+#include "src/dsp/common_sse2.h"
-#include "../enc/cost_enc.h"
+#include "src/enc/cost_enc.h"
-#include "../enc/vp8i_enc.h"
+#include "src/enc/vp8i_enc.h"
 
 //------------------------------------------------------------------------------
 // Transforms (Paragraph 14.4)

src/dsp/enc_sse41.c

@@ -11,14 +11,14 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE41)
 #include <smmintrin.h>
 #include <stdlib.h>  // for abs()
 
-#include "./common_sse2.h"
+#include "src/dsp/common_sse2.h"
-#include "../enc/vp8i_enc.h"
+#include "src/enc/vp8i_enc.h"
 
 //------------------------------------------------------------------------------
 // Compute susceptibility based on DCT-coeff histograms.

src/dsp/filters.c

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

src/dsp/filters_mips_dsp_r2.c

@@ -12,11 +12,11 @@
 // Author(s): Branimir Vasic (branimir.vasic@imgtec.com)
 //            Djordje Pesut (djordje.pesut@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MIPS_DSP_R2)
 
-#include "../dsp/dsp.h"
+#include "src/dsp/dsp.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>

src/dsp/filters_msa.c

@@ -11,11 +11,11 @@
 //
 // Author: Prashant Patil (prashant.patil@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MSA)
 
-#include "./msa_macro.h"
+#include "src/dsp/msa_macro.h"
 
 #include <assert.h>
 

src/dsp/filters_neon.c

@@ -11,12 +11,12 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_NEON)
 
 #include <assert.h>
-#include "./neon.h"
+#include "src/dsp/neon.h"
 
 //------------------------------------------------------------------------------
 // Helpful macros.

src/dsp/filters_sse2.c

@@ -11,7 +11,7 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE2)
 

src/dsp/lossless.c

@@ -13,14 +13,14 @@
 //          Jyrki Alakuijala (jyrki@google.com)
 //          Urvang Joshi (urvang@google.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #include <math.h>
 #include <stdlib.h>
-#include "../dec/vp8li_dec.h"
+#include "src/dec/vp8li_dec.h"
-#include "../utils/endian_inl_utils.h"
+#include "src/utils/endian_inl_utils.h"
-#include "./lossless.h"
+#include "src/dsp/lossless.h"
-#include "./lossless_common.h"
+#include "src/dsp/lossless_common.h"
 
 #define MAX_DIFF_COST (1e30f)
 

src/dsp/lossless.h

@@ -15,18 +15,18 @@
 #ifndef WEBP_DSP_LOSSLESS_H_
 #define WEBP_DSP_LOSSLESS_H_
 
-#include "../webp/types.h"
+#include "src/webp/types.h"
-#include "../webp/decode.h"
+#include "src/webp/decode.h"
 
-#include "../enc/histogram_enc.h"
+#include "src/enc/histogram_enc.h"
-#include "../utils/utils.h"
+#include "src/utils/utils.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #ifdef WEBP_EXPERIMENTAL_FEATURES
-#include "../enc/delta_palettization_enc.h"
+#include "src/enc/delta_palettization_enc.h"
 #endif  // WEBP_EXPERIMENTAL_FEATURES
 
 //------------------------------------------------------------------------------

src/dsp/lossless_common.h

@@ -16,9 +16,9 @@
 #ifndef WEBP_DSP_LOSSLESS_COMMON_H_
 #define WEBP_DSP_LOSSLESS_COMMON_H_
 
-#include "../webp/types.h"
+#include "src/webp/types.h"
 
-#include "../utils/utils.h"
+#include "src/utils/utils.h"
 
 #ifdef __cplusplus
 extern "C" {

src/dsp/lossless_enc.c

@@ -13,15 +13,15 @@
 //          Jyrki Alakuijala (jyrki@google.com)
 //          Urvang Joshi (urvang@google.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #include <math.h>
 #include <stdlib.h>
-#include "../dec/vp8li_dec.h"
+#include "src/dec/vp8li_dec.h"
-#include "../utils/endian_inl_utils.h"
+#include "src/utils/endian_inl_utils.h"
-#include "./lossless.h"
+#include "src/dsp/lossless.h"
-#include "./lossless_common.h"
+#include "src/dsp/lossless_common.h"
-#include "./yuv.h"
+#include "src/dsp/yuv.h"
 
 // lookup table for small values of log2(int)
 const float kLog2Table[LOG_LOOKUP_IDX_MAX] = {

src/dsp/lossless_enc_mips32.c

@@ -12,9 +12,9 @@
 // Author(s):  Djordje Pesut    (djordje.pesut@imgtec.com)
 //             Jovan Zelincevic (jovan.zelincevic@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
-#include "./lossless.h"
+#include "src/dsp/lossless.h"
-#include "./lossless_common.h"
+#include "src/dsp/lossless_common.h"
 
 #if defined(WEBP_USE_MIPS32)
 

src/dsp/lossless_enc_mips_dsp_r2.c

@@ -12,11 +12,11 @@
 // Author(s):  Djordje Pesut    (djordje.pesut@imgtec.com)
 //             Jovan Zelincevic (jovan.zelincevic@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MIPS_DSP_R2)
 
-#include "./lossless.h"
+#include "src/dsp/lossless.h"
 
 static void SubtractGreenFromBlueAndRed_MIPSdspR2(uint32_t* argb_data,
                                                   int num_pixels) {

src/dsp/lossless_enc_msa.c

@@ -11,12 +11,12 @@
 //
 // Authors: Prashant Patil (Prashant.Patil@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MSA)
 
-#include "./lossless.h"
+#include "src/dsp/lossless.h"
-#include "./msa_macro.h"
+#include "src/dsp/msa_macro.h"
 
 #define TRANSFORM_COLOR_8(src0, src1, dst0, dst1, c0, c1, mask0, mask1) do {  \
   v8i16 g0, g1, t0, t1, t2, t3;                                               \

src/dsp/lossless_enc_neon.c

@@ -11,14 +11,14 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_NEON)
 
 #include <arm_neon.h>
 
-#include "./lossless.h"
+#include "src/dsp/lossless.h"
-#include "./neon.h"
+#include "src/dsp/neon.h"
 
 //------------------------------------------------------------------------------
 // Subtract-Green Transform

src/dsp/lossless_enc_sse2.c

@@ -11,14 +11,14 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE2)
 #include <assert.h>
 #include <emmintrin.h>
-#include "./lossless.h"
+#include "src/dsp/lossless.h"
-#include "./common_sse2.h"
+#include "src/dsp/common_sse2.h"
-#include "./lossless_common.h"
+#include "src/dsp/lossless_common.h"
 
 // For sign-extended multiplying constants, pre-shifted by 5:
 #define CST_5b(X)  (((int16_t)((uint16_t)(X) << 8)) >> 5)

src/dsp/lossless_enc_sse41.c

@@ -11,12 +11,12 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE41)
 #include <assert.h>
 #include <smmintrin.h>
-#include "./lossless.h"
+#include "src/dsp/lossless.h"
 
 //------------------------------------------------------------------------------
 // Subtract-Green Transform

src/dsp/lossless_mips_dsp_r2.c

@@ -12,12 +12,12 @@
 // Author(s):  Djordje Pesut    (djordje.pesut@imgtec.com)
 //             Jovan Zelincevic (jovan.zelincevic@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MIPS_DSP_R2)
 
-#include "./lossless.h"
+#include "src/dsp/lossless.h"
-#include "./lossless_common.h"
+#include "src/dsp/lossless_common.h"
 
 #define MAP_COLOR_FUNCS(FUNC_NAME, TYPE, GET_INDEX, GET_VALUE)                 \
 static void FUNC_NAME(const TYPE* src,                                         \

src/dsp/lossless_msa.c

@@ -11,12 +11,12 @@
 //
 // Author: Prashant Patil (prashant.patil@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MSA)
 
-#include "./lossless.h"
+#include "src/dsp/lossless.h"
-#include "./msa_macro.h"
+#include "src/dsp/msa_macro.h"
 
 //------------------------------------------------------------------------------
 // Colorspace conversion functions

src/dsp/lossless_neon.c

@@ -11,14 +11,14 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_NEON)
 
 #include <arm_neon.h>
 
-#include "./lossless.h"
+#include "src/dsp/lossless.h"
-#include "./neon.h"
+#include "src/dsp/neon.h"
 
 //------------------------------------------------------------------------------
 // Colorspace conversion functions

src/dsp/lossless_sse2.c

@@ -11,13 +11,13 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE2)
 
-#include "./common_sse2.h"
+#include "src/dsp/common_sse2.h"
-#include "./lossless.h"
+#include "src/dsp/lossless.h"
-#include "./lossless_common.h"
+#include "src/dsp/lossless_common.h"
 #include <assert.h>
 #include <emmintrin.h>
 

src/dsp/neon.h

@@ -14,7 +14,7 @@
 
 #include <arm_neon.h>
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 // Right now, some intrinsics functions seem slower, so we disable them
 // everywhere except newer clang/gcc or aarch64 where the inline assembly is

src/dsp/rescaler.c

@@ -13,8 +13,8 @@
 
 #include <assert.h>
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
-#include "../utils/rescaler_utils.h"
+#include "src/utils/rescaler_utils.h"
 
 //------------------------------------------------------------------------------
 // Implementations of critical functions ImportRow / ExportRow

src/dsp/rescaler_mips32.c

@@ -11,12 +11,12 @@
 //
 // Author(s): Djordje Pesut (djordje.pesut@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MIPS32)
 
 #include <assert.h>
-#include "../utils/rescaler_utils.h"
+#include "src/utils/rescaler_utils.h"
 
 //------------------------------------------------------------------------------
 // Row import

src/dsp/rescaler_mips_dsp_r2.c

@@ -11,12 +11,12 @@
 //
 // Author(s): Djordje Pesut (djordje.pesut@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MIPS_DSP_R2)
 
 #include <assert.h>
-#include "../utils/rescaler_utils.h"
+#include "src/utils/rescaler_utils.h"
 
 #define ROUNDER (WEBP_RESCALER_ONE >> 1)
 #define MULT_FIX(x, y) (((uint64_t)(x) * (y) + ROUNDER) >> WEBP_RESCALER_RFIX)

src/dsp/rescaler_msa.c

@@ -11,14 +11,14 @@
 //
 // Author: Prashant Patil (prashant.patil@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MSA)
 
 #include <assert.h>
 
-#include "../utils/rescaler_utils.h"
+#include "src/utils/rescaler_utils.h"
-#include "./msa_macro.h"
+#include "src/dsp/msa_macro.h"
 
 #define ROUNDER (WEBP_RESCALER_ONE >> 1)
 #define MULT_FIX(x, y) (((uint64_t)(x) * (y) + ROUNDER) >> WEBP_RESCALER_RFIX)

src/dsp/rescaler_neon.c

@@ -11,14 +11,14 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_NEON)
 
 #include <arm_neon.h>
 #include <assert.h>
-#include "./neon.h"
+#include "src/dsp/neon.h"
-#include "../utils/rescaler_utils.h"
+#include "src/utils/rescaler_utils.h"
 
 #define ROUNDER (WEBP_RESCALER_ONE >> 1)
 #define MULT_FIX_C(x, y) (((uint64_t)(x) * (y) + ROUNDER) >> WEBP_RESCALER_RFIX)

src/dsp/rescaler_sse2.c

@@ -11,14 +11,14 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE2)
 #include <emmintrin.h>
 
 #include <assert.h>
-#include "../utils/rescaler_utils.h"
+#include "src/utils/rescaler_utils.h"
-#include "../utils/utils.h"
+#include "src/utils/utils.h"
 
 //------------------------------------------------------------------------------
 // Implementations of critical functions ImportRow / ExportRow

src/dsp/ssim.c

@@ -14,7 +14,7 @@
 #include <assert.h>
 #include <stdlib.h>  // for abs()
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 //------------------------------------------------------------------------------
 // SSIM / PSNR

src/dsp/ssim_sse2.c

@@ -11,14 +11,14 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE2)
 
 #include <assert.h>
 #include <emmintrin.h>
 
-#include "./common_sse2.h"
+#include "src/dsp/common_sse2.h"
 
 // Helper function
 static WEBP_INLINE void SubtractAndSquare(const __m128i a, const __m128i b,

src/dsp/upsampling.c

@@ -11,8 +11,8 @@
 //
 // Author: somnath@google.com (Somnath Banerjee)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
-#include "./yuv.h"
+#include "src/dsp/yuv.h"
 
 #include <assert.h>
 

src/dsp/upsampling_mips_dsp_r2.c

@@ -12,12 +12,12 @@
 // Author(s): Branimir Vasic (branimir.vasic@imgtec.com)
 //            Djordje Pesut  (djordje.pesut@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MIPS_DSP_R2)
 
 #include <assert.h>
-#include "./yuv.h"
+#include "src/dsp/yuv.h"
 
 #define YUV_TO_RGB(Y, U, V, R, G, B) do {                                      \
     const int t1 = MultHi(Y, 19077);                                           \

src/dsp/upsampling_msa.c

@@ -12,12 +12,12 @@
 // Author: Prashant Patil (prashant.patil@imgtec.com)
 
 #include <string.h>
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MSA)
 
-#include "./msa_macro.h"
+#include "src/dsp/msa_macro.h"
-#include "./yuv.h"
+#include "src/dsp/yuv.h"
 
 #ifdef FANCY_UPSAMPLING
 

src/dsp/upsampling_neon.c

@@ -12,15 +12,15 @@
 // Author: mans@mansr.com (Mans Rullgard)
 // Based on SSE code by: somnath@google.com (Somnath Banerjee)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_NEON)
 
 #include <assert.h>
 #include <arm_neon.h>
 #include <string.h>
-#include "./neon.h"
+#include "src/dsp/neon.h"
-#include "./yuv.h"
+#include "src/dsp/yuv.h"
 
 #ifdef FANCY_UPSAMPLING
 

src/dsp/upsampling_sse2.c

@@ -11,14 +11,14 @@
 //
 // Author: somnath@google.com (Somnath Banerjee)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE2)
 
 #include <assert.h>
 #include <emmintrin.h>
 #include <string.h>
-#include "./yuv.h"
+#include "src/dsp/yuv.h"
 
 #ifdef FANCY_UPSAMPLING
 

src/dsp/yuv.c

@@ -11,7 +11,7 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./yuv.h"
+#include "src/dsp/yuv.h"
 
 #include <stdlib.h>
 

src/dsp/yuv.h

@@ -35,8 +35,8 @@
 #ifndef WEBP_DSP_YUV_H_
 #define WEBP_DSP_YUV_H_
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
-#include "../dec/vp8_dec.h"
+#include "src/dec/vp8_dec.h"
 
 //------------------------------------------------------------------------------
 // YUV -> RGB conversion

src/dsp/yuv_mips32.c

@@ -12,11 +12,11 @@
 // Author(s):  Djordje Pesut    (djordje.pesut@imgtec.com)
 //             Jovan Zelincevic (jovan.zelincevic@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MIPS32)
 
-#include "./yuv.h"
+#include "src/dsp/yuv.h"
 
 //------------------------------------------------------------------------------
 // simple point-sampling

src/dsp/yuv_mips_dsp_r2.c

@@ -12,11 +12,11 @@
 // Author(s):  Branimir Vasic (branimir.vasic@imgtec.com)
 //             Djordje Pesut  (djordje.pesut@imgtec.com)
 
-#include "./dsp.h"
+#include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_MIPS_DSP_R2)
 
-#include "./yuv.h"
+#include "src/dsp/yuv.h"
 
 //------------------------------------------------------------------------------
 // simple point-sampling

src/dsp/yuv_neon.c

@@ -11,14 +11,14 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./yuv.h"
+#include "src/dsp/yuv.h"
 
 #if defined(WEBP_USE_NEON)
 
 #include <assert.h>
 #include <stdlib.h>
 
-#include "./neon.h"
+#include "src/dsp/neon.h"
 
 //-----------------------------------------------------------------------------
 

src/dsp/yuv_sse2.c

@@ -11,11 +11,11 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
-#include "./yuv.h"
+#include "src/dsp/yuv.h"
 
 #if defined(WEBP_USE_SSE2)
 
-#include "./common_sse2.h"
+#include "src/dsp/common_sse2.h"
 #include <stdlib.h>
 #include <emmintrin.h>
 

src/enc/Makefile.am

@@ -1,3 +1,4 @@
+AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir)
 noinst_LTLIBRARIES = libwebpencode.la
 
 libwebpencode_la_SOURCES =

src/enc/alpha_enc.c

@@ -14,12 +14,12 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "./vp8i_enc.h"
+#include "src/enc/vp8i_enc.h"
-#include "../dsp/dsp.h"
+#include "src/dsp/dsp.h"
-#include "../utils/filters_utils.h"
+#include "src/utils/filters_utils.h"
-#include "../utils/quant_levels_utils.h"
+#include "src/utils/quant_levels_utils.h"
-#include "../utils/utils.h"
+#include "src/utils/utils.h"
-#include "../webp/format_constants.h"
+#include "src/webp/format_constants.h"
 
 // -----------------------------------------------------------------------------
 // Encodes the given alpha data via specified compression method 'method'.
@@ -44,7 +44,7 @@
 //           invalid quality or method, or
 //           memory allocation for the compressed data fails.
 
-#include "../enc/vp8li_enc.h"
+#include "src/enc/vp8li_enc.h"
 
 static int EncodeLossless(const uint8_t* const data, int width, int height,
                           int effort_level,  // in [0..6] range

src/enc/analysis_enc.c

@@ -15,9 +15,9 @@
 #include <string.h>
 #include <assert.h>
 
-#include "./vp8i_enc.h"
+#include "src/enc/vp8i_enc.h"
-#include "./cost_enc.h"
+#include "src/enc/cost_enc.h"
-#include "../utils/utils.h"
+#include "src/utils/utils.h"
 
 #define MAX_ITERS_K_MEANS  6