cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=aad9a661823f68a69bb63ffaf9477ebcb7ceaff7
commit aad9a661823f68a69bb63ffaf9477ebcb7ceaff7 Author: Felipe Magno de Almeida <[email protected]> Date: Fri May 9 12:50:42 2014 +0200 eina-cxx: add EFL_PTHREAD_CFLAGS to EINA_CXX_CFLAGS and EFL_PTHREAD_LIBS and -lm to examples Summary: EFL_PTHREAD_CFLAGS are needed for tests and users that use efl::eina::thread's and EFL_PTHREAD_LIBS to eina_cxx, eo and evas examples. Reviewers: cedric, stefan, stefan_schmidt CC: cedric, savio Differential Revision: https://phab.enlightenment.org/D832 Signed-off-by: Cedric Bail <[email protected]> --- configure.ac | 1 + src/examples/eina_cxx/Makefile.am | 7 ++----- src/examples/eo/Makefile.am | 6 +++--- src/examples/evas/Makefile.am | 20 +++++++------------- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/configure.ac b/configure.ac index e437be8..752c504 100644 --- a/configure.ac +++ b/configure.ac @@ -980,6 +980,7 @@ fi AM_CONDITIONAL([HAVE_CXX11], [test "x${have_cxx11}" = "xyes"]) EFL_INTERNAL_DEPEND_PKG([EINA_CXX], [Eina]) +EFL_ADD_CFLAGS([EINA_CXX], [${EFL_PTHREAD_CFLAGS}]) EFL_EVAL_PKGS([EINA_CXX]) EFL_LIB_END([Eina_Cxx]) diff --git a/src/examples/eina_cxx/Makefile.am b/src/examples/eina_cxx/Makefile.am index 03b3bbd..437d01e 100644 --- a/src/examples/eina_cxx/Makefile.am +++ b/src/examples/eina_cxx/Makefile.am @@ -3,12 +3,9 @@ MAINTAINERCLEANFILES = Makefile.in AM_CXXFLAGS = \ -I$(top_builddir)/src/lib/efl \ -I. \ --I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ --I$(top_srcdir)/src/bindings/eina_cxx \ --I$(top_builddir)/src/bindings/eina_cxx +@EINA_CXX_CFLAGS@ @CHECK_CFLAGS@ @EINA_CFLAGS@ -LDADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LDFLAGS@ +LDADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LDFLAGS@ @EFL_PTHREAD_LIBS@ SRCS = \ eina_cxx_list_01.cc diff --git a/src/examples/eo/Makefile.am b/src/examples/eo/Makefile.am index 8c47bb4..d8e26e9 100644 --- a/src/examples/eo/Makefile.am +++ b/src/examples/eo/Makefile.am @@ -30,7 +30,7 @@ isa/eo_isa_mixin.h \ isa/eo_isa_simple.c \ isa/eo_isa_simple.h -eo_isa_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LDFLAGS@ +eo_isa_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LDFLAGS@ @EFL_PTHREAD_LIBS@ if EO_BUILD_EXAMPLE_EVAS @@ -49,7 +49,7 @@ evas/evas_evas_obj.c \ evas/evas_evas_obj.h \ evas/evas_test.c -eo_evas_LDADD = $(top_builddir)/src/lib/eo/libeo.la @ELM_LIBS@ @EO_LDFLAGS@ +eo_evas_LDADD = $(top_builddir)/src/lib/eo/libeo.la @ELM_LIBS@ @EO_LDFLAGS@ @EFL_PTHREAD_LIBS@ endif @@ -62,7 +62,7 @@ simple/simple_mixin.h \ simple/simple_simple.c \ simple/simple_simple.h -eo_simple_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LDFLAGS@ +eo_simple_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LDFLAGS@ @EFL_PTHREAD_LIBS@ DATA_FILES = Makefile.examples diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am index e53e24d..3dab605 100644 --- a/src/examples/evas/Makefile.am +++ b/src/examples/evas/Makefile.am @@ -50,7 +50,7 @@ $(top_builddir)/src/lib/ecore/libecore.la \ $(top_builddir)/src/lib/ecore_input/libecore_input.la \ $(top_builddir)/src/lib/ecore_evas/libecore_evas.la \ $(top_builddir)/src/lib/evas/libevas.la \ -@EVAS_LDFLAGS@ +@EVAS_LDFLAGS@ -lm # EDJE_COMMON_* is similar to src/examples/edje/Makefile.am EDJE_COMMON_CPPFLAGS = \ @@ -174,27 +174,27 @@ evas_multi_touch_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS) EXTRA_PROGRAMS += evas_3d_cube evas_3d_cube_SOURCES = evas-3d-cube.c -evas_3d_cube_LDADD = $(ECORE_EVAS_COMMON_LDADD) +evas_3d_cube_LDADD = $(ECORE_EVAS_COMMON_LDADD) @EFL_PTHREAD_LIBS@ evas_3d_cube_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS) EXTRA_PROGRAMS += evas_3d_cube2 evas_3d_cube2_SOURCES = evas-3d-cube2.c -evas_3d_cube2_LDADD = $(ECORE_EVAS_COMMON_LDADD) +evas_3d_cube2_LDADD = $(ECORE_EVAS_COMMON_LDADD) @EFL_PTHREAD_LIBS@ evas_3d_cube2_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS) EXTRA_PROGRAMS += evas_3d_proxy evas_3d_proxy_SOURCES = evas-3d-proxy.c -evas_3d_proxy_LDADD = $(ECORE_EVAS_COMMON_LDADD) +evas_3d_proxy_LDADD = $(ECORE_EVAS_COMMON_LDADD) @EFL_PTHREAD_LIBS@ evas_3d_proxy_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS) EXTRA_PROGRAMS += evas_3d_pick evas_3d_pick_SOURCES = evas-3d-pick.c -evas_3d_pick_LDADD = $(ECORE_EVAS_COMMON_LDADD) +evas_3d_pick_LDADD = $(ECORE_EVAS_COMMON_LDADD) @EFL_PTHREAD_LIBS@ evas_3d_pick_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS) EXTRA_PROGRAMS += evas_3d_md2 evas_3d_md2_SOURCES = evas-3d-md2.c -evas_3d_md2_LDADD = $(ECORE_EVAS_COMMON_LDADD) +evas_3d_md2_LDADD = $(ECORE_EVAS_COMMON_LDADD) @EFL_PTHREAD_LIBS@ evas_3d_md2_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS) .edc.edj: @@ -211,13 +211,7 @@ if HAVE_CXX11 EXTRA_PROGRAMS += evas_cxx_rectangle evas_cxx_rectangle_SOURCES = evas_cxx_rectangle.cc evas_cxx_rectangle_LDADD = $(ECORE_EVAS_COMMON_LDADD) -evas_cxx_rectangle_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS) \ --I$(top_srcdir)/src/bindings/eina_cxx \ --I$(top_srcdir)/src/bindings/eo_cxx \ --I$(top_srcdir)/src/bindings/evas_cxx \ --I$(top_builddir)/src/bindings/eina_cxx \ --I$(top_builddir)/src/bindings/eo_cxx \ --I$(top_builddir)/src/bindings/evas_cxx \ +evas_cxx_rectangle_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS) @EINA_CXX_CFLAGS@ @EO_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ \ $(AM_CPPFLAGS) @EVAS_CFLAGS@ endif --
