aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Cxx.am
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2017-02-09 21:24:33 -0200
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2017-02-09 21:24:33 -0200
commit80449ef83e29e1ccf83fa95e5a6d4781c169cea1 (patch)
treead2d2b9b00e11409cbdc4f3acc9c04efcfe1437b /src/Makefile_Cxx.am
parentrelease: Update NEWS and bump version for 1.19.0-alpha1 release (diff)
downloadefl-80449ef83e29e1ccf83fa95e5a6d4781c169cea1.tar.gz
elementary-cxx: Make C++ test compile a not used archive so linking can be avoided
Fixes linking errors for some older combos of C++ compiler and linker. https://phab.enlightenment.org/T2838
Diffstat (limited to 'src/Makefile_Cxx.am')
-rw-r--r--src/Makefile_Cxx.am23
1 files changed, 16 insertions, 7 deletions
diff --git a/src/Makefile_Cxx.am b/src/Makefile_Cxx.am
index 16317c8751..f564d4fa1e 100644
--- a/src/Makefile_Cxx.am
+++ b/src/Makefile_Cxx.am
@@ -348,20 +348,29 @@ tests_evas_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_EVAS_LIBS@
tests_evas_cxx_cxx_compile_test_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
### Tests for Elementary
-check_PROGRAMS += tests/elementary_cxx/cxx_compile_test
-TESTS += tests/elementary_cxx/cxx_compile_test
+check_PROGRAMS += tests/elementary_cxx/cxx_dummy_compile_test
+TESTS += tests/elementary_cxx/cxx_dummy_compile_test
-tests_elementary_cxx_cxx_compile_test_SOURCES = tests/elementary_cxx/cxx_compile_test.cc
-tests_elementary_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+check_LIBRARIES = tests/elementary_cxx/libcxx_compile_test.a
+tests_elementary_cxx_libcxx_compile_test_a_SOURCES = tests/elementary_cxx/cxx_compile_test.cc
+tests_elementary_cxx_libcxx_compile_test_a_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_builddir)/src/lib/evas/canvas/ \
+-I$(top_builddir)/src/lib/efl/interfaces/ \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/elementary_cxx\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/elementary_cxx\" \
+@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @ELEMENTARY_CXX_CFLAGS@ @EO_CXX_CFLAGS@ \
+@ECORE_CFLAGS@ @EINA_CFLAGS@ @EVAS_CFLAGS@ @ELEMENTARY_CFLAGS@ @EO_CFLAGS@
+
+tests/elementary_cxx/tests_elementary_cxx_cxx_dummy_compile_test-cxx_dummy_compile_test.$(OBJEXT): tests/elementary_cxx/libcxx_compile_test.a
+
+tests_elementary_cxx_cxx_dummy_compile_test_SOURCES = tests/elementary_cxx/cxx_dummy_compile_test.cc
+tests_elementary_cxx_cxx_dummy_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_builddir)/src/lib/evas/canvas/ \
-I$(top_builddir)/src/lib/efl/interfaces/ \
-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/elementary_cxx\" \
-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/elementary_cxx\" \
@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @ELEMENTARY_CXX_CFLAGS@ @EO_CXX_CFLAGS@ \
@ECORE_CFLAGS@ @EINA_CFLAGS@ @EVAS_CFLAGS@ @ELEMENTARY_CFLAGS@ @EO_CFLAGS@
-# No function is called, so we don't need to link to elementary
-tests_elementary_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@
-tests_elementary_cxx_cxx_compile_test_DEPENDENCIES =
endif