diff options
| author | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2017-04-12 12:33:12 +0200 |
|---|---|---|
| committer | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2017-06-07 13:28:13 +0300 |
| commit | a702b60782d713ebce9199b0007d8beb083e49fe (patch) | |
| tree | c3c07ce00d1583ef52b2a2e57d5f33f6532187fa | |
| parent | d7d3f4e87b827152f00bdf89a67871736672b492 (diff) | |
chamelium: Fix build issues on Android
Makefile.sources are included 1:1 in Android.mk files, and are not
parsed by automake. And yet those had some automake conditional logic.
Moving it to .am file is enough for now.
Also igt_chamelium.h included config.h without proper "HAVE_CONFIG_H"
guard, and the file itself was included unconditionally.
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
| -rw-r--r-- | lib/Makefile.am | 7 | ||||
| -rw-r--r-- | lib/Makefile.sources | 7 | ||||
| -rw-r--r-- | lib/igt.h | 2 | ||||
| -rw-r--r-- | lib/igt_chamelium.h | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/Makefile.sources | 6 |
6 files changed, 18 insertions, 13 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index c0ddf298..91e72c44 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -22,6 +22,13 @@ if !HAVE_LIBDRM_INTEL stubs/drm/intel_bufmgr.h endif +if HAVE_CHAMELIUM +lib_source_list += \ + igt_chamelium.h \ + igt_chamelium.c \ + $(NULL) +endif + AM_CPPFLAGS = -I$(top_srcdir) AM_CFLAGS = \ $(CWARNFLAGS) \ diff --git a/lib/Makefile.sources b/lib/Makefile.sources index 6348487f..53fdb54c 100644 --- a/lib/Makefile.sources +++ b/lib/Makefile.sources @@ -85,13 +85,6 @@ lib_source_list = \ igt_kmod.h \ $(NULL) -if HAVE_CHAMELIUM -lib_source_list += \ - igt_chamelium.h \ - igt_chamelium.c \ - $(NULL) -endif - .PHONY: version.h.tmp # leaving a space here to work around automake's conditionals @@ -38,7 +38,9 @@ #include "igt_kms.h" #include "igt_pm.h" #include "igt_stats.h" +#ifdef HAVE_CHAMELIUM #include "igt_chamelium.h" +#endif #include "instdone.h" #include "intel_batchbuffer.h" #include "intel_chipset.h" diff --git a/lib/igt_chamelium.h b/lib/igt_chamelium.h index f421d837..15f60246 100644 --- a/lib/igt_chamelium.h +++ b/lib/igt_chamelium.h @@ -26,7 +26,10 @@ #ifndef IGT_CHAMELIUM_H #define IGT_CHAMELIUM_H +#ifdef HAVE_CONFIG_H #include "config.h" +#endif + #include "igt.h" #include <stdbool.h> diff --git a/tests/Makefile.am b/tests/Makefile.am index 05681d50..61c7a153 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -12,6 +12,12 @@ if HAVE_LIBDRM_VC4 TESTS_progs_M += $(VC4_TESTS_M) endif +if HAVE_CHAMELIUM +TESTS_progs_M += \ + chamelium \ + $(NULL) +endif + if BUILD_TESTS test-list.txt: Makefile.sources @echo TESTLIST > $@ diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 9553e4d9..df1fee5c 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -154,12 +154,6 @@ TESTS_progs_M = \ meta_test \ $(NULL) -if HAVE_CHAMELIUM -TESTS_progs_M += \ - chamelium \ - $(NULL) -endif - TESTS_progs_XM = \ gem_concurrent_all \ $(NULL) |