build: define PACKAGE_BUILD_DIR as $(abs_top_builddir) for all test suites

Summary:
this needs to be consistent so that it can be used reliably across suites

also these build flags really need to be consolidated into a single variable
that can be reused

Depends on D6666

Reviewers: devilhorns, bu5hm4n

Reviewed By: bu5hm4n

Subscribers: bu5hm4n, cedric, #committers

Tags: #efl_build

Differential Revision: https://phab.enlightenment.org/D6731

diff --git a/src/Makefile_Cxx.am b/src/Makefile_Cxx.am
index 3638b21..6b0ebeb 100644 (file)
--- a/src/Makefile_Cxx.am
+++ b/src/Makefile_Cxx.am
@@ -238,7 +238,7 @@ tests/eina_cxx/simple.eo.impl.hh
 tests_eina_cxx_eina_cxx_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DTESTS_WD=\"`pwd`\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eina_cxx\" \
--DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eina_cxx\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eina_cxx\" \
 -I$(top_builddir)/src/lib/efl \
 -I$(top_builddir)/src/lib/efl/interfaces \
@@ -260,7 +260,7 @@ tests/eo_cxx/eo_cxx_suite.h
 tests_eo_cxx_eo_cxx_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DTESTS_WD=\"`pwd`\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eo_cxx\" \
--DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eo_cxx\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eo_cxx\" \
 -I$(top_builddir)/src/lib/efl \
 -I$(top_builddir)/src/lib/efl/interfaces \
@@ -289,6 +289,7 @@ tests_ecore_cxx_ecore_cxx_suite_CPPFLAGS = \
 -I$(top_builddir)/src/lib/efl \
 -I$(top_builddir)/src/lib/efl/interfaces \
 -I$(top_builddir)/src/lib/ecore \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_cxx\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_cxx\" \
 @CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @EINA_CFLAGS@ \
@@ -323,7 +324,7 @@ tests_eet_cxx_eet_cxx_suite_CPPFLAGS =      \
 -I$(top_builddir)/src/lib/efl \
 -DTESTS_WD=\"`pwd`\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet_cxx\" \
--DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eet_cxx\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eet_cxx\" \
 @EO_CFLAGS@ @CHECK_CFLAGS@ @EET_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EET_CFLAGS@ @EINA_CFLAGS@
 tests_eet_cxx_eet_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EET_LIBS@
@@ -349,6 +350,7 @@ tests_eldbus_cxx_eldbus_cxx_suite_CPPFLAGS = \
 -I$(top_builddir)/src/lib/efl \
 -I$(top_builddir)/src/lib/efl/interfaces \
 -I$(top_builddir)/src/lib/ecore \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eldbus\" \
 @CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EINA_CFLAGS@ \
 @ECORE_CFLAGS@ @EO_CFLAGS@ @EO_CXX_CFLAGS@ @ELDBUS_CFLAGS@

diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index e9f1f2b..0a0751d 100644 (file)
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -290,6 +290,7 @@ tests/ecore/ecore_test_args.c \
 tests/ecore/ecore_suite.h
 
 tests_ecore_ecore_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore\" \
 @CHECK_CFLAGS@ \
@@ -336,6 +337,7 @@ tests/ecore/efl_app_suite.c \
 tests/ecore/efl_app_suite.h
 
 tests_ecore_efl_app_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore\" \
 @CHECK_CFLAGS@ \

diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index ca1e80f..610328a 100644 (file)
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -219,6 +219,7 @@ tests/ecore_con/ecore_con_test_efl_net_ip_address.c \
 tests/ecore_con/ecore_con_suite.h
 
 tests_ecore_con_ecore_con_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_con\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_con\" \
 @CHECK_CFLAGS@ \

diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index f4e863b..6724cdb 100644 (file)
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -76,6 +76,7 @@ tests/eet/eet_test_common.h \
 tests/eet/eet_suite.h
 
 tests_eet_eet_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DTESTS_WD=\"`pwd`\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eet\" \

diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am
index 19d18f2..3fbba61 100644 (file)
--- a/src/Makefile_Eeze.am
+++ b/src/Makefile_Eeze.am
@@ -186,6 +186,7 @@ tests/eeze/eeze_test_sensor.c \
 tests/eeze/eeze_test_udev.c \
 tests/eeze/eeze_suite.h
 tests_eeze_eeze_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 @EEZE_CFLAGS@ \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eeze\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eeze\" \

diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 2dff540..551e907 100644 (file)
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -201,6 +201,7 @@ tests/efl/efl_test_model_composite.c \
 tests/efl/efl_suite.h
 
 tests_efl_efl_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/efl\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/efl\" \
 @CHECK_CFLAGS@ \

diff --git a/src/Makefile_Efl_Js.am b/src/Makefile_Efl_Js.am
index 6f2aa70..f4f7ae7 100644 (file)
--- a/src/Makefile_Efl_Js.am
+++ b/src/Makefile_Efl_Js.am
@@ -200,7 +200,7 @@ SUITE_RUNNER_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/bindings/js/eo_js \
 -DTESTS_WD=\"`pwd`\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/efl_js\" \
--DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/efl_js\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/efl_js\" \
 @CHECK_CFLAGS@ \
 @EFL_JS_CFLAGS@ \

diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am
index d1a6e5b..82e261e 100644 (file)
--- a/src/Makefile_Efreet.am
+++ b/src/Makefile_Efreet.am
@@ -235,6 +235,7 @@ tests/efreet/efreet_test_efreet.c \
 tests/efreet/efreet_test_efreet_cache.c
 
 tests_efreet_efreet_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@ \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/efreet\"
 tests_efreet_efreet_suite_LDADD = @CHECK_LIBS@ @USE_EFREET_LIBS@
 tests_efreet_efreet_suite_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@

diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am
index 3787636..6778ad4 100644 (file)
--- a/src/Makefile_Eio.am
+++ b/src/Makefile_Eio.am
@@ -89,6 +89,7 @@ tests/eio/eio_test_eet.c \
 tests/eio/eio_suite.h
 
 tests_eio_eio_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eio\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eio\" \
 @CHECK_CFLAGS@ \

diff --git a/src/Makefile_Eldbus.am b/src/Makefile_Eldbus.am
index 4a822a6..e51a7ab 100644 (file)
--- a/src/Makefile_Eldbus.am
+++ b/src/Makefile_Eldbus.am
@@ -145,6 +145,7 @@ tests/eldbus/eldbus_fake_server.c \
 tests/eldbus/eldbus_suite.h
 
 tests_eldbus_eldbus_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl @CHECK_CFLAGS@ @ELDBUS_CFLAGS@ \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 @EFL_CFLAGS@ -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eldbus\"
 
 tests_eldbus_eldbus_suite_LDADD = @CHECK_LIBS@ @USE_ELDBUS_LIBS@ @USE_EFL_LIBS@

diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 229197b..3f0e037 100644 (file)
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -1619,6 +1619,7 @@ tests_elementary_elm_suite_SOURCES = \
        tests/elementary/elm_test_focus_sub.c
 
 tests_elementary_elm_suite_CPPFLAGS = \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
        -DTESTS_BUILD_DIR=\"${top_builddir}/src/tests/elementary\" \
        -DTESTS_SRC_DIR=\"${top_srcdir}/src/tests/elementary\" \
        -DELM_IMAGE_DATA_DIR=\"${top_srcdir}/data/elementary\" \
@@ -1637,6 +1638,7 @@ tests_elementary_efl_ui_suite_SOURCES = \
        tests/elementary/efl_ui_suite.c
 
 tests_elementary_efl_ui_suite_CPPFLAGS = \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
        -DTESTS_BUILD_DIR=\"${top_builddir}/src/tests/elementary\" \
        -DTESTS_SRC_DIR=\"${top_srcdir}/src/tests/elementary\" \
        -DELM_IMAGE_DATA_DIR=\"${top_srcdir}/data/elementary\" \

diff --git a/src/Makefile_Elocation.am b/src/Makefile_Elocation.am
index 82ff192..292f473 100644 (file)
--- a/src/Makefile_Elocation.am
+++ b/src/Makefile_Elocation.am
@@ -33,6 +33,7 @@ if EFL_ENABLE_TESTS
 #tests/elocation/elocation_suite.c
 
 #tests_elocation_elocation_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 #-DTESTS_WD=\"`pwd`\" \
 #-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/elocation\" \
 #-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/elocation\" \

diff --git a/src/Makefile_Elput.am b/src/Makefile_Elput.am
index 5997ae6..d2b9793 100644 (file)
--- a/src/Makefile_Elput.am
+++ b/src/Makefile_Elput.am
@@ -44,6 +44,7 @@ tests/elput/elput_suite.h
 
 tests_elput_elput_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/elput\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/elput\" \
 @CHECK_CFLAGS@ \

diff --git a/src/Makefile_Emile.am b/src/Makefile_Emile.am
index 5f12b3d..90834cf 100644 (file)
--- a/src/Makefile_Emile.am
+++ b/src/Makefile_Emile.am
@@ -88,6 +88,7 @@ tests/emile/emile_suite.h
 
 tests_emile_emile_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DTESTS_WD=\"`pwd`\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/emile\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/emile\" \
 @CHECK_CFLAGS@ \

diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 7d318d2..43778be 100644 (file)
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -152,6 +152,7 @@ tests/eo/suite/eo_test_init.c \
 tests/eo/suite/eo_test_lifecycle.c
 
 tests_eo_eo_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eo\" \
 @CHECK_CFLAGS@ \
 @EO_CFLAGS@ \

diff --git a/src/Makefile_Eolian.am b/src/Makefile_Eolian.am
index d87f85b..721c205 100644 (file)
--- a/src/Makefile_Eolian.am
+++ b/src/Makefile_Eolian.am
@@ -131,6 +131,7 @@ tests/eolian/$(TESTS_EOLIAN_OBJNAME)eolian_suite-eolian_generated_future.$(OBJEX
 CLEANFILES += tests/eolian/generated_future.eo.h tests/eolian/generated_future.eo.c
 
 tests_eolian_eolian_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_builddir)/src/tests/eolian \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eolian\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eolian\" \
 -DEO_SRC_DIR=\"$(top_srcdir)/src/lib\" \

diff --git a/src/Makefile_Eolian_Cxx.am b/src/Makefile_Eolian_Cxx.am
index 4e2abce..5b0099a 100644 (file)
--- a/src/Makefile_Eolian_Cxx.am
+++ b/src/Makefile_Eolian_Cxx.am
@@ -176,7 +176,7 @@ tests_eolian_cxx_eolian_cxx_suite_CXXFLAGS = \
 -I$(top_builddir)/src/tests/eolian_cxx \
 -DTESTS_WD=\"`pwd`\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eolian_cxx\" \
--DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eolian_cxx\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DPACKAGE_DATA_DIR=\"$(top_srcdir)/src/tests/eolian_cxx\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eolian_cxx\" \
 @CHECK_CFLAGS@ @EOLIAN_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ \

diff --git a/src/Makefile_Eolian_Js.am b/src/Makefile_Eolian_Js.am
index 2c31d56..7e4e760 100644 (file)
--- a/src/Makefile_Eolian_Js.am
+++ b/src/Makefile_Eolian_Js.am
@@ -119,7 +119,7 @@ tests_eolian_js_eolian_js_suite_CPPFLAGS =  \
 -I$(top_srcdir)/src/tests/efl_js \
 -DTESTS_WD=\"`pwd`\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eolian_js\" \
--DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eolian_js\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/eolian_js\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eolian_js\" \
 @CHECK_CFLAGS@ @EOLIAN_CXX_CFLAGS@ @EINA_JS_CFLAGS@ @EO_JS_CFLAGS@ @EFL_JS_CFLAGS@ \

diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index a481f8b..dba1ba3 100755 (executable)
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -2560,6 +2560,7 @@ tests/evas/evas_suite.h
 tests_evas_evas_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/ecore_evas \
 -I$(top_builddir)/src/lib/evas/canvas \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/evas\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/evas\" \
 @CHECK_CFLAGS@ \