dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-27 22:28:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "configure: move config.h to src/webp/config.h"

Browse Source
This commit is contained in:
James Zern 2014-06-11 22:52:07 -07:00 committed by Gerrit Code Review
commit 059e21c195
16 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -22,6 +22,8 @@ Makefile.in
examples/[cdv]webp examples/[cdv]webp
examples/gif2webp examples/gif2webp
examples/webpmux examples/webpmux
src/webp/config.h*
src/webp/stamp-h1
/output /output
/doc/output /doc/output
*.idb *.idb

2
configure.ac
View File

@ -459,7 +459,7 @@ AM_CONDITIONAL([BUILD_LIBWEBPDECODER], [test "$enable_libwebpdecoder" = "yes"])
dnl ========================= dnl =========================
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([src/webp/config.h])
AC_CONFIG_FILES([Makefile src/Makefile man/Makefile \ AC_CONFIG_FILES([Makefile src/Makefile man/Makefile \
examples/Makefile src/dec/Makefile \ examples/Makefile src/dec/Makefile \
src/enc/Makefile src/dsp/Makefile \ src/enc/Makefile src/dsp/Makefile \

2
examples/Makefile.am
View File

@ -1,4 +1,4 @@
AM_CPPFLAGS = -I$(top_srcdir)/src AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
bin_PROGRAMS = dwebp cwebp bin_PROGRAMS = dwebp cwebp
if BUILD_VWEBP if BUILD_VWEBP

2
examples/cwebp.c
View File

@ -17,7 +17,7 @@
#include <string.h> #include <string.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "webp/config.h"
#endif #endif
#include "webp/encode.h" #include "webp/encode.h"

2
examples/dwebp.c
View File

@ -17,7 +17,7 @@
#include <string.h> #include <string.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "webp/config.h"
#endif #endif
#ifdef WEBP_HAVE_PNG #ifdef WEBP_HAVE_PNG

2
examples/gif2webp.c
View File

@ -17,7 +17,7 @@
#include <string.h> #include <string.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "webp/config.h"
#endif #endif
#ifdef WEBP_HAVE_GIF #ifdef WEBP_HAVE_GIF

2
examples/jpegdec.c
View File

@ -12,7 +12,7 @@
#include "./jpegdec.h" #include "./jpegdec.h"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "webp/config.h"
#endif #endif
#include <stdio.h> #include <stdio.h>

2
examples/pngdec.c
View File

@ -12,7 +12,7 @@
#include "./pngdec.h" #include "./pngdec.h"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "webp/config.h"
#endif #endif
#include <stdio.h> #include <stdio.h>

2
examples/tiffdec.c
View File

@ -12,7 +12,7 @@
#include "./tiffdec.h" #include "./tiffdec.h"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "webp/config.h"
#endif #endif
#include <stdio.h> #include <stdio.h>

2
examples/vwebp.c
View File

@ -11,7 +11,7 @@
// //
// Author: Skal (pascal.massimino@gmail.com) // Author: Skal (pascal.massimino@gmail.com)
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "webp/config.h"
#endif #endif
#include <stdio.h> #include <stdio.h>

2
examples/webpmux.c
View File

@ -46,7 +46,7 @@
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "webp/config.h"
#endif #endif
#include <assert.h> #include <assert.h>

2
examples/wicdec.c
View File

@ -12,7 +12,7 @@
#include "./wicdec.h" #include "./wicdec.h"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "webp/config.h"
#endif #endif
#include <stdio.h> #include <stdio.h>

2
src/demux/demux.c
View File

@ -11,7 +11,7 @@
// //
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "../webp/config.h"
#endif #endif
#include <assert.h> #include <assert.h>

2
src/dsp/dsp.h
View File

@ -15,7 +15,7 @@
#define WEBP_DSP_DSP_H_ #define WEBP_DSP_DSP_H_
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "../webp/config.h"
#endif #endif
#include "../webp/types.h" #include "../webp/types.h"

2
src/enc/histogram.c
View File

@ -10,7 +10,7 @@
// Author: Jyrki Alakuijala (jyrki@google.com) // Author: Jyrki Alakuijala (jyrki@google.com)
// //
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "../webp/config.h"
#endif #endif
#include <math.h> #include <math.h>

2
src/utils/thread.h
View File

@ -15,7 +15,7 @@
#define WEBP_UTILS_THREAD_H_ #define WEBP_UTILS_THREAD_H_
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "../webp/config.h"
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus