| Message ID | 20170518114801.15487-1-arkadiusz.hiler@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, May 18, 2017 at 01:48:01PM +0200, Arkadiusz Hiler wrote: > 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. > > v2: keep lists of sources files in Makefile.sources (M. Wajdeczko) > > Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Regards, Michal
diff --git a/lib/Makefile.am b/lib/Makefile.am index c0ddf29..d616da0 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -22,6 +22,10 @@ if !HAVE_LIBDRM_INTEL stubs/drm/intel_bufmgr.h endif +if HAVE_CHAMELIUM +lib_source_list += $(chamelium_lib_source_list) +endif + AM_CPPFLAGS = -I$(top_srcdir) AM_CFLAGS = \ $(CWARNFLAGS) \ diff --git a/lib/Makefile.sources b/lib/Makefile.sources index 6348487..3a1e739 100644 --- a/lib/Makefile.sources +++ b/lib/Makefile.sources @@ -85,12 +85,10 @@ lib_source_list = \ igt_kmod.h \ $(NULL) -if HAVE_CHAMELIUM -lib_source_list += \ - igt_chamelium.h \ - igt_chamelium.c \ +chamelium_lib_source_list = \ + igt_chamelium.h \ + igt_chamelium.c \ $(NULL) -endif .PHONY: version.h.tmp diff --git a/lib/igt.h b/lib/igt.h index a97923e..a069deb 100644 --- a/lib/igt.h +++ b/lib/igt.h @@ -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 f421d83..15f6024 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 05681d5..0783ac0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -12,6 +12,10 @@ if HAVE_LIBDRM_VC4 TESTS_progs_M += $(VC4_TESTS_M) endif +if HAVE_CHAMELIUM +TESTS_progs_M += $(CHAMELIUM_TESTS_progs_M) +endif + if BUILD_TESTS test-list.txt: Makefile.sources @echo TESTLIST > $@ diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 9553e4d..253fc22 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -154,11 +154,9 @@ TESTS_progs_M = \ meta_test \ $(NULL) -if HAVE_CHAMELIUM -TESTS_progs_M += \ +CHAMELIUM_TESTS_progs_M = \ chamelium \ $(NULL) -endif TESTS_progs_XM = \ gem_concurrent_all \
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. v2: keep lists of sources files in Makefile.sources (M. Wajdeczko) Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> --- lib/Makefile.am | 4 ++++ lib/Makefile.sources | 8 +++----- lib/igt.h | 2 ++ lib/igt_chamelium.h | 3 +++ tests/Makefile.am | 4 ++++ tests/Makefile.sources | 4 +--- 6 files changed, 17 insertions(+), 8 deletions(-)