summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--m4/efl.m418
-rw-r--r--src/Makefile_Ecore.am44
2 files changed, 31 insertions, 31 deletions
diff --git a/m4/efl.m4 b/m4/efl.m4
index 0514ba0..75e08ec 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -188,9 +188,9 @@ case "m4_defn([DOWNOTHER])" in
188 ;; 188 ;;
189esac 189esac
190requirements_pc_[]m4_defn([DOWNEFL])="${depname} >= ${PACKAGE_VERSION} ${requirements_pc_[][]m4_defn([DOWNEFL])}" 190requirements_pc_[]m4_defn([DOWNEFL])="${depname} >= ${PACKAGE_VERSION} ${requirements_pc_[][]m4_defn([DOWNEFL])}"
191requirements_cflags_[]m4_defn([DOWNEFL])="-I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} ${requirements_cflags_[][]m4_defn([DOWNEFL])}" 191requirements_cflags_[]m4_defn([DOWNEFL])="${requirements_cflags_[][]m4_defn([DOWNEFL])} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname}"
192requirements_internal_libs_[]m4_defn([DOWNEFL])="lib/${libdirname}/lib${libname}.la ${requirements_internal_libs_[][]m4_defn([DOWNEFL])}" 192requirements_internal_libs_[]m4_defn([DOWNEFL])="${requirements_internal_libs_[][]m4_defn([DOWNEFL])} lib/${libdirname}/lib${libname}.la"
193requirements_internal_deps_libs_[]m4_defn([DOWNEFL])="${requirements_public_libs_[]m4_defn([DOWNOTHER])} ${requirements_internal_deps_libs_[][]m4_defn([DOWNEFL])}" 193requirements_internal_deps_libs_[]m4_defn([DOWNEFL])="${requirements_internal_deps_libs_[][]m4_defn([DOWNEFL])} ${requirements_public_libs_[]m4_defn([DOWNOTHER])}"
194m4_popdef([DOWNOTHER])dnl 194m4_popdef([DOWNOTHER])dnl
195m4_popdef([DOWNEFL])dnl 195m4_popdef([DOWNEFL])dnl
196]) 196])
@@ -224,10 +224,10 @@ dnl the given EFL will use/depend on system crypto settings
224AC_DEFUN([EFL_CRYPTO_DEPEND], 224AC_DEFUN([EFL_CRYPTO_DEPEND],
225[dnl 225[dnl
226m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl 226m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
227requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_crypto} ${requirements_pc_[][]m4_defn([DOWNEFL])}" 227requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_[][]m4_defn([DOWNEFL])} ${requirements_pc_crypto}"
228requirements_pc_deps_[]m4_defn([DOWNEFL])="${requirements_pc_deps_crypto} ${requirements_pc_deps_[][]m4_defn([DOWNEFL])}" 228requirements_pc_deps_[]m4_defn([DOWNEFL])="${requirements_pc_deps_[][]m4_defn([DOWNEFL])} ${requirements_pc_deps_crypto}"
229requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_crypto} ${requirements_libs_[][]m4_defn([DOWNEFL])}" 229requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[][]m4_defn([DOWNEFL])} ${requirements_libs_crypto}"
230requirements_cflags_[]m4_defn([DOWNEFL])="${requirements_cflags_crypto} ${requirements_cflags_[][]m4_defn([DOWNEFL])}" 230requirements_cflags_[]m4_defn([DOWNEFL])="${requirements_cflags_[][]m4_defn([DOWNEFL])} ${requirements_cflags_crypto}"
231m4_popdef([DOWNEFL])dnl 231m4_popdef([DOWNEFL])dnl
232]) 232])
233 233
@@ -245,8 +245,8 @@ m4_pushdef([DOWNNAME], m4_translit([$2], [-A-Z], [_a-z]))dnl
245 245
246 EFL_PKG_CHECK_STRICT([$3], [ 246 EFL_PKG_CHECK_STRICT([$3], [
247 AC_DEFINE([HAVE_]m4_defn([UPNAME]), [1], [Have `]m4_defn([DOWNNAME])[' pkg-config installed.]) 247 AC_DEFINE([HAVE_]m4_defn([UPNAME]), [1], [Have `]m4_defn([DOWNNAME])[' pkg-config installed.])
248 requirements_pc_[]m4_defn([DOWNEFL])="$3 ${requirements_pc_[][]m4_defn([DOWNEFL])}" 248 requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_[][]m4_defn([DOWNEFL])} $3"
249 requirements_pc_deps_[]m4_defn([DOWNEFL])="$3 ${requirements_pc_deps_[]m4_defn([DOWNEFL])}" 249 requirements_pc_deps_[]m4_defn([DOWNEFL])="${requirements_pc_deps_[]m4_defn([DOWNEFL])} $3"
250 have_[]m4_defn([DOWNNAME])="yes" 250 have_[]m4_defn([DOWNNAME])="yes"
251 251
252 $4 252 $4
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index a33c8f8..30e4998 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -295,36 +295,36 @@ tests_ecore_ecore_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
295@ECORE_CFLAGS@ \ 295@ECORE_CFLAGS@ \
296@ECORE_AUDIO_CFLAGS@ \ 296@ECORE_AUDIO_CFLAGS@ \
297@ECORE_FILE_CFLAGS@ \ 297@ECORE_FILE_CFLAGS@ \
298@ECORE_X_CFLAGS@ \
299@ECORE_IMF_CFLAGS@ \ 298@ECORE_IMF_CFLAGS@ \
300@ECORE_EVAS_CFLAGS@ \ 299@ECORE_EVAS_CFLAGS@ \
301@ECORE_WAYLAND_CFLAGS@ \
302@ECORE_WAYLAND_SRV_CFLAGS@ \
303@ECORE_FB_CFLAGS@ \ 300@ECORE_FB_CFLAGS@ \
304@ECORE_INPUT_CFLAGS@ 301@ECORE_INPUT_CFLAGS@ \
302@ECORE_X_CFLAGS@ \
303@ECORE_WAYLAND_CFLAGS@ \
304@ECORE_WAYLAND_SRV_CFLAGS@
305 305
306tests_ecore_ecore_suite_LDADD = \ 306tests_ecore_ecore_suite_LDADD = \
307@CHECK_LIBS@ \ 307@CHECK_LIBS@ \
308@USE_ECORE_LIBS@ \ 308@USE_ECORE_LIBS@ \
309@USE_ECORE_AUDIO_LIBS@ \ 309@USE_ECORE_AUDIO_LIBS@ \
310@USE_ECORE_FILE_LIBS@ \ 310@USE_ECORE_FILE_LIBS@ \
311@USE_ECORE_X_LIBS@ \
312@USE_ECORE_IMF_LIBS@ \ 311@USE_ECORE_IMF_LIBS@ \
313@USE_ECORE_EVAS_LIBS@ \ 312@USE_ECORE_EVAS_LIBS@ \
314@USE_ECORE_WAYLAND_LIBS@ \
315@USE_ECORE_FB_LIBS@ \ 313@USE_ECORE_FB_LIBS@ \
316@ECORE_WAYLAND_SRV_LIBS@ \ 314@USE_ECORE_INPUT_LIBS@ \
317@USE_ECORE_INPUT_LIBS@ 315@USE_ECORE_X_LIBS@ \
316@USE_ECORE_WAYLAND_LIBS@ \
317@ECORE_WAYLAND_SRV_LIBS@
318tests_ecore_ecore_suite_DEPENDENCIES = \ 318tests_ecore_ecore_suite_DEPENDENCIES = \
319@USE_ECORE_INTERNAL_LIBS@ \ 319@USE_ECORE_INTERNAL_LIBS@ \
320@USE_ECORE_AUDIO_INTERNAL_LIBS@ \ 320@USE_ECORE_AUDIO_INTERNAL_LIBS@ \
321@USE_ECORE_FILE_INTERNAL_LIBS@ \ 321@USE_ECORE_FILE_INTERNAL_LIBS@ \
322@USE_ECORE_X_INTERNAL_LIBS@ \
323@USE_ECORE_IMF_INTERNAL_LIBS@ \ 322@USE_ECORE_IMF_INTERNAL_LIBS@ \
324@USE_ECORE_EVAS_INTERNAL_LIBS@ \ 323@USE_ECORE_EVAS_INTERNAL_LIBS@ \
325@USE_ECORE_WAYLAND_INTERNAL_LIBS@ \
326@USE_ECORE_FB_INTERNAL_LIBS@ \ 324@USE_ECORE_FB_INTERNAL_LIBS@ \
327@USE_ECORE_INPUT_INTERNAL_LIBS@ 325@USE_ECORE_INPUT_INTERNAL_LIBS@ \
326@USE_ECORE_X_INTERNAL_LIBS@ \
327@USE_ECORE_WAYLAND_INTERNAL_LIBS@
328 328
329tests_ecore_efl_app_suite_SOURCES = \ 329tests_ecore_efl_app_suite_SOURCES = \
330tests/ecore/efl_app_test_loop.c \ 330tests/ecore/efl_app_test_loop.c \
@@ -341,36 +341,36 @@ tests_ecore_efl_app_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
341@ECORE_CFLAGS@ \ 341@ECORE_CFLAGS@ \
342@ECORE_AUDIO_CFLAGS@ \ 342@ECORE_AUDIO_CFLAGS@ \
343@ECORE_FILE_CFLAGS@ \ 343@ECORE_FILE_CFLAGS@ \
344@ECORE_X_CFLAGS@ \
345@ECORE_IMF_CFLAGS@ \ 344@ECORE_IMF_CFLAGS@ \
346@ECORE_EVAS_CFLAGS@ \ 345@ECORE_EVAS_CFLAGS@ \
347@ECORE_WAYLAND_CFLAGS@ \
348@ECORE_WAYLAND_SRV_CFLAGS@ \
349@ECORE_FB_CFLAGS@ \ 346@ECORE_FB_CFLAGS@ \
350@ECORE_INPUT_CFLAGS@ 347@ECORE_INPUT_CFLAGS@ \
348@ECORE_X_CFLAGS@ \
349@ECORE_WAYLAND_CFLAGS@ \
350@ECORE_WAYLAND_SRV_CFLAGS@
351 351
352tests_ecore_efl_app_suite_LDADD = \ 352tests_ecore_efl_app_suite_LDADD = \
353@CHECK_LIBS@ \ 353@CHECK_LIBS@ \
354@USE_ECORE_LIBS@ \ 354@USE_ECORE_LIBS@ \
355@USE_ECORE_AUDIO_LIBS@ \ 355@USE_ECORE_AUDIO_LIBS@ \
356@USE_ECORE_FILE_LIBS@ \ 356@USE_ECORE_FILE_LIBS@ \
357@USE_ECORE_X_LIBS@ \
358@USE_ECORE_IMF_LIBS@ \ 357@USE_ECORE_IMF_LIBS@ \
359@USE_ECORE_EVAS_LIBS@ \ 358@USE_ECORE_EVAS_LIBS@ \
360@USE_ECORE_WAYLAND_LIBS@ \
361@USE_ECORE_FB_LIBS@ \ 359@USE_ECORE_FB_LIBS@ \
362@ECORE_WAYLAND_SRV_LIBS@ \ 360@USE_ECORE_INPUT_LIBS@ \
363@USE_ECORE_INPUT_LIBS@ 361@USE_ECORE_X_LIBS@ \
362@USE_ECORE_WAYLAND_LIBS@ \
363@ECORE_WAYLAND_SRV_LIBS@
364tests_ecore_efl_app_suite_DEPENDENCIES = \ 364tests_ecore_efl_app_suite_DEPENDENCIES = \
365@USE_ECORE_INTERNAL_LIBS@ \ 365@USE_ECORE_INTERNAL_LIBS@ \
366@USE_ECORE_AUDIO_INTERNAL_LIBS@ \ 366@USE_ECORE_AUDIO_INTERNAL_LIBS@ \
367@USE_ECORE_FILE_INTERNAL_LIBS@ \ 367@USE_ECORE_FILE_INTERNAL_LIBS@ \
368@USE_ECORE_X_INTERNAL_LIBS@ \
369@USE_ECORE_IMF_INTERNAL_LIBS@ \ 368@USE_ECORE_IMF_INTERNAL_LIBS@ \
370@USE_ECORE_EVAS_INTERNAL_LIBS@ \ 369@USE_ECORE_EVAS_INTERNAL_LIBS@ \
371@USE_ECORE_WAYLAND_INTERNAL_LIBS@ \
372@USE_ECORE_FB_INTERNAL_LIBS@ \ 370@USE_ECORE_FB_INTERNAL_LIBS@ \
373@USE_ECORE_INPUT_INTERNAL_LIBS@ 371@USE_ECORE_INPUT_INTERNAL_LIBS@ \
372@USE_ECORE_X_INTERNAL_LIBS@ \
373@USE_ECORE_WAYLAND_INTERNAL_LIBS@
374 374
375if HAVE_ECORE_X 375if HAVE_ECORE_X
376tests_ecore_ecore_suite_SOURCES += tests/ecore/ecore_test_ecore_x.c 376tests_ecore_ecore_suite_SOURCES += tests/ecore/ecore_test_ecore_x.c