tests: include "sysdeps.h" wherever necessary.
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>
Fri, 28 Sep 2012 08:09:51 +0000 (10:09 +0200)
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>
Fri, 28 Sep 2012 08:14:15 +0000 (10:14 +0200)
Use "sysdeps.h" header instead of "config.h" so that to include the
necessary definitions for Android.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
test/common/Makefile.am
test/common/va_display.c
test/encode/Makefile.am
test/encode/avcenc.c
test/vainfo/Makefile.am
test/vainfo/vainfo.c

index 9bc4aeb..763847d 100644 (file)
@@ -24,6 +24,7 @@ noinst_LTLIBRARIES = libva-display.la
 
 libva_display_cflags = \
        -I$(top_srcdir)                         \
+       -I$(top_srcdir)/va                      \
        -I$(top_builddir)                       \
        -DIN_LIBVA                              \
        $(NULL)
index b4e8e7e..dd58dd2 100644 (file)
@@ -22,9 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "sysdeps.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
index 933ac72..01550e2 100644 (file)
@@ -25,14 +25,18 @@ if USE_X11
 bin_PROGRAMS += h264encode
 endif
 
+INCLUDES = \
+       -I$(top_srcdir)                 \
+       -I$(top_srcdir)/va              \
+       $(NULL)
+
 h264encode_SOURCES     = h264encode_x11.c
-h264encode_CFLAGS      = -I$(top_srcdir)
 h264encode_LDADD       = \
        $(top_builddir)/va/libva.la \
        $(top_builddir)/va/libva-x11.la
 
 avcenc_SOURCES         = avcenc.c
-avcenc_CFLAGS          = -I$(top_srcdir) -I$(top_srcdir)/test/common
+avcenc_CFLAGS          = -I$(top_srcdir)/test/common
 avcenc_LDADD           = \
        $(top_builddir)/va/libva.la \
        $(top_builddir)/test/common/libva-display.la
index 2f7f70f..2097949 100644 (file)
@@ -28,9 +28,7 @@
  * ./avcenc <width> <height> <input file> <output file> [qp]
  */  
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "sysdeps.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
index cd9c37b..680d099 100644 (file)
@@ -24,6 +24,7 @@ bin_PROGRAMS = vainfo
 
 vainfo_cflags = \
        -I$(top_srcdir)                         \
+       -I$(top_srcdir)/va                      \
        -I$(top_srcdir)/test/common             \
        -I$(top_builddir)                       \
        -DLIBVA_VERSION_S="\"$(LIBVA_VERSION)\"" \
index 7ef27bb..fc3dec7 100644 (file)
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include "sysdeps.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include "va_display.h"
-#include "va/sysdeps.h"
 
 #define CHECK_VASTATUS(va_status,func, ret)                             \
 if (va_status != VA_STATUS_SUCCESS) {                                   \