summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-14 22:36:23 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-14 22:36:23 +0000
commitb1bc5aeb24d6dd0faf97c2d1d6c6781798a7fbe9 (patch)
treeebffce52ddbab71c6da6c2e07eeca7382abf15f6
parent283805237a9f5f194568667fc32586a3238cbde0 (diff)
efl: simplify automake.
Instead of -I$(top_srcdir)... -I$(top_builddir)... and then do it for the .la, use the EFL_ macros to generate the contents to be used in automake files. There is a nasty bit that libtool will parse Makefile*.am and will not get _DEPENDENCIES from _LIBADD and _LDADD if these are in @REPLACEMENT@. To solve this we must explicitly set _DEPENDENCIES. The contents of this is almost the same as _LIBADD or _LDADD with the "_INTERNAL_" replacement name. I hope the code will be result will be shorter and consistent as there is less places to change when we add/remove dependencies. Statistics are quite impressive (diffstat): {{{ 37 files changed, 663 insertions(+), 1599 deletions(-) }}} SVN revision: 82785
-rw-r--r--configure.ac104
-rw-r--r--m4/efl.m487
-rw-r--r--src/Makefile_EDBus.am35
-rw-r--r--src/Makefile_EPhysics.am28
-rw-r--r--src/Makefile_Ecore.am63
-rw-r--r--src/Makefile_Ecore_Audio.am21
-rw-r--r--src/Makefile_Ecore_Cocoa.am20
-rw-r--r--src/Makefile_Ecore_Con.am23
-rw-r--r--src/Makefile_Ecore_Evas.am118
-rw-r--r--src/Makefile_Ecore_FB.am20
-rw-r--r--src/Makefile_Ecore_File.am20
-rw-r--r--src/Makefile_Ecore_Imf.am114
-rw-r--r--src/Makefile_Ecore_Input.am43
-rw-r--r--src/Makefile_Ecore_Ipc.am22
-rw-r--r--src/Makefile_Ecore_Psl1ght.am20
-rw-r--r--src/Makefile_Ecore_SDL.am21
-rw-r--r--src/Makefile_Ecore_Wayland.am20
-rw-r--r--src/Makefile_Ecore_Win32.am23
-rw-r--r--src/Makefile_Ecore_WinCE.am23
-rw-r--r--src/Makefile_Ecore_X.am22
-rw-r--r--src/Makefile_Edje.am91
-rw-r--r--src/Makefile_Eet.am44
-rw-r--r--src/Makefile_Eeze.am90
-rw-r--r--src/Makefile_Efreet.am106
-rw-r--r--src/Makefile_Eina.am74
-rw-r--r--src/Makefile_Eio.am22
-rw-r--r--src/Makefile_Embryo.am27
-rw-r--r--src/Makefile_Emotion.am103
-rw-r--r--src/Makefile_Eo.am122
-rw-r--r--src/Makefile_Escape.am4
-rw-r--r--src/Makefile_Ethumb.am124
-rw-r--r--src/Makefile_Evas.am570
-rw-r--r--src/Makefile_Evil.am33
-rw-r--r--src/lib/ecore_evas/ecore_evas_buffer.c1
-rw-r--r--src/lib/ecore_evas/ecore_evas_ews.c2
-rw-r--r--src/lib/ecore_evas/ecore_evas_private.h4
-rw-r--r--src/modules/ecore_evas/engines/extn/ecore_evas_extn.c2
37 files changed, 665 insertions, 1601 deletions
diff --git a/configure.ac b/configure.ac
index f5d9631440..fc44ede591 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,21 +132,6 @@ AC_SUBST(dbusservicedir)
132 132
133#### Default values 133#### Default values
134 134
135platform_pc=""
136platform_pc_evil=""
137platform_pc_escape=""
138platform_pc_exotic=""
139
140platform_libs=""
141platform_libs_evil=""
142platform_libs_escape=""
143platform_libs_exotic=""
144
145platform_cflags=""
146platform_cflags_evil=""
147platform_cflags_escape=""
148platform_cflags_exotic=""
149
150requirements_pc_efl="" 135requirements_pc_efl=""
151requirements_pc_deps_efl="" 136requirements_pc_deps_efl=""
152requirements_libs_efl="" 137requirements_libs_efl=""
@@ -339,10 +324,6 @@ fi
339 324
340AM_CONDITIONAL([EFL_ENABLE_COVERAGE], [test "${want_coverage}" = "yes"]) 325AM_CONDITIONAL([EFL_ENABLE_COVERAGE], [test "${want_coverage}" = "yes"])
341 326
342AC_SUBST([EFL_COV_CFLAGS])
343AC_SUBST([EFL_COV_LIBS])
344
345
346#### Checks for libraries 327#### Checks for libraries
347 328
348# check unit testing library 329# check unit testing library
@@ -561,12 +542,9 @@ AC_DEFINE_IF([HAVE_ATFILE_SOURCE],
561 542
562#### Platform-dependent 543#### Platform-dependent
563DL_LIBS="" 544DL_LIBS=""
545DL_INTERNAL_LIBS=""
564 546
565#### Evil 547#### Evil
566
567USE_EVIL_CFLAGS=""
568USE_EVIL_LIBS=""
569
570EFL_LIB_START_OPTIONAL([Evil], [test "${have_windows}" = "yes"]) 548EFL_LIB_START_OPTIONAL([Evil], [test "${have_windows}" = "yes"])
571 549
572### Default values 550### Default values
@@ -578,16 +556,14 @@ EFL_SELECT_WINDOWS_VERSION
578 556
579### Checks for libraries 557### Checks for libraries
580 558
581EVIL_LIBS=""
582EVIL_DLFCN_LIBS="" 559EVIL_DLFCN_LIBS=""
583if test "${have_wince}" = "xyes"; then 560if test "${have_wince}" = "xyes"; then
584 EVIL_LIBS="-lws2" 561 EFL_ADD_LIBS([EVIL], [-lws2])
585 EVIL_DLFCN_LIBS="-ltoolhelp" 562 EVIL_DLFCN_LIBS="-ltoolhelp"
586else 563else
587 EVIL_LIBS="-lole32 -lws2_32 -lsecur32 -luuid" 564 EFL_ADD_LIBS([EVIL], [-lole32 -lws2_32 -lsecur32 -luuid])
588 EVIL_DLFCN_LIBS="-lpsapi" 565 EVIL_DLFCN_LIBS="-lpsapi"
589fi 566fi
590EFL_ADD_LIBS([EVIL], [${EVIL_LIBS}])
591 567
592AC_SUBST([EVIL_DLFCN_LIBS]) 568AC_SUBST([EVIL_DLFCN_LIBS])
593 569
@@ -599,17 +575,16 @@ AC_SUBST([EVIL_DLFCN_LIBS])
599 575
600### Checks for compiler characteristics 576### Checks for compiler characteristics
601 577
602EVIL_CPPFLAGS="-DEFL_EVIL_BUILD"
603EVIL_DLFCN_CPPFLAGS="-DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1" 578EVIL_DLFCN_CPPFLAGS="-DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1"
604EVIL_CFLAGS="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wpointer-arith" 579# TODO: should we have these at EFL (global?)
605EVIL_CXXFLAGS="" 580EVIL_CFLAGS="-Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls ${EVIL_CFLAGS}"
581EVIL_CXXFLAGS="${EVIL_CXXFLAGS}"
606 582
607if test "x${have_win32}" = "xyes" ; then 583if test "x${have_win32}" = "xyes" ; then
608 EVIL_CXXFLAGS="-fno-rtti -fno-exceptions" 584 EVIL_CFLAGS="-DSECURITY_WIN32 ${EVIL_CFLAGS}"
609 EVIL_CPPFLAGS="${EVIL_CPPFLAGS} -DSECURITY_WIN32" 585 EVIL_CXXFLAGS="-fno-rtti -fno-exceptions -DSECURITY_WIN32 ${EVIL_CXXFLAGS}"
610fi 586fi
611 587
612AC_SUBST([EVIL_CPPFLAGS])
613AC_SUBST([EVIL_DLFCN_CPPFLAGS]) 588AC_SUBST([EVIL_DLFCN_CPPFLAGS])
614AC_SUBST([EVIL_CXXFLAGS]) 589AC_SUBST([EVIL_CXXFLAGS])
615 590
@@ -617,19 +592,8 @@ AC_SUBST([EVIL_CXXFLAGS])
617 592
618### Checks for library functions 593### Checks for library functions
619 594
620platform_pc_evil="evil >= ${PACKAGE_VERSION}"
621platform_pc="${platform_pc} ${platform_pc_evil}"
622
623if test "x${have_wince}" = "xyes"; then
624 platform_libs_evil="-lws2"
625else
626 platform_libs_evil="-lws2_32"
627fi
628platform_libs="${platform_libs} ${platform_libs_evil}"
629
630USE_EVIL_CFLAGS="-I\$(top_srcdir)/src/lib/evil"
631USE_EVIL_LIBS="lib/evil/libevil.la"
632DL_LIBS="lib/evil/libdl.la" 595DL_LIBS="lib/evil/libdl.la"
596DL_INTERNAL_LIBS="lib/evil/libdl.la"
633 597
634EFL_LIB_END_OPTIONAL([Evil]) 598EFL_LIB_END_OPTIONAL([Evil])
635 599
@@ -639,10 +603,6 @@ AC_SUBST([USE_EVIL_LIBS])
639 603
640 604
641#### Escape 605#### Escape
642
643USE_ESCAPE_CFLAGS=""
644USE_ESCAPE_LIBS=""
645
646EFL_LIB_START_OPTIONAL([Escape], [test "${have_ps3}" = "yes"]) 606EFL_LIB_START_OPTIONAL([Escape], [test "${have_ps3}" = "yes"])
647 607
648### Additional options to configure 608### Additional options to configure
@@ -666,19 +626,11 @@ EFL_ADD_LIBS([ESCAPE], [-llv2 -lm -lnet -lsysmodule -liberty])
666 626
667### Checks for library functions 627### Checks for library functions
668 628
669platform_pc_escape="escape >= ${PACKAGE_VERSION}"
670platform_pc="${platform_pc} ${platform_pc_escape}"
671
672USE_ESCAPE_CFLAGS="-I\$(top_srcdir)/src/lib/escape"
673USE_ESCAPE_LIBS="lib/escape/libescape.la"
674
675EFL_LIB_END_OPTIONAL([Escape]) 629EFL_LIB_END_OPTIONAL([Escape])
676
677AC_SUBST([USE_ESCAPE_CFLAGS])
678AC_SUBST([USE_ESCAPE_LIBS])
679#### End of Escape 630#### End of Escape
680 631
681AC_SUBST([DL_LIBS]) 632AC_SUBST([DL_LIBS])
633AC_SUBST([DL_INTERNAL_LIBS])
682#### End of Platform-dependent 634#### End of Platform-dependent
683 635
684 636
@@ -1813,8 +1765,6 @@ AM_CONDITIONAL([HAVE_GSTREAMER], [test "${want_gstreamer}" = "yes"])
1813 1765
1814EFL_EVAL_PKGS([ECORE]) 1766EFL_EVAL_PKGS([ECORE])
1815 1767
1816EFL_ADD_LIBS([ECORE], [${platform_libs}])
1817
1818### Checks for header files 1768### Checks for header files
1819 1769
1820AC_HEADER_SYS_WAIT 1770AC_HEADER_SYS_WAIT
@@ -1995,6 +1945,7 @@ EFL_LIB_START([Ecore_Ipc])
1995### Checks for libraries 1945### Checks for libraries
1996EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore-con]) 1946EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore-con])
1997EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore]) 1947EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore])
1948EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [eo])
1998EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [eina]) 1949EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [eina])
1999 1950
2000EFL_ADD_LIBS([ECORE_IPC], [-lm]) 1951EFL_ADD_LIBS([ECORE_IPC], [-lm])
@@ -2031,6 +1982,7 @@ EFL_LIB_START([Ecore_File])
2031EFL_PLATFORM_DEPEND([ECORE_FILE], [escape]) 1982EFL_PLATFORM_DEPEND([ECORE_FILE], [escape])
2032EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [ecore-con]) 1983EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [ecore-con])
2033EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [ecore]) 1984EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [ecore])
1985EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [eo])
2034EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [eina]) 1986EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [eina])
2035 1987
2036### Checks for header files 1988### Checks for header files
@@ -2060,6 +2012,7 @@ EFL_LIB_START([Ecore_Input])
2060 2012
2061### Checks for libraries 2013### Checks for libraries
2062EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [ecore]) 2014EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [ecore])
2015EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [eo])
2063EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [eina]) 2016EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [eina])
2064 2017
2065### Checks for header files 2018### Checks for header files
@@ -2091,6 +2044,7 @@ EFL_LIB_START([Ecore_Input_Evas])
2091EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore-input]) 2044EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore-input])
2092EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore]) 2045EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore])
2093EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [evas]) 2046EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [evas])
2047EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eo])
2094EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eina]) 2048EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eina])
2095 2049
2096### Checks for header files 2050### Checks for header files
@@ -2125,6 +2079,7 @@ have_ecore_cocoa="no"
2125### Checks for libraries 2079### Checks for libraries
2126EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [ecore-input]) 2080EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [ecore-input])
2127EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [ecore]) 2081EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [ecore])
2082EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [eo])
2128EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [eina]) 2083EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [eina])
2129 2084
2130### Checks for header files 2085### Checks for header files
@@ -2205,6 +2160,8 @@ AC_ARG_ENABLE([tslib],
2205 2160
2206### Checks for libraries 2161### Checks for libraries
2207EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [ecore]) 2162EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [ecore])
2163EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [ecore-input])
2164EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eo])
2208EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eina]) 2165EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eina])
2209 2166
2210EFL_OPTIONAL_DEPEND_PKG([ECORE_FB], [${want_tslib}], [TSLIB], [tslib]) 2167EFL_OPTIONAL_DEPEND_PKG([ECORE_FB], [${want_tslib}], [TSLIB], [tslib])
@@ -2244,10 +2201,12 @@ EFL_LIB_START_OPTIONAL([Ecore_Psl1ght], [test "${have_ps3}" = "yes"])
2244### Checks for programs 2201### Checks for programs
2245 2202
2246### Checks for libraries 2203### Checks for libraries
2204EFL_PLATFORM_DEPEND([ECORE_PSL1GHT], [escape])
2205
2247EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [ecore-input]) 2206EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [ecore-input])
2248EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [ecore]) 2207EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [ecore])
2208EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [eo])
2249EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [eina]) 2209EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [eina])
2250EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [escape])
2251 2210
2252EFL_ADD_LIBS([ECORE_PSL1GHT], [-lio -lsysutil -lgem -lcamera -lspurs]) 2211EFL_ADD_LIBS([ECORE_PSL1GHT], [-lio -lsysutil -lgem -lcamera -lspurs])
2253 2212
@@ -2280,6 +2239,7 @@ EFL_LIB_START_OPTIONAL([Ecore_SDL], [test "${want_sdl}" = "yes"])
2280EFL_PLATFORM_DEPEND([ECORE_SDL], [all]) 2239EFL_PLATFORM_DEPEND([ECORE_SDL], [all])
2281EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [ecore-input]) 2240EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [ecore-input])
2282EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [ecore]) 2241EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [ecore])
2242EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [eo])
2283EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [eina]) 2243EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [eina])
2284 2244
2285EFL_DEPEND_PKG([ECORE_SDL], [SDL], [sdl >= 1.2.0]) 2245EFL_DEPEND_PKG([ECORE_SDL], [SDL], [sdl >= 1.2.0])
@@ -2317,6 +2277,7 @@ EFL_LIB_START_OPTIONAL([Ecore_Wayland], [test "${want_wayland}" = "yes"])
2317### Checks for libraries 2277### Checks for libraries
2318EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [ecore-input]) 2278EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [ecore-input])
2319EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [ecore]) 2279EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [ecore])
2280EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [eo])
2320EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [eina]) 2281EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [eina])
2321 2282
2322EFL_DEPEND_PKG([ECORE_WAYLAND], [WAYLAND], 2283EFL_DEPEND_PKG([ECORE_WAYLAND], [WAYLAND],
@@ -2385,6 +2346,7 @@ AC_ARG_ENABLE([pulseaudio],
2385### Checks for libraries 2346### Checks for libraries
2386EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [ecore]) 2347EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [ecore])
2387EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eet]) 2348EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eet])
2349EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eo])
2388EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eina]) 2350EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eina])
2389 2351
2390EFL_ADD_LIBS([ECORE_AUDIO], [-lm]) 2352EFL_ADD_LIBS([ECORE_AUDIO], [-lm])
@@ -2423,6 +2385,7 @@ EFL_LIB_START_OPTIONAL([Ecore_Win32], [test "${have_win32}" = "yes"])
2423EFL_PLATFORM_DEPEND([ECORE_WIN32], [evil]) 2385EFL_PLATFORM_DEPEND([ECORE_WIN32], [evil])
2424EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [ecore-input]) 2386EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [ecore-input])
2425EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [ecore]) 2387EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [ecore])
2388EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [eo])
2426EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [eina]) 2389EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [eina])
2427 2390
2428EFL_ADD_LIBS([ECORE_WIN32], [-lole32 -lgdi32]) 2391EFL_ADD_LIBS([ECORE_WIN32], [-lole32 -lgdi32])
@@ -2457,6 +2420,7 @@ EFL_LIB_START_OPTIONAL([Ecore_WinCE], [test "${have_wince}" = "yes"])
2457EFL_PLATFORM_DEPEND([ECORE_WINCE], [evil]) 2420EFL_PLATFORM_DEPEND([ECORE_WINCE], [evil])
2458EFL_INTERNAL_DEPEND_PKG([ECORE_WINCE], [ecore-input]) 2421EFL_INTERNAL_DEPEND_PKG([ECORE_WINCE], [ecore-input])
2459EFL_INTERNAL_DEPEND_PKG([ECORE_WINCE], [ecore]) 2422EFL_INTERNAL_DEPEND_PKG([ECORE_WINCE], [ecore])
2423EFL_INTERNAL_DEPEND_PKG([ECORE_WINCE], [eo])
2460EFL_INTERNAL_DEPEND_PKG([ECORE_WINCE], [eina]) 2424EFL_INTERNAL_DEPEND_PKG([ECORE_WINCE], [eina])
2461 2425
2462### Checks for header files 2426### Checks for header files
@@ -2531,6 +2495,7 @@ AC_ARG_ENABLE([xim],
2531### Checks for libraries 2495### Checks for libraries
2532EFL_INTERNAL_DEPEND_PKG([ECORE_X], [ecore-input]) 2496EFL_INTERNAL_DEPEND_PKG([ECORE_X], [ecore-input])
2533EFL_INTERNAL_DEPEND_PKG([ECORE_X], [ecore]) 2497EFL_INTERNAL_DEPEND_PKG([ECORE_X], [ecore])
2498EFL_INTERNAL_DEPEND_PKG([ECORE_X], [eo])
2534EFL_INTERNAL_DEPEND_PKG([ECORE_X], [eina]) 2499EFL_INTERNAL_DEPEND_PKG([ECORE_X], [eina])
2535 2500
2536## Xlib 2501## Xlib
@@ -2728,6 +2693,8 @@ fi
2728### Checks for libraries 2693### Checks for libraries
2729EFL_PLATFORM_DEPEND([ECORE_IMF], [escape]) 2694EFL_PLATFORM_DEPEND([ECORE_IMF], [escape])
2730EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [ecore]) 2695EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [ecore])
2696EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [ecore-input])
2697EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [eo])
2731EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [eina]) 2698EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [eina])
2732 2699
2733if test "x${want_ecore_imf}" = "xyes" ; then 2700if test "x${want_ecore_imf}" = "xyes" ; then
@@ -2811,6 +2778,7 @@ EFL_PLATFORM_DEPEND([ECORE_IMF_EVAS], [escape])
2811EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [ecore-imf]) 2778EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [ecore-imf])
2812EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [ecore]) 2779EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [ecore])
2813EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [evas]) 2780EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [evas])
2781EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eo])
2814EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eina]) 2782EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eina])
2815 2783
2816### Checks for header files 2784### Checks for header files
@@ -2857,6 +2825,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore-input-evas])
2857EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore-input]) 2825EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore-input])
2858EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore]) 2826EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore])
2859EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [evas]) 2827EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [evas])
2828EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eo])
2860EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eina]) 2829EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eina])
2861 2830
2862## modules 2831## modules
@@ -2998,6 +2967,7 @@ EFL_LIB_START([Eio])
2998### Checks for libraries 2967### Checks for libraries
2999EFL_INTERNAL_DEPEND_PKG([EIO], [ecore]) 2968EFL_INTERNAL_DEPEND_PKG([EIO], [ecore])
3000EFL_INTERNAL_DEPEND_PKG([EIO], [eet]) 2969EFL_INTERNAL_DEPEND_PKG([EIO], [eet])
2970EFL_INTERNAL_DEPEND_PKG([EIO], [eo])
3001EFL_INTERNAL_DEPEND_PKG([EIO], [eina]) 2971EFL_INTERNAL_DEPEND_PKG([EIO], [eina])
3002 2972
3003EFL_ADD_LIBS([EIO], [-lm]) 2973EFL_ADD_LIBS([EIO], [-lm])
@@ -3031,6 +3001,7 @@ EFL_LIB_START([EDBus])
3031 3001
3032### Checks for libraries 3002### Checks for libraries
3033EFL_INTERNAL_DEPEND_PKG([EDBUS], [ecore]) 3003EFL_INTERNAL_DEPEND_PKG([EDBUS], [ecore])
3004EFL_INTERNAL_DEPEND_PKG([EDBUS], [eo])
3034EFL_INTERNAL_DEPEND_PKG([EDBUS], [eina]) 3005EFL_INTERNAL_DEPEND_PKG([EDBUS], [eina])
3035 3006
3036EFL_DEPEND_PKG([EDBUS], [DBUS], [dbus-1]) 3007EFL_DEPEND_PKG([EDBUS], [DBUS], [dbus-1])
@@ -3068,7 +3039,8 @@ AC_DEFINE([SLOPPY_SPEC], [1], [Sloppy Spec Compliance])
3068EFL_INTERNAL_DEPEND_PKG([EFREET], [eet]) 3039EFL_INTERNAL_DEPEND_PKG([EFREET], [eet])
3069EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore]) 3040EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore])
3070EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore-file]) 3041EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore-file])
3071EFL_INTERNAL_DEPEND_PKG([EFREET], [edbus2]) 3042EFL_INTERNAL_DEPEND_PKG([EFREET], [edbus])
3043EFL_INTERNAL_DEPEND_PKG([EFREET], [eo])
3072EFL_INTERNAL_DEPEND_PKG([EFREET], [eina]) 3044EFL_INTERNAL_DEPEND_PKG([EFREET], [eina])
3073 3045
3074### Checks for header files 3046### Checks for header files
@@ -3131,6 +3103,7 @@ AC_ARG_WITH([eject],
3131### Checks for libraries 3103### Checks for libraries
3132EFL_INTERNAL_DEPEND_PKG([EEZE], [eina]) 3104EFL_INTERNAL_DEPEND_PKG([EEZE], [eina])
3133EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore]) 3105EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore])
3106EFL_INTERNAL_DEPEND_PKG([EEZE], [eo])
3134EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [ecore-file]) 3107EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [ecore-file])
3135EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [ecore-con]) 3108EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [ecore-con])
3136EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [eet]) 3109EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [eet])
@@ -3207,6 +3180,7 @@ EFL_PLATFORM_DEPEND([EPHYSICS], [evil])
3207EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [eina]) 3180EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [eina])
3208EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [evas]) 3181EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [evas])
3209EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [ecore]) 3182EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [ecore])
3183EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [eo])
3210 3184
3211EFL_DEPEND_PKG([EPHYSICS], [BULLET], [bullet >= 2.80]) 3185EFL_DEPEND_PKG([EPHYSICS], [BULLET], [bullet >= 2.80])
3212 3186
@@ -3391,6 +3365,7 @@ EFL_PLATFORM_DEPEND([EINA], [evil])
3391 3365
3392EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eina]) 3366EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eina])
3393EFL_INTERNAL_DEPEND_PKG([ETHUMB], [evas]) 3367EFL_INTERNAL_DEPEND_PKG([ETHUMB], [evas])
3368EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eo])
3394EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore]) 3369EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore])
3395EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore-evas]) 3370EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore-evas])
3396EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore-file]) 3371EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore-file])
@@ -3428,6 +3403,7 @@ EFL_LIB_START([Ethumb_Client])
3428 3403
3429### Checks for libraries 3404### Checks for libraries
3430EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eina]) 3405EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eina])
3406EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eo])
3431EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [ecore]) 3407EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [ecore])
3432EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [edbus]) 3408EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [edbus])
3433EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [ethumb]) 3409EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [ethumb])
diff --git a/m4/efl.m4 b/m4/efl.m4
index 7ed137f119..65fa893c84 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -16,18 +16,32 @@ dnl Adds a pkg-config dependency on another EFL.
16AC_DEFUN([EFL_INTERNAL_DEPEND_PKG], 16AC_DEFUN([EFL_INTERNAL_DEPEND_PKG],
17[dnl 17[dnl
18m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl 18m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
19m4_pushdef([DOWNOTHER], m4_translit([$2], [-A-Z], [_a-z]))dnl
19dnl TODO: we need to fix the package config names for 2.0 20dnl TODO: we need to fix the package config names for 2.0
20dnl TODO: and make them uniform in scheme. 21dnl TODO: and make them uniform in scheme.
21depname="$2" 22depname="$2"
22case "${depname}" in 23libdirname="m4_defn([DOWNOTHER])"
24libname="m4_defn([DOWNOTHER])"
25case "m4_defn([DOWNOTHER])" in
23 edbus) 26 edbus)
24 depname="edbus2" 27 depname="edbus2"
28 libname="edbus2"
25 ;; 29 ;;
26 ethumb-client) 30 ethumb_client)
27 depname="ethumb_client" 31 depname="ethumb_client"
32 libdirname="ethumb/client"
33 ;;
34 ecore_input_evas)
35 libdirname="ecore_input"
36 ;;
37 ecore_imf_evas)
38 libdirname="ecore_imf"
28 ;; 39 ;;
29esac 40esac
30requirements_pc_[]m4_defn([DOWNEFL])="${depname} >= ${PACKAGE_VERSION} ${requirements_pc_[][]m4_defn([DOWNEFL])}" 41requirements_pc_[]m4_defn([DOWNEFL])="${depname} >= ${PACKAGE_VERSION} ${requirements_pc_[][]m4_defn([DOWNEFL])}"
42requirements_cflags_[]m4_defn([DOWNEFL])="-I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} ${requirements_cflags_[][]m4_defn([DOWNEFL])}"
43requirements_internal_libs_[]m4_defn([DOWNEFL])="lib/${libdirname}/lib${libname}.la ${requirements_internal_libs_[][]m4_defn([DOWNEFL])}"
44m4_popdef([DOWNOTHER])dnl
31m4_popdef([DOWNEFL])dnl 45m4_popdef([DOWNEFL])dnl
32]) 46])
33 47
@@ -35,32 +49,24 @@ dnl EFL_PLATFORM_DEPEND(EFL, PLATFORM)
35dnl PLATFORM is one of: all, evil, escape, exotic 49dnl PLATFORM is one of: all, evil, escape, exotic
36AC_DEFUN([EFL_PLATFORM_DEPEND], 50AC_DEFUN([EFL_PLATFORM_DEPEND],
37[dnl 51[dnl
38m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl 52m4_pushdef([DOWNOTHER], m4_translit([$2], [-A-Z], [_a-z]))dnl
39case "$2" in 53case "m4_defn([DOWNOTHER])" in
40 all) 54 all)
41 requirements_pc_[]m4_defn([DOWNEFL])="${platform_pc} ${requirements_pc_[][]m4_defn([DOWNEFL])}" 55 if test "x${efl_lib_optional_evil}" = "xyes"; then
42 requirements_libs_[]m4_defn([DOWNEFL])="${platform_libs} ${requirements_libs_[][]m4_defn([DOWNEFL])}" 56 EFL_INTERNAL_DEPEND_PKG([$1], [evil])
43 requirements_cflags_[]m4_defn([DOWNEFL])="${platform_cflags} ${requirements_cflags_[][]m4_defn([DOWNEFL])}" 57 elif test "x${efl_lib_optional_escape}" = "xyes"; then
44 ;; 58 EFL_INTERNAL_DEPEND_PKG([$1], [escape])
45 evil) 59 elif test "x${efl_lib_optional_exotic}" = "xyes"; then
46 requirements_pc_[]m4_defn([DOWNEFL])="${platform_pc_evil} ${requirements_pc_[][]m4_defn([DOWNEFL])}" 60 EFL_INTERNAL_DEPEND_PKG([$1], [exotic])
47 requirements_libs_[]m4_defn([DOWNEFL])="${platform_libs_evil} ${requirements_libs_[][]m4_defn([DOWNEFL])}" 61 fi
48 requirements_cflags_[]m4_defn([DOWNEFL])="${platform_cflags_evil} ${requirements_cflags_[][]m4_defn([DOWNEFL])}"
49 ;;
50 escape)
51 requirements_pc_[]m4_defn([DOWNEFL])="${platform_pc_escape} ${requirements_pc_[][]m4_defn([DOWNEFL])}"
52 requirements_libs_[]m4_defn([DOWNEFL])="${platform_libs_escape} ${requirements_libs_[][]m4_defn([DOWNEFL])}"
53 requirements_cflags_[]m4_defn([DOWNEFL])="${platform_cflags_escape} ${requirements_cflags_[][]m4_defn([DOWNEFL])}"
54 ;;
55 exotic)
56 requirements_pc_[]m4_defn([DOWNEFL])="${platform_pc_exotic} ${requirements_pc_[][]m4_defn([DOWNEFL])}"
57 requirements_libs_[]m4_defn([DOWNEFL])="${platform_libs_exotic} ${requirements_libs_[][]m4_defn([DOWNEFL])}"
58 requirements_cflags_[]m4_defn([DOWNEFL])="${platform_cflags_exotic} ${requirements_cflags_[][]m4_defn([DOWNEFL])}"
59 ;; 62 ;;
60 *) 63 *)
61 AC_MSG_ERROR([Unknown platform: $2]) 64 if test "x${efl_lib_optional_[]m4_defn([DOWNOTHER])}" = "xyes"; then
65 EFL_INTERNAL_DEPEND_PKG([$1], [$2])
66 fi
67 ;;
62esac 68esac
63m4_popdef([DOWNEFL])dnl 69m4_popdef([DOWNOTHER])dnl
64]) 70])
65 71
66dnl EFL_CRYPTO_DEPEND(EFL) 72dnl EFL_CRYPTO_DEPEND(EFL)
@@ -156,12 +162,16 @@ AC_DEFUN([EFL_LIB_START],
156m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl 162m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
157m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl 163m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
158 164
165requirements_internal_libs_[]m4_defn([DOWN])=""
159requirements_libs_[]m4_defn([DOWN])="" 166requirements_libs_[]m4_defn([DOWN])=""
160requirements_cflags_[]m4_defn([DOWN])="" 167requirements_cflags_[]m4_defn([DOWN])=""
161requirements_pc_[]m4_defn([DOWN])="" 168requirements_pc_[]m4_defn([DOWN])=""
162requirements_pc_deps_[]m4_defn([DOWN])="" 169requirements_pc_deps_[]m4_defn([DOWN])=""
163 170
164m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS}" 171m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS}"
172m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS}"
173USE_[]m4_defn([UP])_LIBS="${USE_[]m4_defn([UP])_LIBS}"
174USE_[]m4_defn([UP])_INTERNAL_LIBS="${USE_[]m4_defn([UP])_INTERNAL_LIBS}"
165m4_defn([UP])_LDFLAGS="${m4_defn([UP])_LDFLAGS}" 175m4_defn([UP])_LDFLAGS="${m4_defn([UP])_LDFLAGS}"
166m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS}" 176m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS}"
167 177
@@ -169,6 +179,9 @@ AC_SUBST([requirements_libs_]m4_defn([DOWN]))
169AC_SUBST([requirements_cflags_]m4_defn([DOWN])) 179AC_SUBST([requirements_cflags_]m4_defn([DOWN]))
170AC_SUBST([requirements_pc_]m4_defn([DOWN])) 180AC_SUBST([requirements_pc_]m4_defn([DOWN]))
171AC_SUBST(m4_defn([UP])[_LIBS]) 181AC_SUBST(m4_defn([UP])[_LIBS])
182AC_SUBST(m4_defn([UP])[_INTERNAL_LIBS])
183AC_SUBST([USE_]m4_defn([UP])[_LIBS])
184AC_SUBST([USE_]m4_defn([UP])[_INTERNAL_LIBS])
172AC_SUBST(m4_defn([UP])[_LDFLAGS]) 185AC_SUBST(m4_defn([UP])[_LDFLAGS])
173AC_SUBST(m4_defn([UP])[_CFLAGS]) 186AC_SUBST(m4_defn([UP])[_CFLAGS])
174 187
@@ -185,9 +198,29 @@ AC_DEFUN([EFL_LIB_END],
185m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl 198m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
186m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl 199m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
187 200
188m4_defn([UP])_LDFLAGS="${m4_defn([UP])_LDFLAGS} ${EFL_LDFLAGS}" 201libdirname="m4_defn([DOWN])"
189m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} ${m4_defn([UP])_LDFLAGS} ${EFL_LIBS} ${requirements_libs_[]m4_defn([DOWN])} ${requirements_libs_efl} " 202libname="m4_defn([DOWN])"
190m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS} ${EFL_CFLAGS} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_efl}" 203case "m4_defn([DOWN])" in
204 edbus)
205 libname="edbus2"
206 ;;
207 ethumb_client)
208 libdirname="ethumb/client"
209 ;;
210 ecore_input_evas)
211 libdirname="ecore_input"
212 ;;
213 ecore_imf_evas)
214 libdirname="ecore_imf"
215 ;;
216esac
217
218m4_defn([UP])_LDFLAGS="${m4_defn([UP])_LDFLAGS} ${EFL_COV_CFLAGS} ${EFL_LDFLAGS}"
219m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} ${m4_defn([UP])_LDFLAGS} ${EFL_COV_LIBS} ${EFL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])} ${requirements_libs_[]m4_defn([DOWN])} ${requirements_libs_efl} "
220m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}"
221USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la"
222USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la"
223m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS} ${EFL_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_efl} -DEFL_[]m4_defn([UP])_BUILD=1"
191requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_efl}" 224requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_efl}"
192requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_efl}" 225requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_efl}"
193 226
diff --git a/src/Makefile_EDBus.am b/src/Makefile_EDBus.am
index 600aedf744..4920ae02a3 100644
--- a/src/Makefile_EDBus.am
+++ b/src/Makefile_EDBus.am
@@ -34,22 +34,9 @@ lib/edbus/edbus_message_from_eina_value.c
34 34
35lib_edbus_libedbus2_la_CPPFLAGS = \ 35lib_edbus_libedbus2_la_CPPFLAGS = \
36-include $(top_builddir)/config.h \ 36-include $(top_builddir)/config.h \
37-I$(top_srcdir)/src/lib/eina \
38-I$(top_builddir)/src/lib/eina \
39-I$(top_srcdir)/src/lib/eo \
40-I$(top_srcdir)/src/lib/ecore \
41-I$(top_srcdir)/src/lib/edbus \
42-DEFL_EDBUS_BUILD \
43@EFL_COV_CFLAGS@ \
44@EDBUS_CFLAGS@ 37@EDBUS_CFLAGS@
45 38lib_edbus_libedbus2_la_LIBADD = @EDBUS_LIBS@
46lib_edbus_libedbus2_la_LIBADD = \ 39lib_edbus_libedbus2_la_DEPENDENCIES = @EDBUS_INTERNAL_LIBS@
47lib/eina/libeina.la \
48lib/eo/libeo.la \
49lib/ecore/libecore.la \
50@EDBUS_LIBS@ \
51@EFL_COV_LIBS@
52
53lib_edbus_libedbus2_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 40lib_edbus_libedbus2_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
54 41
55### Binary 42### Binary
@@ -65,21 +52,9 @@ bin/edbus/source_client.c \
65bin/edbus/client.c 52bin/edbus/client.c
66 53
67bin_edbus_edbus_codegen_CPPFLAGS = \ 54bin_edbus_edbus_codegen_CPPFLAGS = \
68-I$(top_srcdir)/src/lib/eina \
69-I$(top_builddir)/src/lib/eina \
70-I$(top_srcdir)/src/lib/eo \
71-I$(top_srcdir)/src/lib/ecore \
72-I$(top_srcdir)/src/lib/edbus \
73-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 55-DPACKAGE_BIN_DIR=\"$(bindir)\" \
74-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 56-DPACKAGE_LIB_DIR=\"$(libdir)\" \
75-DPACKAGE_DATA_DIR=\"$(datadir)/edbus\" \ 57-DPACKAGE_DATA_DIR=\"$(datadir)/edbus\" \
76@EDBUS_CFLAGS@ \ 58@EDBUS_CFLAGS@
77@EFL_COV_CFLAGS@ 59bin_edbus_edbus_codegen_LDADD = @USE_EDBUS_LIBS@
78 60bin_edbus_edbus_codegen_DEPENDENCIES = @USE_EDBUS_INTERNAL_LIBS@
79bin_edbus_edbus_codegen_LDADD = \
80lib/eina/libeina.la \
81lib/eo/libeo.la \
82lib/ecore/libecore.la \
83lib/edbus/libedbus2.la \
84@EDBUS_LDFLAGS@ \
85@EFL_COV_LIBS@
diff --git a/src/Makefile_EPhysics.am b/src/Makefile_EPhysics.am
index b30d9092ca..33748effef 100644
--- a/src/Makefile_EPhysics.am
+++ b/src/Makefile_EPhysics.am
@@ -21,31 +21,9 @@ lib/ephysics/ephysics_quaternion.cpp \
21lib/ephysics/ephysics_shape.cpp \ 21lib/ephysics/ephysics_shape.cpp \
22lib/ephysics/ephysics_world.cpp 22lib/ephysics/ephysics_world.cpp
23 23
24lib_ephysics_libephysics_la_CPPFLAGS = \ 24lib_ephysics_libephysics_la_CPPFLAGS = @EPHYSICS_CFLAGS@
25-I$(top_srcdir)/src/lib/eina \ 25lib_ephysics_libephysics_la_LIBADD = @EPHYSICS_LIBS@
26-I$(top_builddir)/src/lib/eina \ 26lib_ephysics_libephysics_la_DEPENDENCIES = @EPHYSICS_INTERNAL_LIBS@
27-I$(top_srcdir)/src/lib/eo \
28-I$(top_builddir)/src/lib/eo \
29-I$(top_srcdir)/src/lib/ecore \
30-I$(top_builddir)/src/lib/ecore \
31-I$(top_srcdir)/src/lib/evas \
32-I$(top_builddir)/src/lib/evas \
33-I$(top_srcdir)/src/lib/ephysics \
34-I$(top_builddir)/src/lib/ephysics \
35@EFL_COV_CFLAGS@ \
36@EPHYSICS_CFLAGS@ \
37@USE_EVIL_CFLAGS@ \
38-DEFL_EPHYSICS_BUILD
39
40lib_ephysics_libephysics_la_LIBADD = \
41lib/eina/libeina.la \
42lib/eo/libeo.la \
43lib/ecore/libecore.la \
44lib/evas/libevas.la \
45@EFL_COV_LIBS@ \
46@USE_EVIL_LIBS@ \
47@EPHYSICS_LIBS@
48
49lib_ephysics_libephysics_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 27lib_ephysics_libephysics_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
50 28
51endif 29endif
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 1d3a6a72cd..97bb235519 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -48,25 +48,9 @@ lib_ecore_libecore_la_SOURCES += lib/ecore/ecore_signal.c lib/ecore/ecore_exe.c
48endif 48endif
49endif 49endif
50 50
51lib_ecore_libecore_la_CPPFLAGS = \ 51lib_ecore_libecore_la_CPPFLAGS = @ECORE_CFLAGS@
52-I$(top_srcdir)/src/lib/eina \ 52lib_ecore_libecore_la_LIBADD = @ECORE_LIBS@
53-I$(top_builddir)/src/lib/eina \ 53lib_ecore_libecore_la_DEPENDENCIES = @ECORE_INTERNAL_LIBS@
54-I$(top_srcdir)/src/lib/eo \
55-I$(top_srcdir)/src/lib/ecore \
56-DEFL_ECORE_BUILD \
57@EFL_COV_CFLAGS@ \
58@ECORE_CFLAGS@ \
59@USE_EVIL_CFLAGS@ \
60@USE_ESCAPE_CFLAGS@
61
62lib_ecore_libecore_la_LIBADD = \
63lib/eo/libeo.la \
64lib/eina/libeina.la \
65@USE_EVIL_LIBS@ \
66@USE_ESCAPE_LIBS@ \
67@ECORE_LIBS@ \
68@EFL_COV_LIBS@
69
70lib_ecore_libecore_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 54lib_ecore_libecore_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
71 55
72### Unit tests 56### Unit tests
@@ -84,32 +68,33 @@ tests/ecore/ecore_test_ecore_imf.c \
84tests/ecore/ecore_suite.h 68tests/ecore/ecore_suite.h
85 69
86tests_ecore_ecore_suite_CPPFLAGS = \ 70tests_ecore_ecore_suite_CPPFLAGS = \
87-I$(top_srcdir)/src/lib/eina \
88-I$(top_builddir)/src/lib/eina \
89-I$(top_srcdir)/src/lib/eo \
90-I$(top_srcdir)/src/lib/ecore \
91-I$(top_srcdir)/src/lib/ecore_audio \
92-I$(top_srcdir)/src/lib/ecore_con \
93-I$(top_srcdir)/src/lib/ecore_file \
94-I$(top_srcdir)/src/lib/ecore_x \
95-I$(top_builddir)/src/lib/ecore_x \
96-I$(top_srcdir)/src/lib/ecore_imf \
97-I$(top_builddir)/src/lib/ecore_imf \
98-DTESTS_SRC_DIR=\"`pwd`/$(top_srcdir)\" \ 71-DTESTS_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
99@CHECK_CFLAGS@ 72@CHECK_CFLAGS@ \
73@ECORE_CFLAGS@ \
74@ECORE_AUDIO_CFLAGS@ \
75@ECORE_CON_CFLAGS@ \
76@ECORE_FILE_CFLAGS@ \
77@ECORE_X_CFLAGS@ \
78@ECORE_IMF_CFLAGS@
100 79
101tests_ecore_ecore_suite_LDADD = \ 80tests_ecore_ecore_suite_LDADD = \
102lib/ecore_imf/libecore_imf.la \ 81@CHECK_LIBS@ \
103lib/ecore_con/libecore_con.la \ 82@USE_ECORE_LIBS@ \
104lib/ecore_file/libecore_file.la \ 83@USE_ECORE_AUDIO_LIBS@ \
105lib/ecore/libecore.la \ 84@USE_ECORE_CON_LIBS@ \
106lib/eina/libeina.la \ 85@USE_ECORE_FILE_LIBS@ \
107@ECORE_LDFLAGS@ \ 86@USE_ECORE_X_LIBS@ \
108@CHECK_LIBS@ 87@USE_ECORE_IMF_LIBS@
88tests_ecore_ecore_suite_DEPENDENCIES = \
89@USE_ECORE_INTERNAL_LIBS@ \
90@USE_ECORE_AUDIO_INTERNAL_LIBS@ \
91@USE_ECORE_CON_INTERNAL_LIBS@ \
92@USE_ECORE_FILE_INTERNAL_LIBS@ \
93@USE_ECORE_X_INTERNAL_LIBS@ \
94@USE_ECORE_IMF_INTERNAL_LIBS@
109 95
110if HAVE_ECORE_AUDIO 96if HAVE_ECORE_AUDIO
111tests_ecore_ecore_suite_SOURCES += tests/ecore/ecore_test_ecore_audio.c 97tests_ecore_ecore_suite_SOURCES += tests/ecore/ecore_test_ecore_audio.c
112tests_ecore_ecore_suite_LDADD += lib/ecore_audio/libecore_audio.la
113endif 98endif
114 99
115endif 100endif
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index d2a19a11ac..d22430c9ab 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -17,24 +17,9 @@ lib/ecore_audio/ecore_audio_tone.c \
17lib/ecore_audio/ecore_audio_custom.c \ 17lib/ecore_audio/ecore_audio_custom.c \
18lib/ecore_audio/ecore_audio_private.h 18lib/ecore_audio/ecore_audio_private.h
19 19
20lib_ecore_audio_libecore_audio_la_CPPFLAGS = \ 20lib_ecore_audio_libecore_audio_la_CPPFLAGS = @ECORE_AUDIO_CFLAGS@
21-I$(top_srcdir)/src/lib/eina \ 21lib_ecore_audio_libecore_audio_la_LIBADD = @ECORE_AUDIO_LIBS@
22-I$(top_builddir)/src/lib/eina \ 22lib_ecore_audio_libecore_audio_la_DEPENDENCIES = @ECORE_AUDIO_INTERNAL_LIBS@
23-I$(top_srcdir)/src/lib/eo \
24-I$(top_srcdir)/src/lib/eet \
25-I$(top_srcdir)/src/lib/ecore \
26-DEFL_ECORE_AUDIO_BUILD \
27@EFL_COV_CFLAGS@ \
28@ECORE_AUDIO_CFLAGS@
29
30lib_ecore_audio_libecore_audio_la_LIBADD = \
31lib/ecore/libecore.la \
32lib/eet/libeet.la \
33lib/eo/libeo.la \
34lib/eina/libeina.la \
35@ECORE_AUDIO_LIBS@ \
36@EFL_COV_LIBS@
37
38lib_ecore_audio_libecore_audio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 23lib_ecore_audio_libecore_audio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
39 24
40endif 25endif
diff --git a/src/Makefile_Ecore_Cocoa.am b/src/Makefile_Ecore_Cocoa.am
index b7fe49a185..10b7cd2fb8 100644
--- a/src/Makefile_Ecore_Cocoa.am
+++ b/src/Makefile_Ecore_Cocoa.am
@@ -14,22 +14,8 @@ lib/ecore_cocoa/ecore_cocoa.m \
14lib/ecore_cocoa/ecore_cocoa_window.m \ 14lib/ecore_cocoa/ecore_cocoa_window.m \
15lib/ecore_cocoa/ecore_cocoa_private.h 15lib/ecore_cocoa/ecore_cocoa_private.h
16 16
17lib_ecore_cocoa_libecore_cocoa_la_CPPFLAGS = \ 17lib_ecore_cocoa_libecore_cocoa_la_CPPFLAGS = @ECORE_COCOA_CFLAGS@
18-I$(top_srcdir)/src/lib/eina \ 18lib_ecore_cocoa_libecore_cocoa_la_LIBADD = @ECORE_COCOA_LIBS@
19-I$(top_builddir)/src/lib/eina \ 19lib_ecore_cocoa_libecore_cocoa_la_DEPENDENCIES = @ECORE_COCOA_INTERNAL_LIBS@
20-I$(top_srcdir)/src/lib/eo \
21-I$(top_srcdir)/src/lib/ecore \
22-I$(top_srcdir)/src/lib/ecore_input \
23-I$(top_srcdir)/src/lib/ecore_cocoa \
24@ECORE_COCOA_CFLAGS@ \
25@EFL_COV_CFLAGS@
26
27lib_ecore_cocoa_libecore_cocoa_la_LIBADD = \
28lib/ecore_input/libecore_input.la \
29lib/ecore/libecore.la \
30lib/eo/libeo.la \
31lib/eina/libeina.la \
32@ECORE_COCOA_LIBS@
33
34lib_ecore_cocoa_libecore_cocoa_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 20lib_ecore_cocoa_libecore_cocoa_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
35endif 21endif
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index dbbfa1dd31..549a64d169 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -33,24 +33,7 @@ lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_info.c
33endif 33endif
34endif 34endif
35 35
36lib_ecore_con_libecore_con_la_CPPFLAGS = \ 36lib_ecore_con_libecore_con_la_CPPFLAGS = @ECORE_CON_CFLAGS@
37-I$(top_srcdir)/src/lib/eina \ 37lib_ecore_con_libecore_con_la_LIBADD = @ECORE_CON_LIBS@
38-I$(top_builddir)/src/lib/eina \ 38lib_ecore_con_libecore_con_la_DEPENDENCIES = @ECORE_CON_INTERNAL_LIBS@
39-I$(top_srcdir)/src/lib/eo \
40-I$(top_srcdir)/src/lib/eet \
41-I$(top_srcdir)/src/lib/ecore \
42-I$(top_srcdir)/src/lib/ecore_con \
43-DEFL_ECORE_CON_BUILD \
44@EFL_COV_CFLAGS@ \
45@ECORE_CON_CFLAGS@ \
46@USE_EVIL_CFLAGS@
47
48lib_ecore_con_libecore_con_la_LIBADD = \
49lib/ecore/libecore.la \
50lib/eet/libeet.la \
51lib/eo/libeo.la \
52lib/eina/libeina.la \
53@USE_EVIL_LIBS@
54
55lib_ecore_con_libecore_con_la_LIBADD += @ECORE_CON_LIBS@ @EFL_COV_LIBS@
56lib_ecore_con_libecore_con_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 39lib_ecore_con_libecore_con_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index 62cea7fcd1..6dfd6c4bc1 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -19,34 +19,12 @@ lib/ecore_evas/ecore_evas_private.h \
19lib/ecore_evas/ecore_evas_util.c 19lib/ecore_evas/ecore_evas_util.c
20 20
21lib_ecore_evas_libecore_evas_la_CPPFLAGS = \ 21lib_ecore_evas_libecore_evas_la_CPPFLAGS = \
22-I$(top_srcdir)/src/lib/eina \
23-I$(top_builddir)/src/lib/eina \
24-I$(top_srcdir)/src/lib/eo \
25-I$(top_srcdir)/src/lib/evas \
26-I$(top_srcdir)/src/lib/ecore \
27-I$(top_srcdir)/src/lib/ecore_ipc \
28-I$(top_srcdir)/src/lib/ecore_input \
29-I$(top_srcdir)/src/lib/ecore_input_evas \
30-I$(top_srcdir)/src/lib/ecore_evas \
31-I$(top_srcdir)/src/modules/evas/engines/buffer \ 22-I$(top_srcdir)/src/modules/evas/engines/buffer \
32-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 23-DPACKAGE_LIB_DIR=\"$(libdir)\" \
33-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \ 24-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
34-DEFL_ECORE_EVAS_BUILD \ 25@ECORE_EVAS_CFLAGS@
35@ECORE_EVAS_CFLAGS@ \ 26lib_ecore_evas_libecore_evas_la_LIBADD = @ECORE_EVAS_LIBS@
36@EFL_COV_CFLAGS@ \ 27lib_ecore_evas_libecore_evas_la_DEPENDENCIES = @ECORE_EVAS_INTERNAL_LIBS@
37@USE_EVIL_CFLAGS@
38
39lib_ecore_evas_libecore_evas_la_LIBADD = \
40lib/ecore_input/libecore_input_evas.la \
41lib/ecore_input/libecore_input.la \
42lib/ecore/libecore.la \
43lib/evas/libevas.la \
44lib/eo/libeo.la \
45lib/eina/libeina.la \
46@ECORE_EVAS_LIBS@ \
47@EFL_COV_LIBS@
48
49lib_ecore_evas_libecore_evas_la_LIBADD += @EFL_COV_LIBS@
50lib_ecore_evas_libecore_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 28lib_ecore_evas_libecore_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
51 29
52# Engines 30# Engines
@@ -57,8 +35,16 @@ modules/ecore_evas/engines/extn/ecore_evas_extn.c
57ecoreevasengineextnpkgdir = $(libdir)/ecore_evas/engines/extn/$(MODULE_ARCH) 35ecoreevasengineextnpkgdir = $(libdir)/ecore_evas/engines/extn/$(MODULE_ARCH)
58ecoreevasengineextnpkg_LTLIBRARIES = modules/ecore_evas/engines/extn/module.la 36ecoreevasengineextnpkg_LTLIBRARIES = modules/ecore_evas/engines/extn/module.la
59modules_ecore_evas_engines_extn_module_la_SOURCES = $(EXTNSOURCES) 37modules_ecore_evas_engines_extn_module_la_SOURCES = $(EXTNSOURCES)
60modules_ecore_evas_engines_extn_module_la_CPPFLAGS = $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) 38modules_ecore_evas_engines_extn_module_la_CPPFLAGS = \
61modules_ecore_evas_engines_extn_module_la_LIBADD = lib/ecore_ipc/libecore_ipc.la lib/ecore_evas/libecore_evas.la 39@ECORE_EVAS_CFLAGS@ \
40@ECORE_IPC_CFLAGS@ \
41-I$(top_srcdir)/src/modules/evas/engines/buffer
42modules_ecore_evas_engines_extn_module_la_LIBADD = \
43@USE_ECORE_EVAS_LIBS@ \
44@USE_ECORE_IPC_LIBS@
45modules_ecore_evas_engines_extn_module_la_DEPENDENCIES = \
46@USE_ECORE_EVAS_INTERNAL_LIBS@ \
47@USE_ECORE_IPC_INTERNAL_LIBS@
62modules_ecore_evas_engines_extn_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 48modules_ecore_evas_engines_extn_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
63modules_ecore_evas_engines_extn_module_la_LIBTOOLFLAGS = --tag=disable-static 49modules_ecore_evas_engines_extn_module_la_LIBTOOLFLAGS = --tag=disable-static
64endif 50endif
@@ -69,14 +55,16 @@ ecoreevasenginexpkgdir = $(libdir)/ecore_evas/engines/x/$(MODULE_ARCH)
69ecoreevasenginexpkg_LTLIBRARIES = modules/ecore_evas/engines/x/module.la 55ecoreevasenginexpkg_LTLIBRARIES = modules/ecore_evas/engines/x/module.la
70modules_ecore_evas_engines_x_module_la_SOURCES = $(XSOURCES) 56modules_ecore_evas_engines_x_module_la_SOURCES = $(XSOURCES)
71modules_ecore_evas_engines_x_module_la_CPPFLAGS = \ 57modules_ecore_evas_engines_x_module_la_CPPFLAGS = \
72$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 58@ECORE_EVAS_CFLAGS@ \
73-I$(top_srcdir)/src/lib/ecore_x \ 59@ECORE_X_CFLAGS@ \
74-I$(top_builddir)/src/lib/ecore_x \
75-I$(top_srcdir)/src/modules/evas/engines/software_x11 \ 60-I$(top_srcdir)/src/modules/evas/engines/software_x11 \
76-I$(top_srcdir)/src/modules/evas/engines/gl_x11 61-I$(top_srcdir)/src/modules/evas/engines/gl_x11
77modules_ecore_evas_engines_x_module_la_LIBADD = \ 62modules_ecore_evas_engines_x_module_la_LIBADD = \
78lib/ecore_evas/libecore_evas.la \ 63@USE_ECORE_EVAS_LIBS@ \
79lib/ecore_x/libecore_x.la 64@USE_ECORE_X_LIBS@
65modules_ecore_evas_engines_x_module_la_DEPENDENCIES = \
66@USE_ECORE_EVAS_INTERNAL_LIBS@ \
67@USE_ECORE_X_INTERNAL_LIBS@
80modules_ecore_evas_engines_x_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 68modules_ecore_evas_engines_x_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
81modules_ecore_evas_engines_x_module_la_LIBTOOLFLAGS = --tag=disable-static 69modules_ecore_evas_engines_x_module_la_LIBTOOLFLAGS = --tag=disable-static
82endif 70endif
@@ -87,12 +75,15 @@ ecoreevasenginecocoapkgdir = $(libdir)/ecore_evas/engines/cocoa/$(MODULE_ARCH)
87ecoreevasenginecocoapkg_LTLIBRARIES = modules/ecore_evas/engines/cocoa/module.la 75ecoreevasenginecocoapkg_LTLIBRARIES = modules/ecore_evas/engines/cocoa/module.la
88modules_ecore_evas_engines_cocoa_module_la_SOURCES = $(COCOASOURCES) 76modules_ecore_evas_engines_cocoa_module_la_SOURCES = $(COCOASOURCES)
89modules_ecore_evas_engines_cocoa_module_la_CPPFLAGS = \ 77modules_ecore_evas_engines_cocoa_module_la_CPPFLAGS = \
90$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 78@ECORE_EVAS_CFLAGS@ \
91-I$(top_srcdir)/src/lib/ecore_cocoa \ 79@ECORE_COCOA_CFLAGS@ \
92-I$(top_srcdir)/src/modules/evas/engines/gl_cocoa 80-I$(top_srcdir)/src/modules/evas/engines/gl_cocoa
93modules_ecore_evas_engines_cocoa_module_la_LIBADD = \ 81modules_ecore_evas_engines_cocoa_module_la_LIBADD = \
94lib/ecore_evas/libecore_evas.la \ 82@USE_ECORE_EVAS_LIBS@ \
95lib/ecore_cocoa/libecore_cocoa.la 83@USE_ECORE_COCOA_LIBS@
84modules_ecore_evas_engines_cocoa_module_la_DEPENDENCIES = \
85@USE_ECORE_EVAS_INTERNAL_LIBS@ \
86@USE_ECORE_COCOA_INTERNAL_LIBS@
96modules_ecore_evas_engines_cocoa_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 87modules_ecore_evas_engines_cocoa_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
97modules_ecore_evas_engines_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static 88modules_ecore_evas_engines_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static
98endif 89endif
@@ -103,12 +94,15 @@ ecoreevasenginefbpkgdir = $(libdir)/ecore_evas/engines/fb/$(MODULE_ARCH)
103ecoreevasenginefbpkg_LTLIBRARIES = modules/ecore_evas/engines/fb/module.la 94ecoreevasenginefbpkg_LTLIBRARIES = modules/ecore_evas/engines/fb/module.la
104modules_ecore_evas_engines_fb_module_la_SOURCES = $(FBSOURCES) 95modules_ecore_evas_engines_fb_module_la_SOURCES = $(FBSOURCES)
105modules_ecore_evas_engines_fb_module_la_CPPFLAGS = \ 96modules_ecore_evas_engines_fb_module_la_CPPFLAGS = \
106$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 97@ECORE_EVAS_CFLAGS@ \
107-I$(top_srcdir)/src/lib/ecore_fb \ 98@ECORE_FB_CFLAGS@ \
108-I$(top_srcdir)/src/modules/evas/engines/fb 99-I$(top_srcdir)/src/modules/evas/engines/fb
109modules_ecore_evas_engines_fb_module_la_LIBADD = \ 100modules_ecore_evas_engines_fb_module_la_LIBADD = \
110lib/ecore_evas/libecore_evas.la \ 101@USE_ECORE_EVAS_LIBS@ \
111lib/ecore_fb/libecore_fb.la 102@USE_ECORE_FB_LIBS@
103modules_ecore_evas_engines_fb_module_la_DEPENDENCIES = \
104@USE_ECORE_EVAS_INTERNAL_LIBS@ \
105@USE_ECORE_FB_INTERNAL_LIBS@
112modules_ecore_evas_engines_fb_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 106modules_ecore_evas_engines_fb_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
113modules_ecore_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static 107modules_ecore_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static
114endif 108endif
@@ -119,12 +113,15 @@ ecoreevasenginepsl1ghtpkgdir = $(libdir)/ecore_evas/engines/psl1ght/$(MODULE_ARC
119ecoreevasenginepsl1ghtpkg_LTLIBRARIES = modules/ecore_evas/engines/psl1ght/module.la 113ecoreevasenginepsl1ghtpkg_LTLIBRARIES = modules/ecore_evas/engines/psl1ght/module.la
120modules_ecore_evas_engines_psl1ght_module_la_SOURCES = $(PSL1GHTSOURCES) 114modules_ecore_evas_engines_psl1ght_module_la_SOURCES = $(PSL1GHTSOURCES)
121modules_ecore_evas_engines_psl1ght_module_la_CPPFLAGS = \ 115modules_ecore_evas_engines_psl1ght_module_la_CPPFLAGS = \
122$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 116@ECORE_EVAS_CFLAGS@ \
123-I$(top_srcdir)/src/lib/ecore_psl1ght \ 117@ECORE_PSL1GHT_CFLAGS@ \
124-I$(top_srcdir)/src/modules/evas/engines/psl1ght 118-I$(top_srcdir)/src/modules/evas/engines/psl1ght
125modules_ecore_evas_engines_psl1ght_module_la_LIBADD = \ 119modules_ecore_evas_engines_psl1ght_module_la_LIBADD = \
126lib/ecore_evas/libecore_evas.la \ 120@USE_ECORE_EVAS_LIBS@ \
127lib/ecore_psl1ght/libecore_psl1ght.la 121@USE_ECORE_PSL1GHT_LIBS@
122modules_ecore_evas_engines_psl1ght_module_la_DEPENDENCIES = \
123@USE_ECORE_EVAS_INTERNAL_LIBS@ \
124@USE_ECORE_PSL1GHT_INTERNAL_LIBS@
128modules_ecore_evas_engines_psl1ght_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 125modules_ecore_evas_engines_psl1ght_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
129modules_ecore_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static 126modules_ecore_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static
130endif 127endif
@@ -139,14 +136,17 @@ ecoreevasenginewaylandpkgdir = $(libdir)/ecore_evas/engines/wayland/$(MODULE_ARC
139ecoreevasenginewaylandpkg_LTLIBRARIES = modules/ecore_evas/engines/wayland/module.la 136ecoreevasenginewaylandpkg_LTLIBRARIES = modules/ecore_evas/engines/wayland/module.la
140modules_ecore_evas_engines_wayland_module_la_SOURCES = $(WAYLANDSOURCES) 137modules_ecore_evas_engines_wayland_module_la_SOURCES = $(WAYLANDSOURCES)
141modules_ecore_evas_engines_wayland_module_la_CPPFLAGS = \ 138modules_ecore_evas_engines_wayland_module_la_CPPFLAGS = \
142$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 139@ECORE_EVAS_CFLAGS@ \
143-I$(top_srcdir)/src/lib/ecore_wayland \ 140@ECORE_WAYLAND_CFLAGS@ \
144-I$(top_srcdir)/src/modules/evas/engines/wayland_shm \ 141-I$(top_srcdir)/src/modules/evas/engines/wayland_shm \
145-I$(top_srcdir)/src/modules/evas/engines/wayland_egl \ 142-I$(top_srcdir)/src/modules/evas/engines/wayland_egl \
146@ECORE_WAYLAND_CFLAGS@ 143@ECORE_WAYLAND_CFLAGS@
147modules_ecore_evas_engines_wayland_module_la_LIBADD = \ 144modules_ecore_evas_engines_wayland_module_la_LIBADD = \
148lib/ecore_evas/libecore_evas.la \ 145@USE_ECORE_EVAS_LIBS@ \
149lib/ecore_wayland/libecore_wayland.la 146@USE_ECORE_WAYLAND_LIBS@
147modules_ecore_evas_engines_wayland_module_la_DEPENDENCIES = \
148@USE_ECORE_EVAS_INTERNAL_LIBS@ \
149@USE_ECORE_WAYLAND_INTERNAL_LIBS@
150modules_ecore_evas_engines_wayland_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 150modules_ecore_evas_engines_wayland_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
151modules_ecore_evas_engines_wayland_module_la_LIBTOOLFLAGS = --tag=disable-static 151modules_ecore_evas_engines_wayland_module_la_LIBTOOLFLAGS = --tag=disable-static
152endif 152endif
@@ -158,12 +158,15 @@ ecoreevasenginesdlpkgdir = $(libdir)/ecore_evas/engines/sdl/$(MODULE_ARCH)
158ecoreevasenginesdlpkg_LTLIBRARIES = modules/ecore_evas/engines/sdl/module.la 158ecoreevasenginesdlpkg_LTLIBRARIES = modules/ecore_evas/engines/sdl/module.la
159modules_ecore_evas_engines_sdl_module_la_SOURCES = $(SDLSOURCES) 159modules_ecore_evas_engines_sdl_module_la_SOURCES = $(SDLSOURCES)
160modules_ecore_evas_engines_sdl_module_la_CPPFLAGS = \ 160modules_ecore_evas_engines_sdl_module_la_CPPFLAGS = \
161$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 161@ECORE_EVAS_CFLAGS@ \
162-I$(top_srcdir)/src/lib/ecore_sdl \ 162@ECORE_SDL_CFLAGS@ \
163-I$(top_srcdir)/src/modules/evas/engines/gl_sdl 163-I$(top_srcdir)/src/modules/evas/engines/gl_sdl
164modules_ecore_evas_engines_sdl_module_la_LIBADD = \ 164modules_ecore_evas_engines_sdl_module_la_LIBADD = \
165lib/ecore_evas/libecore_evas.la \ 165@USE_ECORE_EVAS_LIBS@ \
166lib/ecore_sdl/libecore_sdl.la 166@USE_ECORE_SDL_LIBS@
167modules_ecore_evas_engines_sdl_module_la_DEPENDENCIES = \
168@USE_ECORE_EVAS_INTERNAL_LIBS@ \
169@USE_ECORE_SDL_INTERNAL_LIBS@
167modules_ecore_evas_engines_sdl_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 170modules_ecore_evas_engines_sdl_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
168modules_ecore_evas_engines_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static 171modules_ecore_evas_engines_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static
169endif 172endif
@@ -175,13 +178,16 @@ ecoreevasengineswin32pkgdir = $(libdir)/ecore_evas/engines/win32/$(MODULE_ARCH)
175ecoreevasengineswin32pkg_LTLIBRARIES = modules/ecore_evas/engines/win32/module.la 178ecoreevasengineswin32pkg_LTLIBRARIES = modules/ecore_evas/engines/win32/module.la
176modules_ecore_evas_engines_win32_module_la_SOURCES = $(WIN32SOURCES) 179modules_ecore_evas_engines_win32_module_la_SOURCES = $(WIN32SOURCES)
177modules_ecore_evas_engines_win32_module_la_CPPFLAGS = \ 180modules_ecore_evas_engines_win32_module_la_CPPFLAGS = \
178$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 181@ECORE_EVAS_CFLAGS@ \
179-I$(top_srcdir)/src/lib/ecore_win32 \ 182@ECORE_WIN32_CFLAGS@ \
180-I$(top_srcdir)/src/modules/evas/engines/software_ddraw \ 183-I$(top_srcdir)/src/modules/evas/engines/software_ddraw \
181-I$(top_srcdir)/src/modules/evas/engines/software_gdi 184-I$(top_srcdir)/src/modules/evas/engines/software_gdi
182modules_ecore_evas_engines_win32_module_la_LIBADD = \ 185modules_ecore_evas_engines_win32_module_la_LIBADD = \
183lib/ecore/libecore_evas.la \ 186@USE_ECORE_EVAS_LIBS@ \
184lib/ecore_win32/libecore_win32.la 187@USE_ECORE_WIN32_LIBS@
188modules_ecore_evas_engines_win32_module_la_DEPENDENCIES = \
189@USE_ECORE_EVAS_INTERNAL_LIBS@ \
190@USE_ECORE_WIN32_INTERNAL_LIBS@
185modules_ecore_evas_engines_win32_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 191modules_ecore_evas_engines_win32_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
186modules_ecore_evas_engines_win32_module_la_LIBTOOLFLAGS = --tag=disable-static 192modules_ecore_evas_engines_win32_module_la_LIBTOOLFLAGS = --tag=disable-static
187endif 193endif
diff --git a/src/Makefile_Ecore_FB.am b/src/Makefile_Ecore_FB.am
index 4c84b2e96f..7f40863d87 100644
--- a/src/Makefile_Ecore_FB.am
+++ b/src/Makefile_Ecore_FB.am
@@ -16,22 +16,8 @@ lib/ecore_fb/ecore_fb_vt.c \
16lib/ecore_fb/ecore_fb_keytable.h \ 16lib/ecore_fb/ecore_fb_keytable.h \
17lib/ecore_fb/ecore_fb_private.h 17lib/ecore_fb/ecore_fb_private.h
18 18
19lib_ecore_fb_libecore_fb_la_CPPFLAGS = \ 19lib_ecore_fb_libecore_fb_la_CPPFLAGS = @ECORE_FB_CFLAGS@
20-I$(top_srcdir)/src/lib/eina \ 20lib_ecore_fb_libecore_fb_la_LIBADD = @ECORE_FB_LIBS@
21-I$(top_builddir)/src/lib/eina \ 21lib_ecore_fb_libecore_fb_la_DEPENDENCIES = @ECORE_FB_INTERNAL_LIBS@
22-I$(top_srcdir)/src/lib/eo \
23-I$(top_srcdir)/src/lib/ecore \
24-I$(top_srcdir)/src/lib/ecore_input \
25-I$(top_srcdir)/src/lib/ecore_fb \
26@EFL_COV_CFLAGS@ \
27@ECORE_FB_CFLAGS@
28
29lib_ecore_fb_libecore_fb_la_LIBADD = \
30lib/ecore_input/libecore_input.la \
31lib/ecore/libecore.la \
32lib/eo/libeo.la \
33lib/eina/libeina.la \
34@ECORE_FB_LIBS@
35
36lib_ecore_fb_libecore_fb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 22lib_ecore_fb_libecore_fb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
37endif 23endif
diff --git a/src/Makefile_Ecore_File.am b/src/Makefile_Ecore_File.am
index 8dfa6f320a..27dbe33b91 100644
--- a/src/Makefile_Ecore_File.am
+++ b/src/Makefile_Ecore_File.am
@@ -27,21 +27,7 @@ lib/ecore_file/ecore_file_monitor_poll.c
27endif 27endif
28endif 28endif
29 29
30lib_ecore_file_libecore_file_la_CPPFLAGS = \ 30lib_ecore_file_libecore_file_la_CPPFLAGS = @ECORE_FILE_CFLAGS@
31-I$(top_srcdir)/src/lib/eina \ 31lib_ecore_file_libecore_file_la_LIBADD = @ECORE_FILE_LIBS@
32-I$(top_builddir)/src/lib/eina \ 32lib_ecore_file_libecore_file_la_DEPENDENCIES = @ECORE_FILE_INTERNAL_LIBS@
33-I$(top_srcdir)/src/lib/eo \
34-I$(top_srcdir)/src/lib/ecore \
35-I$(top_srcdir)/src/lib/ecore_con \
36-I$(top_srcdir)/src/lib/ecore_file \
37-DEFL_ECORE_FILE_BUILD \
38@ECORE_FILE_CFLAGS@ \
39@EFL_COV_CFLAGS@
40
41lib_ecore_file_libecore_file_la_LIBADD = \
42lib/ecore_con/libecore_con.la \
43lib/ecore/libecore.la \
44lib/eo/libeo.la \
45lib/eina/libeina.la \
46@EFL_COV_LIBS@
47lib_ecore_file_libecore_file_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 33lib_ecore_file_libecore_file_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Imf.am b/src/Makefile_Ecore_Imf.am
index aaf5957c5e..e410f00521 100644
--- a/src/Makefile_Ecore_Imf.am
+++ b/src/Makefile_Ecore_Imf.am
@@ -16,54 +16,23 @@ lib/ecore_imf/ecore_imf_module.c \
16lib/ecore_imf/ecore_imf_private.h 16lib/ecore_imf/ecore_imf_private.h
17 17
18lib_ecore_imf_libecore_imf_la_CPPFLAGS = \ 18lib_ecore_imf_libecore_imf_la_CPPFLAGS = \
19-I$(top_srcdir)/src/lib/eina \
20-I$(top_builddir)/src/lib/eina \
21-I$(top_srcdir)/src/lib/eo \
22-I$(top_srcdir)/src/lib/ecore \
23-I$(top_srcdir)/src/lib/ecore_imf \
24-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 19-DPACKAGE_BIN_DIR=\"$(bindir)\" \
25-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 20-DPACKAGE_LIB_DIR=\"$(libdir)\" \
26-DPACKAGE_DATA_DIR=\"$(datadir)/ecore_imf\" \ 21-DPACKAGE_DATA_DIR=\"$(datadir)/ecore_imf\" \
27-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \ 22-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
28-DEFL_ECORE_IMF_BUILD \ 23@ECORE_IMF_CFLAGS@
29@ECORE_IMF_CFLAGS@ \ 24lib_ecore_imf_libecore_imf_la_LIBADD = @ECORE_IMF_LIBS@
30@EFL_COV_CFLAGS@ 25lib_ecore_imf_libecore_imf_la_DEPENDENCIES = @ECORE_IMF_INTERNAL_LIBS@
31
32lib_ecore_imf_libecore_imf_la_LIBADD = \
33lib/ecore/libecore.la \
34lib/eo/libeo.la \
35lib/eina/libeina.la \
36@EFL_COV_LIBS@
37
38lib_ecore_imf_libecore_imf_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 26lib_ecore_imf_libecore_imf_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
39 27
40installed_ecoreimfevasmainheadersdir = $(includedir)/ecore-@VMAJ@ 28installed_ecoreimfevasmainheadersdir = $(includedir)/ecore-@VMAJ@
41dist_installed_ecoreimfevasmainheaders_DATA = \ 29dist_installed_ecoreimfevasmainheaders_DATA = \
42lib/ecore_imf/Ecore_IMF_Evas.h 30lib/ecore_imf/Ecore_IMF_Evas.h
43 31
44lib_ecore_imf_libecore_imf_evas_la_SOURCES = \ 32lib_ecore_imf_libecore_imf_evas_la_SOURCES = lib/ecore_imf/ecore_imf_evas.c
45lib/ecore_imf/ecore_imf_evas.c 33lib_ecore_imf_libecore_imf_evas_la_CPPFLAGS = @ECORE_IMF_EVAS_CFLAGS@
46 34lib_ecore_imf_libecore_imf_evas_la_LIBADD = @ECORE_IMF_EVAS_LIBS@
47lib_ecore_imf_libecore_imf_evas_la_CPPFLAGS = \ 35lib_ecore_imf_libecore_imf_evas_la_DEPENDENCIES = @ECORE_IMF_EVAS_INTERNAL_LIBS@
48-I$(top_srcdir)/src/lib/eina \
49-I$(top_builddir)/src/lib/eina \
50-I$(top_srcdir)/src/lib/eo \
51-I$(top_srcdir)/src/lib/evas \
52-I$(top_srcdir)/src/lib/ecore \
53-I$(top_srcdir)/src/lib/ecore_imf \
54-I$(top_srcdir)/src/lib/ecore_imf_evas \
55-DEFL_ECORE_IMF_EVAS_BUILD \
56@ECORE_IMF_EVAS_CFLAGS@ \
57@EFL_COV_CFLAGS@
58
59lib_ecore_imf_libecore_imf_evas_la_LIBADD = \
60lib/ecore_imf/libecore_imf.la \
61lib/ecore/libecore.la \
62lib/evas/libevas.la \
63lib/eo/libeo.la \
64lib/eina/libeina.la \
65@EFL_COV_LIBS@
66
67lib_ecore_imf_libecore_imf_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 36lib_ecore_imf_libecore_imf_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
68 37
69 38
@@ -79,28 +48,12 @@ modules/ecore_imf/ibus/ibus_module.c \
79modules/ecore_imf/ibus/ibus_imcontext.c \ 48modules/ecore_imf/ibus/ibus_imcontext.c \
80modules/ecore_imf/ibus/ibus_imcontext.h 49modules/ecore_imf/ibus/ibus_imcontext.h
81modules_ecore_imf_ibus_module_la_CPPFLAGS = \ 50modules_ecore_imf_ibus_module_la_CPPFLAGS = \
82-I$(top_srcdir)/src/lib/eina \
83-I$(top_builddir)/src/lib/eina \
84-I$(top_srcdir)/src/lib/eo \
85-I$(top_srcdir)/src/lib/ecore \
86-I$(top_srcdir)/src/lib/ecore_input \
87-I$(top_srcdir)/src/lib/ecore_x \
88-I$(top_builddir)/src/lib/ecore_x \
89-I$(top_srcdir)/src/lib/ecore_imf \
90-I$(top_srcdir)/src/lib/ecore_evas \
91-I$(top_srcdir)/src/lib/evas \
92@ECORE_IMF_CFLAGS@ \ 51@ECORE_IMF_CFLAGS@ \
93@EFL_COV_CFLAGS@ \
94@IBUS_CFLAGS@ 52@IBUS_CFLAGS@
95modules_ecore_imf_ibus_module_la_LIBADD = \ 53modules_ecore_imf_ibus_module_la_LIBADD = \
96lib/ecore_evas/libecore_evas.la \ 54@USE_ECORE_IMF_LIBS@ \
97lib/ecore_imf/libecore_imf.la \ 55@IBUS_LIBS@
98lib/ecore_x/libecore_x.la \ 56modules_ecore_imf_ibus_module_la_DEPENDENCIES = @USE_ECORE_IMF_INTERNAL_LIBS@
99lib/ecore/libecore.la \
100lib/eo/libeo.la \
101lib/eina/libeina.la \
102@IBUS_LIBS@ \
103@EFL_COV_LIBS@
104modules_ecore_imf_ibus_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 57modules_ecore_imf_ibus_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
105modules_ecore_imf_ibus_module_la_LIBTOOLFLAGS = --tag=disable-static 58modules_ecore_imf_ibus_module_la_LIBTOOLFLAGS = --tag=disable-static
106endif 59endif
@@ -115,28 +68,12 @@ modules/ecore_imf/scim/scim_module.cpp \
115modules/ecore_imf/scim/scim_imcontext.cpp \ 68modules/ecore_imf/scim/scim_imcontext.cpp \
116modules/ecore_imf/scim/scim_imcontext.h 69modules/ecore_imf/scim/scim_imcontext.h
117modules_ecore_imf_scim_module_la_CPPFLAGS = \ 70modules_ecore_imf_scim_module_la_CPPFLAGS = \
118-I$(top_srcdir)/src/lib/eina \
119-I$(top_builddir)/src/lib/eina \
120-I$(top_srcdir)/src/lib/eo \
121-I$(top_srcdir)/src/lib/ecore \
122-I$(top_srcdir)/src/lib/ecore_input \
123-I$(top_srcdir)/src/lib/ecore_x \
124-I$(top_builddir)/src/lib/ecore_x \
125-I$(top_srcdir)/src/lib/ecore_imf \
126-I$(top_srcdir)/src/lib/ecore_evas \
127-I$(top_srcdir)/src/lib/evas \
128@ECORE_IMF_CFLAGS@ \ 71@ECORE_IMF_CFLAGS@ \
129@EFL_COV_CFLAGS@ \
130@SCIM_CFLAGS@ 72@SCIM_CFLAGS@
131modules_ecore_imf_scim_module_la_LIBADD = \ 73modules_ecore_imf_scim_module_la_LIBADD = \
132lib/ecore_evas/libecore_evas.la \ 74@USE_ECORE_IMF_LIBS@ \
133lib/ecore_imf/libecore_imf.la \ 75@SCIM_LIBS@
134lib/ecore_x/libecore_x.la \ 76modules_ecore_imf_scim_module_la_DEPENDENCIES = @USE_ECORE_IMF_INTERNAL_LIBS@
135lib/ecore/libecore.la \
136lib/eo/libeo.la \
137lib/eina/libeina.la \
138@SCIM_LIBS@ \
139@EFL_COV_LIBS@
140modules_ecore_imf_scim_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 77modules_ecore_imf_scim_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
141modules_ecore_imf_scim_module_la_LIBTOOLFLAGS = --tag=disable-static 78modules_ecore_imf_scim_module_la_LIBTOOLFLAGS = --tag=disable-static
142endif 79endif
@@ -149,25 +86,16 @@ ecoreimfximpkg_LTLIBRARIES = modules/ecore_imf/xim/module.la
149modules_ecore_imf_xim_module_la_SOURCES = \ 86modules_ecore_imf_xim_module_la_SOURCES = \
150modules/ecore_imf/xim/ecore_imf_xim.c 87modules/ecore_imf/xim/ecore_imf_xim.c
151modules_ecore_imf_xim_module_la_CPPFLAGS = \ 88modules_ecore_imf_xim_module_la_CPPFLAGS = \
152-I$(top_srcdir)/src/lib/eina \
153-I$(top_builddir)/src/lib/eina \
154-I$(top_srcdir)/src/lib/eo \
155-I$(top_srcdir)/src/lib/ecore \
156-I$(top_srcdir)/src/lib/ecore_input \
157-I$(top_srcdir)/src/lib/ecore_x \
158-I$(top_builddir)/src/lib/ecore_x \
159-I$(top_srcdir)/src/lib/ecore_imf \
160@ECORE_IMF_CFLAGS@ \ 89@ECORE_IMF_CFLAGS@ \
161@ecore_imf_xim_cflags@ \ 90@ECORE_X_CFLAGS@ \
162@EFL_COV_CFLAGS@ 91@ecore_imf_xim_cflags@
163modules_ecore_imf_xim_module_la_LIBADD = \ 92modules_ecore_imf_xim_module_la_LIBADD = \
164lib/ecore_imf/libecore_imf.la \ 93@USE_ECORE_IMF_LIBS@ \
165lib/ecore_x/libecore_x.la \ 94@USE_ECORE_X_LIBS@ \
166lib/ecore/libecore.la \ 95@ecore_imf_xim_libs@
167lib/eo/libeo.la \ 96modules_ecore_imf_xim_module_la_DEPENDENCIES = \
168lib/eina/libeina.la \ 97@USE_ECORE_IMF_INTERNAL_LIBS@ \
169@ecore_imf_xim_libs@ \ 98@USE_ECORE_X_INTERNAL_LIBS@
170@EFL_COV_LIBS@
171modules_ecore_imf_xim_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 99modules_ecore_imf_xim_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
172modules_ecore_imf_xim_module_la_LIBTOOLFLAGS = --tag=disable-static 100modules_ecore_imf_xim_module_la_LIBTOOLFLAGS = --tag=disable-static
173endif 101endif
diff --git a/src/Makefile_Ecore_Input.am b/src/Makefile_Ecore_Input.am
index 765616aa09..d07a895d5a 100644
--- a/src/Makefile_Ecore_Input.am
+++ b/src/Makefile_Ecore_Input.am
@@ -15,23 +15,9 @@ lib/ecore_input/ecore_input_compose.c \
15lib/ecore_input/ecore_input_compose.h \ 15lib/ecore_input/ecore_input_compose.h \
16lib/ecore_input/ecore_input_private.h 16lib/ecore_input/ecore_input_private.h
17 17
18lib_ecore_input_libecore_input_la_CPPFLAGS = \ 18lib_ecore_input_libecore_input_la_CPPFLAGS = @ECORE_INPUT_CFLAGS@
19-I$(top_srcdir)/src/lib/eina \ 19lib_ecore_input_libecore_input_la_LIBADD = @ECORE_INPUT_LIBS@
20-I$(top_builddir)/src/lib/eina \ 20lib_ecore_input_libecore_input_la_DEPENDENCIES = @ECORE_INPUT_INTERNAL_LIBS@
21-I$(top_srcdir)/src/lib/eo \
22-I$(top_srcdir)/src/lib/ecore \
23-I$(top_srcdir)/src/lib/ecore_input \
24-DEFL_ECORE_INPUT_BUILD \
25@ECORE_INPUT_CFLAGS@ \
26@EFL_COV_CFLAGS@
27
28lib_ecore_input_libecore_input_la_LIBADD = \
29lib/ecore/libecore.la \
30lib/eo/libeo.la \
31lib/eina/libeina.la \
32@EFL_COV_LIBS@
33
34lib_ecore_input_libecore_input_la_LIBADD += @EFL_COV_LIBS@
35lib_ecore_input_libecore_input_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 21lib_ecore_input_libecore_input_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
36 22
37installed_ecoreinputevasmainheadersdir = $(includedir)/ecore-@VMAJ@ 23installed_ecoreinputevasmainheadersdir = $(includedir)/ecore-@VMAJ@
@@ -42,24 +28,7 @@ lib_ecore_input_libecore_input_evas_la_SOURCES = \
42lib/ecore_input/ecore_input_evas.c \ 28lib/ecore_input/ecore_input_evas.c \
43lib/ecore_input/ecore_input_evas_private.h 29lib/ecore_input/ecore_input_evas_private.h
44 30
45lib_ecore_input_libecore_input_evas_la_CPPFLAGS = \ 31lib_ecore_input_libecore_input_evas_la_CPPFLAGS = @ECORE_INPUT_EVAS_CFLAGS@
46-I$(top_srcdir)/src/lib/eina \ 32lib_ecore_input_libecore_input_evas_la_LIBADD = @ECORE_INPUT_EVAS_LIBS@
47-I$(top_builddir)/src/lib/eina \ 33lib_ecore_input_libecore_input_evas_la_DEPENDENCIES = @ECORE_INPUT_EVAS_INTERNAL_LIBS@
48-I$(top_srcdir)/src/lib/eo \
49-I$(top_srcdir)/src/lib/evas \
50-I$(top_srcdir)/src/lib/ecore \
51-I$(top_srcdir)/src/lib/ecore_input \
52-I$(top_srcdir)/src/lib/ecore_input_evas \
53-DEFL_ECORE_INPUT_EVAS_BUILD \
54@ECORE_INPUT_EVAS_CFLAGS@ \
55@EFL_COV_CFLAGS@
56
57lib_ecore_input_libecore_input_evas_la_LIBADD = \
58lib/ecore_input/libecore_input.la \
59lib/ecore/libecore.la \
60lib/evas/libevas.la \
61lib/eo/libeo.la \
62lib/eina/libeina.la \
63@EFL_COV_LIBS@
64
65lib_ecore_input_libecore_input_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 34lib_ecore_input_libecore_input_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Ipc.am b/src/Makefile_Ecore_Ipc.am
index 13a7efb045..ca490759b9 100644
--- a/src/Makefile_Ecore_Ipc.am
+++ b/src/Makefile_Ecore_Ipc.am
@@ -11,23 +11,7 @@ lib_ecore_ipc_libecore_ipc_la_SOURCES = \
11lib/ecore_ipc/ecore_ipc.c \ 11lib/ecore_ipc/ecore_ipc.c \
12lib/ecore_ipc/ecore_ipc_private.h 12lib/ecore_ipc/ecore_ipc_private.h
13 13
14lib_ecore_ipc_libecore_ipc_la_CPPFLAGS = \ 14lib_ecore_ipc_libecore_ipc_la_CPPFLAGS = @ECORE_IPC_CFLAGS@
15-I$(top_srcdir)/src/lib/eina \ 15lib_ecore_ipc_libecore_ipc_la_LIBADD = @ECORE_IPC_LIBS@
16-I$(top_builddir)/src/lib/eina \ 16lib_ecore_ipc_libecore_ipc_la_DEPENDENCIES = @ECORE_IPC_INTERNAL_LIBS@
17-I$(top_srcdir)/src/lib/eo \
18-I$(top_srcdir)/src/lib/ecore \
19-I$(top_srcdir)/src/lib/ecore_con \
20-I$(top_srcdir)/src/lib/ecore_ipc \
21-DEFL_ECORE_IPC_BUILD \
22@EFL_COV_CFLAGS@ \
23@ECORE_IPC_CFLAGS@
24
25lib_ecore_ipc_libecore_ipc_la_LIBADD = \
26lib/ecore_con/libecore_con.la \
27lib/ecore/libecore.la \
28lib/eo/libeo.la \
29lib/eina/libeina.la \
30@EFL_COV_LIBS@ \
31@ECORE_IPC_LIBS@
32
33lib_ecore_ipc_libecore_ipc_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 17lib_ecore_ipc_libecore_ipc_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Psl1ght.am b/src/Makefile_Ecore_Psl1ght.am
index 3364a1e18b..607ce47f0d 100644
--- a/src/Makefile_Ecore_Psl1ght.am
+++ b/src/Makefile_Ecore_Psl1ght.am
@@ -17,23 +17,9 @@ lib/ecore_psl1ght/spursutil.h \
17lib/ecore_psl1ght/Ecore_Psl1ght_Keys.h \ 17lib/ecore_psl1ght/Ecore_Psl1ght_Keys.h \
18lib/ecore_psl1ght/ecore_psl1ght_private.h 18lib/ecore_psl1ght/ecore_psl1ght_private.h
19 19
20lib_ecore_psl1ght_libecore_psl1ght_la_CPPFLAGS = \ 20lib_ecore_psl1ght_libecore_psl1ght_la_CPPFLAGS = @ECORE_PSL1GHT_CFLAGS@
21-I$(top_srcdir)/src/lib/eina \ 21lib_ecore_psl1ght_libecore_psl1ght_la_LIBADD = @ECORE_PSL1GHT_LIBS@
22-I$(top_builddir)/src/lib/eina \ 22lib_ecore_psl1ght_libecore_psl1ght_la_DEPENDENCIES = @ECORE_PSL1GHT_INTERNAL_LIBS@
23-I$(top_srcdir)/src/lib/eo \
24-I$(top_srcdir)/src/lib/ecore \
25-I$(top_srcdir)/src/lib/ecore_input \
26-I$(top_srcdir)/src/lib/ecore_psl1ght \
27-DEFL_ECORE_PSL1GHT_BUILD \
28@ECORE_PSL1GHT_CFLAGS@ \
29@EFL_COV_CFLAGS@
30
31lib_ecore_psl1ght_libecore_psl1ght_la_LIBADD = \
32lib/ecore_input/libecore_input.la \
33lib/ecore/libecore.la \
34lib/eo/libeo.la \
35lib/eina/libeina.la
36
37lib_ecore_psl1ght_libecore_psl1ght_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 23lib_ecore_psl1ght_libecore_psl1ght_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
38endif 24endif
39 25
diff --git a/src/Makefile_Ecore_SDL.am b/src/Makefile_Ecore_SDL.am
index deaacbe077..160dd32810 100644
--- a/src/Makefile_Ecore_SDL.am
+++ b/src/Makefile_Ecore_SDL.am
@@ -13,23 +13,8 @@ lib/ecore_sdl/ecore_sdl.c \
13lib/ecore_sdl/Ecore_Sdl_Keys.h \ 13lib/ecore_sdl/Ecore_Sdl_Keys.h \
14lib/ecore_sdl/ecore_sdl_private.h 14lib/ecore_sdl/ecore_sdl_private.h
15 15
16lib_ecore_sdl_libecore_sdl_la_CPPFLAGS = \ 16lib_ecore_sdl_libecore_sdl_la_CPPFLAGS = @ECORE_SDL_CFLAGS@
17-I$(top_srcdir)/src/lib/eina \ 17lib_ecore_sdl_libecore_sdl_la_LIBADD = @ECORE_SDL_LIBS@
18-I$(top_builddir)/src/lib/eina \ 18lib_ecore_sdl_libecore_sdl_la_DEPENDENCIES = @ECORE_SDL_INTERNAL_LIBS@
19-I$(top_srcdir)/src/lib/eo \
20-I$(top_srcdir)/src/lib/ecore \
21-I$(top_srcdir)/src/lib/ecore_input \
22-I$(top_srcdir)/src/lib/ecore_sdl \
23-DEFL_ECORE_SDL_BUILD \
24@EFL_COV_CFLAGS@ \
25@ECORE_SDL_CFLAGS@
26
27lib_ecore_sdl_libecore_sdl_la_LIBADD = \
28lib/ecore_input/libecore_input.la \
29lib/ecore/libecore.la \
30lib/eo/libeo.la \
31lib/eina/libeina.la \
32@ECORE_SDL_LIBS@
33
34lib_ecore_sdl_libecore_sdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 19lib_ecore_sdl_libecore_sdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
35endif 20endif
diff --git a/src/Makefile_Ecore_Wayland.am b/src/Makefile_Ecore_Wayland.am
index 9afeda230d..88ffccf8e1 100644
--- a/src/Makefile_Ecore_Wayland.am
+++ b/src/Makefile_Ecore_Wayland.am
@@ -16,22 +16,8 @@ lib/ecore_wayland/ecore_wl_output.c \
16lib/ecore_wayland/ecore_wl_window.c \ 16lib/ecore_wayland/ecore_wl_window.c \
17lib/ecore_wayland/ecore_wl_private.h 17lib/ecore_wayland/ecore_wl_private.h
18 18
19lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = \ 19lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = @ECORE_WAYLAND_CFLAGS@
20-I$(top_srcdir)/src/lib/eina \ 20lib_ecore_wayland_libecore_wayland_la_LIBADD = @ECORE_WAYLAND_LIBS@
21-I$(top_builddir)/src/lib/eina \ 21lib_ecore_wayland_libecore_wayland_la_DEPENDENCIES = @ECORE_WAYLAND_INTERNAL_LIBS@
22-I$(top_srcdir)/src/lib/eo \
23-I$(top_srcdir)/src/lib/ecore \
24-I$(top_srcdir)/src/lib/ecore_input \
25-I$(top_srcdir)/src/lib/ecore_wayland \
26@EFL_COV_CFLAGS@ \
27@ECORE_WAYLAND_CFLAGS@
28
29lib_ecore_wayland_libecore_wayland_la_LIBADD = \
30lib/ecore_input/libecore_input.la \
31lib/ecore/libecore.la \
32lib/eo/libeo.la \
33lib/eina/libeina.la \
34@ECORE_WAYLAND_LIBS@
35
36lib_ecore_wayland_libecore_wayland_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 22lib_ecore_wayland_libecore_wayland_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
37endif 23endif
diff --git a/src/Makefile_Ecore_Win32.am b/src/Makefile_Ecore_Win32.am
index c6fbdf6161..081b28b182 100644
--- a/src/Makefile_Ecore_Win32.am
+++ b/src/Makefile_Ecore_Win32.am
@@ -24,25 +24,8 @@ lib/ecore_win32/ecore_win32_dnd_data_object.h \
24lib/ecore_win32/ecore_win32_dnd_drop_source.h \ 24lib/ecore_win32/ecore_win32_dnd_drop_source.h \
25lib/ecore_win32/ecore_win32_dnd_drop_target.h 25lib/ecore_win32/ecore_win32_dnd_drop_target.h
26 26
27lib_ecore_win32_libecore_win32_la_CPPFLAGS = \ 27lib_ecore_win32_libecore_win32_la_CPPFLAGS = @ECORE_WIN32_CFLAGS@
28-I$(top_srcdir)/src/lib/evil \ 28lib_ecore_win32_libecore_win32_la_LIBADD = @ECORE_WIN32_LIBS@
29-I$(top_srcdir)/src/lib/eina \ 29lib_ecore_win32_libecore_win32_la_DEPENDENCIES = @ECORE_WIN32_INTERNAL_LIBS@
30-I$(top_builddir)/src/lib/eina \
31-I$(top_srcdir)/src/lib/eo \
32-I$(top_srcdir)/src/lib/ecore \
33-I$(top_srcdir)/src/lib/ecore_input \
34-I$(top_srcdir)/src/lib/ecore_win32 \
35-DEFL_ECORE_WIN32_BUILD \
36@ECORE_WIN32_CFLAGS@ \
37@EFL_COV_CFLAGS@
38
39lib_ecore_win32_libecore_win32_la_LIBADD = \
40lib/ecore_input/libecore_input.la \
41lib/ecore/libecore.la \
42lib/eo/libeo.la \
43lib/eina/libeina.la \
44lib/evil/libevil.la \
45@ECORE_WIN32_LIBS@
46
47lib_ecore_win32_libecore_win32_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 30lib_ecore_win32_libecore_win32_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
48endif 31endif
diff --git a/src/Makefile_Ecore_WinCE.am b/src/Makefile_Ecore_WinCE.am
index 40adb9c1e1..9dbf447a38 100644
--- a/src/Makefile_Ecore_WinCE.am
+++ b/src/Makefile_Ecore_WinCE.am
@@ -14,25 +14,8 @@ lib/ecore_wince/ecore_wince_event.c \
14lib/ecore_wince/ecore_wince_window.c \ 14lib/ecore_wince/ecore_wince_window.c \
15lib/ecore_wince/ecore_wince_private.h 15lib/ecore_wince/ecore_wince_private.h
16 16
17lib_ecore_wince_libecore_wince_la_CPPFLAGS = \ 17lib_ecore_wince_libecore_wince_la_CPPFLAGS = @ECORE_WINCE_CFLAGS@
18-I$(top_srcdir)/src/lib/evil \ 18lib_ecore_wince_libecore_wince_la_LIBADD = @ECORE_WINCE_LIBS@
19-I$(top_srcdir)/src/lib/eina \ 19lib_ecore_wince_libecore_wince_la_DEPENDENCIES = @ECORE_WINCE_INTERNAL_LIBS@
20-I$(top_builddir)/src/lib/eina \
21-I$(top_srcdir)/src/lib/eo \
22-I$(top_srcdir)/src/lib/ecore \
23-I$(top_srcdir)/src/lib/ecore_input \
24-I$(top_srcdir)/src/lib/ecore_wince \
25-DEFL_ECORE_WINCE_BUILD \
26@ECORE_WINCE_CFLAGS@ \
27@EFL_COV_CFLAGS@
28
29lib_ecore_wince_libecore_wince_la_LIBADD = \
30lib/ecore_input/libecore_input.la \
31lib/ecore/libecore.la \
32lib/eo/libeo.la \
33lib/eina/libeina.la \
34lib/evil/libevil.la \
35@ECORE_WINCE_LIBS@
36
37lib_ecore_wince_libecore_wince_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 20lib_ecore_wince_libecore_wince_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
38endif 21endif
diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am
index eea0a17f3a..017658e05e 100644
--- a/src/Makefile_Ecore_X.am
+++ b/src/Makefile_Ecore_X.am
@@ -96,25 +96,9 @@ lib/ecore_x/xlib/ecore_x_gesture.c \
96lib/ecore_x/xlib/ecore_x_private.h 96lib/ecore_x/xlib/ecore_x_private.h
97endif 97endif
98 98
99lib_ecore_x_libecore_x_la_CPPFLAGS = \ 99lib_ecore_x_libecore_x_la_CPPFLAGS = @ECORE_X_CFLAGS@
100-I$(top_srcdir)/src/lib/eina \ 100lib_ecore_x_libecore_x_la_LIBADD = @ECORE_X_LIBS@
101-I$(top_builddir)/src/lib/eina \ 101lib_ecore_x_libecore_x_la_DEPENDENCIES = @ECORE_X_INTERNAL_LIBS@
102-I$(top_srcdir)/src/lib/eo \
103-I$(top_srcdir)/src/lib/ecore \
104-I$(top_srcdir)/src/lib/ecore_input \
105-I$(top_srcdir)/src/lib/ecore_x \
106-I$(top_builddir)/src/lib/ecore_x \
107-DEFL_ECORE_X_BUILD \
108@EFL_COV_CFLAGS@ \
109@ECORE_X_CFLAGS@
110
111lib_ecore_x_libecore_x_la_LIBADD = \
112lib/ecore_input/libecore_input.la \
113lib/ecore/libecore.la \
114lib/eo/libeo.la \
115lib/eina/libeina.la \
116@ECORE_X_LIBS@
117
118lib_ecore_x_libecore_x_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 102lib_ecore_x_libecore_x_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
119 103
120MAINTAINERCLEANFILES += \ 104MAINTAINERCLEANFILES += \
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index ce31a03d92..d46ae08c00 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -4,62 +4,12 @@
4lib_LTLIBRARIES += lib/edje/libedje.la 4lib_LTLIBRARIES += lib/edje/libedje.la
5 5
6EDJE_COMMON_CPPFLAGS = \ 6EDJE_COMMON_CPPFLAGS = \
7-I$(top_srcdir) \
8-I$(top_srcdir)/src/lib/eina \
9-I$(top_builddir)/src/lib/eina \
10-I$(top_srcdir)/src/lib/eo \
11-I$(top_builddir)/src/lib/eo \
12-I$(top_srcdir)/src/lib/eet \
13-I$(top_builddir)/src/lib/eet \
14-I$(top_srcdir)/src/lib/evas \
15-I$(top_builddir)/src/lib/evas \
16-I$(top_srcdir)/src/lib/ecore \
17-I$(top_builddir)/src/lib/ecore \
18-I$(top_srcdir)/src/lib/ecore_evas \
19-I$(top_builddir)/src/lib/ecore_evas \
20-I$(top_srcdir)/src/lib/ecore_file \
21-I$(top_builddir)/src/lib/ecore_file \
22-I$(top_srcdir)/src/lib/ecore_input \
23-I$(top_builddir)/src/lib/ecore_input \
24-I$(top_srcdir)/src/lib/ecore_imf \
25-I$(top_builddir)/src/lib/ecore_imf \
26-I$(top_srcdir)/src/lib/embryo \
27-I$(top_builddir)/src/lib/embryo \
28-I$(top_srcdir)/src/lib/eio \
29-I$(top_builddir)/src/lib/eio \
30-I$(top_srcdir)/src/lib/ephysics \
31-I$(top_builddir)/src/lib/ephysics \
32-I$(top_srcdir)/src/lib/edje \
33-I$(top_builddir)/src/lib/edje \
34-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 7-DPACKAGE_BIN_DIR=\"$(bindir)\" \
35-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 8-DPACKAGE_LIB_DIR=\"$(libdir)\" \
36-DPACKAGE_DATA_DIR=\"$(datadir)/edje\" \ 9-DPACKAGE_DATA_DIR=\"$(datadir)/edje\" \
37-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \ 10-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
38-DPACKAGE_SRC_DIR=\"`pwd`/$(top_srcdir)\" \ 11-DPACKAGE_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
39-DEFL_EDJE_BUILD \ 12@EDJE_CFLAGS@
40@EFL_COV_CFLAGS@ \
41@EDJE_CFLAGS@ \
42@USE_EVIL_CFLAGS@
43
44EDJE_COMMON_LIBS = \
45lib/eina/libeina.la \
46lib/eo/libeo.la \
47lib/eet/libeet.la \
48lib/evas/libevas.la \
49lib/ecore/libecore.la \
50lib/ecore_evas/libecore_evas.la \
51lib/ecore_file/libecore_file.la \
52lib/ecore_input/libecore_input.la \
53lib/ecore_imf/libecore_imf.la \
54lib/ecore_imf/libecore_imf_evas.la \
55lib/embryo/libembryo.la \
56lib/eio/libeio.la \
57@USE_EVIL_LIBS@ \
58@EFL_COV_LIBS@
59
60if HAVE_EPHYSICS
61EDJE_COMMON_LIBS += lib/ephysics/libephysics.la
62endif
63 13
64installed_edjemainheadersdir = $(includedir)/edje-@VMAJ@ 14installed_edjemainheadersdir = $(includedir)/edje-@VMAJ@
65dist_installed_edjemainheaders_DATA = \ 15dist_installed_edjemainheaders_DATA = \
@@ -99,7 +49,8 @@ lib/edje/edje_util.c \
99lib/edje/edje_var.c 49lib/edje/edje_var.c
100 50
101lib_edje_libedje_la_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 51lib_edje_libedje_la_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
102lib_edje_libedje_la_LIBADD = $(EDJE_COMMON_LIBS) @EDJE_LIBS@ 52lib_edje_libedje_la_LIBADD = @EDJE_LIBS@
53lib_edje_libedje_la_DEPENDENCIES = @EDJE_INTERNAL_LIBS@
103lib_edje_libedje_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 54lib_edje_libedje_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
104 55
105if ENABLE_MULTISENSE 56if ENABLE_MULTISENSE
@@ -130,11 +81,6 @@ endif
130 81
131### Binary 82### Binary
132 83
133EDJE_COMMON_USER_LDADD = \
134$(EDJE_COMMON_LIBS) \
135lib/edje/libedje.la \
136@EDJE_LDFLAGS@
137
138bin_PROGRAMS += \ 84bin_PROGRAMS += \
139bin/edje/edje_cc \ 85bin/edje/edje_cc \
140bin/edje/edje_decc \ 86bin/edje/edje_decc \
@@ -156,7 +102,8 @@ bin/edje/edje_cc_handlers.c \
156bin/edje/edje_cc_sources.c \ 102bin/edje/edje_cc_sources.c \
157bin/edje/edje_multisense_convert.c 103bin/edje/edje_multisense_convert.c
158bin_edje_edje_cc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 104bin_edje_edje_cc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
159bin_edje_edje_cc_LDADD = $(EDJE_COMMON_USER_LDADD) 105bin_edje_edje_cc_LDADD = @USE_EDJE_LIBS@
106bin_edje_edje_cc_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
160 107
161bin_edje_edje_decc_SOURCES = \ 108bin_edje_edje_decc_SOURCES = \
162bin/edje/edje_decc.c \ 109bin/edje/edje_decc.c \
@@ -164,31 +111,38 @@ bin/edje/edje_decc.h \
164bin/edje/edje_cc_mem.c \ 111bin/edje/edje_cc_mem.c \
165bin/edje/edje_cc_sources.c 112bin/edje/edje_cc_sources.c
166bin_edje_edje_decc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 113bin_edje_edje_decc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
167bin_edje_edje_decc_LDADD = $(EDJE_COMMON_USER_LDADD) 114bin_edje_edje_decc_LDADD = @USE_EDJE_LIBS@
115bin_edje_edje_decc_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
168 116
169bin_edje_edje_player_SOURCES = bin/edje/edje_player.c 117bin_edje_edje_player_SOURCES = bin/edje/edje_player.c
170bin_edje_edje_player_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 118bin_edje_edje_player_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
171bin_edje_edje_player_LDADD = $(EDJE_COMMON_USER_LDADD) 119bin_edje_edje_player_LDADD = @USE_EDJE_LIBS@
120bin_edje_edje_player_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
172 121
173bin_edje_edje_inspector_SOURCES = bin/edje/edje_inspector.c 122bin_edje_edje_inspector_SOURCES = bin/edje/edje_inspector.c
174bin_edje_edje_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 123bin_edje_edje_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
175bin_edje_edje_inspector_LDADD = $(EDJE_COMMON_USER_LDADD) 124bin_edje_edje_inspector_LDADD = @USE_EDJE_LIBS@
125bin_edje_edje_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
176 126
177bin_edje_edje_external_inspector_SOURCES = bin/edje/edje_external_inspector.c 127bin_edje_edje_external_inspector_SOURCES = bin/edje/edje_external_inspector.c
178bin_edje_edje_external_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 128bin_edje_edje_external_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
179bin_edje_edje_external_inspector_LDADD = $(EDJE_COMMON_USER_LDADD) 129bin_edje_edje_external_inspector_LDADD = @USE_EDJE_LIBS@
130bin_edje_edje_external_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
180 131
181bin_edje_edje_codegen_SOURCES = bin/edje/edje_codegen.c 132bin_edje_edje_codegen_SOURCES = bin/edje/edje_codegen.c
182bin_edje_edje_codegen_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 133bin_edje_edje_codegen_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
183bin_edje_edje_codegen_LDADD = $(EDJE_COMMON_USER_LDADD) 134bin_edje_edje_codegen_LDADD = @USE_EDJE_LIBS@
135bin_edje_edje_codegen_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
184 136
185bin_edje_edje_pick_SOURCES = bin/edje/edje_pick.c 137bin_edje_edje_pick_SOURCES = bin/edje/edje_pick.c
186bin_edje_edje_pick_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 138bin_edje_edje_pick_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
187bin_edje_edje_pick_LDADD = $(EDJE_COMMON_USER_LDADD) 139bin_edje_edje_pick_LDADD = @USE_EDJE_LIBS@
140bin_edje_edje_pick_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
188 141
189bin_edje_edje_watch_SOURCES = bin/edje/edje_watch.c 142bin_edje_edje_watch_SOURCES = bin/edje/edje_watch.c
190bin_edje_edje_watch_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 143bin_edje_edje_watch_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
191bin_edje_edje_watch_LDADD = $(EDJE_COMMON_USER_LDADD) 144bin_edje_edje_watch_LDADD = @USE_EDJE_LIBS@
145bin_edje_edje_watch_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
192 146
193# EPP (Edje's CPP) 147# EPP (Edje's CPP)
194eppdir = $(libdir)/edje/utils/$(MODULE_ARCH) 148eppdir = $(libdir)/edje/utils/$(MODULE_ARCH)
@@ -252,11 +206,8 @@ tests/edje/edje_suite.h
252tests_edje_edje_suite_CPPFLAGS = \ 206tests_edje_edje_suite_CPPFLAGS = \
253$(EDJE_COMMON_CPPFLAGS) \ 207$(EDJE_COMMON_CPPFLAGS) \
254@CHECK_CFLAGS@ 208@CHECK_CFLAGS@
255 209tests_edje_edje_suite_LDADD = @CHECK_LIBS@ @USE_EDJE_LIBS@
256tests_edje_edje_suite_LDADD = \ 210tests_edje_edje_suite_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
257$(EDJE_COMMON_USER_LDADD) \
258@CHECK_LIBS@
259
260endif 211endif
261 212
262# Useful to other modules that generate EDJ 213# Useful to other modules that generate EDJ
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index 0b238debd0..63142dc366 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -23,24 +23,13 @@ static_libs/lz4/lz4hc.c \
23static_libs/lz4/lz4hc.h 23static_libs/lz4/lz4hc.h
24 24
25lib_eet_libeet_la_CPPFLAGS = \ 25lib_eet_libeet_la_CPPFLAGS = \
26-I$(top_srcdir)/src/lib/eina \
27-I$(top_builddir)/src/lib/eina \
28-I$(top_srcdir)/src/lib/eet \
29-I$(top_srcdir)/src/static_libs/lz4 \ 26-I$(top_srcdir)/src/static_libs/lz4 \
30-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 27-DPACKAGE_BIN_DIR=\"$(bindir)\" \
31-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 28-DPACKAGE_LIB_DIR=\"$(libdir)\" \
32-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \ 29-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
33-DEFL_EET_BUILD \ 30@EET_CFLAGS@
34@EFL_COV_CFLAGS@ \ 31lib_eet_libeet_la_LIBADD = @EET_LIBS@
35@EET_CFLAGS@ \ 32lib_eet_libeet_la_DEPENDENCIES = @EET_INTERNAL_LIBS@
36@USE_EVIL_CFLAGS@
37
38lib_eet_libeet_la_LIBADD = \
39lib/eina/libeina.la \
40@USE_EVIL_LIBS@ \
41@EET_LIBS@ \
42@EFL_COV_LIBS@
43
44lib_eet_libeet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 33lib_eet_libeet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
45 34
46EXTRA_DIST += static_libs/lz4/README 35EXTRA_DIST += static_libs/lz4/README
@@ -52,22 +41,13 @@ bin_PROGRAMS += bin/eet/eet
52bin_eet_eet_SOURCES = bin/eet/eet_main.c 41bin_eet_eet_SOURCES = bin/eet/eet_main.c
53 42
54bin_eet_eet_CPPFLAGS = \ 43bin_eet_eet_CPPFLAGS = \
55-I$(top_srcdir)/src/lib/eina \
56-I$(top_builddir)/src/lib/eina \
57-I$(top_srcdir)/src/lib/eet \
58-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 44-DPACKAGE_BIN_DIR=\"$(bindir)\" \
59-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 45-DPACKAGE_LIB_DIR=\"$(libdir)\" \
60-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \ 46-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
61@EFL_COV_CFLAGS@ \ 47@EET_CFLAGS@
62@EET_CFLAGS@ \
63@USE_EVIL_CFLAGS@
64 48
65bin_eet_eet_LDADD = \ 49bin_eet_eet_LDADD = @USE_EET_LIBS@
66lib/eet/libeet.la \ 50bin_eet_eet_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
67lib/eina/libeina.la \
68@USE_EVIL_LIBS@ \
69@EET_LDFLAGS@ \
70@EFL_COV_LIBS@
71 51
72### Unit tests 52### Unit tests
73 53
@@ -81,20 +61,12 @@ tests/eet/eet_data_suite.c \
81tests/eet/eet_suite.h 61tests/eet/eet_suite.h
82 62
83tests_eet_eet_suite_CPPFLAGS = \ 63tests_eet_eet_suite_CPPFLAGS = \
84-I$(top_srcdir)/src/lib/eina \
85-I$(top_builddir)/src/lib/eina \
86-I$(top_srcdir)/src/lib/eet \
87-DTESTS_WD=\"`pwd`\" \ 64-DTESTS_WD=\"`pwd`\" \
88-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet\" \ 65-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet\" \
89@CHECK_CFLAGS@ \ 66@CHECK_CFLAGS@ \
90@EET_CFLAGS@ 67@EET_CFLAGS@
91 68tests_eet_eet_suite_LDADD = @CHECK_LIBS@ @USE_EET_LIBS@
92tests_eet_eet_suite_LDADD = \ 69tests_eet_eet_suite_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
93lib/eet/libeet.la \
94lib/eina/libeina.la \
95@CHECK_LIBS@ \
96@EET_LDFLAGS@
97
98endif 70endif
99 71
100EXTRA_DIST += \ 72EXTRA_DIST += \
diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am
index 3429b0282c..3c13c7abf4 100644
--- a/src/Makefile_Eeze.am
+++ b/src/Makefile_Eeze.am
@@ -5,30 +5,6 @@ if HAVE_EEZE
5lib_LTLIBRARIES += \ 5lib_LTLIBRARIES += \
6lib/eeze/libeeze.la 6lib/eeze/libeeze.la
7 7
8EEZE_COMMON_CPPFLAGS = \
9-I$(top_srcdir)/src/lib/eina \
10-I$(top_builddir)/src/lib/eina \
11-I$(top_srcdir)/src/lib/eo \
12-I$(top_builddir)/src/lib/eo \
13-I$(top_srcdir)/src/lib/ecore \
14-I$(top_builddir)/src/lib/ecore \
15-I$(top_srcdir)/src/lib/ecore_file \
16-I$(top_builddir)/src/lib/ecore_file \
17-I$(top_srcdir)/src/lib/ecore_con \
18-I$(top_builddir)/src/lib/ecore_con \
19-I$(top_srcdir)/src/lib/eet \
20-I$(top_builddir)/src/lib/eet \
21-I$(top_srcdir)/src/lib/eeze \
22-I$(top_builddir)/src/lib/eeze \
23@EFL_COV_CFLAGS@ \
24@EEZE_CFLAGS@
25
26EEZE_COMMON_LDADD = \
27lib/eina/libeina.la \
28lib/eo/libeo.la \
29lib/ecore/libecore.la \
30@EFL_COV_LIBS@
31
32installed_eezemainheadersdir = $(includedir)/eeze-@VMAJ@ 8installed_eezemainheadersdir = $(includedir)/eeze-@VMAJ@
33dist_installed_eezemainheaders_DATA = \ 9dist_installed_eezemainheaders_DATA = \
34lib/eeze/Eeze.h \ 10lib/eeze/Eeze.h \
@@ -57,27 +33,16 @@ lib/eeze/eeze_disk_udev.c \
57lib/eeze/eeze_disk_mount.c \ 33lib/eeze/eeze_disk_mount.c \
58lib/eeze/eeze_disk_private.h \ 34lib/eeze/eeze_disk_private.h \
59lib/eeze/eeze_disk_libmount_new.c 35lib/eeze/eeze_disk_libmount_new.c
60
61EEZE_COMMON_LDADD += \
62lib/ecore_file/libecore_file.la \
63lib/ecore_con/libecore_con.la \
64lib/eet/libeet.la
65endif 36endif
66 37
67EEZE_COMMON_LIBADD = $(EEZE_COMMON_LDADD) @EEZE_LIBS@
68EEZE_COMMON_LDADD += @EEZE_LDFLAGS@
69EEZE_COMMON_USER_LIBADD = $(EEZE_COMMON_LIBADD) lib/eeze/libeeze.la
70EEZE_COMMON_USER_LDADD = $(EEZE_COMMON_LDADD) lib/eeze/libeeze.la
71
72lib_eeze_libeeze_la_CPPFLAGS = \ 38lib_eeze_libeeze_la_CPPFLAGS = \
73$(EEZE_COMMON_CPPFLAGS) \
74-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 39-DPACKAGE_BIN_DIR=\"$(bindir)\" \
75-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 40-DPACKAGE_LIB_DIR=\"$(libdir)\" \
76-DPACKAGE_DATA_DIR=\"$(datadir)/eeze\" \ 41-DPACKAGE_DATA_DIR=\"$(datadir)/eeze\" \
77-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \ 42-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
78-DEFL_EEZE_BUILD 43@EEZE_CFLAGS@
79 44lib_eeze_libeeze_la_LIBADD = @EEZE_LIBS@
80lib_eeze_libeeze_la_LIBADD = $(EEZE_COMMON_LIBADD) 45lib_eeze_libeeze_la_DEPENDENCIES = @EEZE_INTERNAL_LIBS@
81lib_eeze_libeeze_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 46lib_eeze_libeeze_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
82 47
83if HAVE_EEZE_TIZEN 48if HAVE_EEZE_TIZEN
@@ -86,20 +51,21 @@ eezemodulesensortizen_LTLIBRARIES = modules/eeze/sensor/tizen/module.la
86modules_eeze_sensor_tizen_module_la_SOURCES = \ 51modules_eeze_sensor_tizen_module_la_SOURCES = \
87modules/eeze/sensor/tizen/tizen.c 52modules/eeze/sensor/tizen/tizen.c
88modules_eeze_sensor_tizen_module_la_CPPFLAGS = \ 53modules_eeze_sensor_tizen_module_la_CPPFLAGS = \
89$(EEZE_COMMON_CPPFLAGS) \ 54@EEZE_CFLAGS@ \
90@TIZEN_SENSOR_CFLAGS@ 55@TIZEN_SENSOR_CFLAGS@
91modules_eeze_sensor_tizen_module_la_LIBADD = \ 56modules_eeze_sensor_tizen_module_la_LIBADD = \
92$(EEZE_COMMON_USER_LIBADD) \ 57@USE_EEZE_LIBS@ \
93@TIZEN_SENSOR_LIBS@ 58@TIZEN_SENSOR_LIBS@
59modules_eeze_sensor_tizen_module_la_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
94modules_eeze_sensor_tizen_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 60modules_eeze_sensor_tizen_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
95modules_eeze_sensor_tizen_module_la_LIBTOOLFLAGS = --tag=disable-static 61modules_eeze_sensor_tizen_module_la_LIBTOOLFLAGS = --tag=disable-static
96else 62else
97eezemodulesensorfakedir = $(libdir)/eeze/modules/sensor/fake/$(MODULE_ARCH) 63eezemodulesensorfakedir = $(libdir)/eeze/modules/sensor/fake/$(MODULE_ARCH)
98eezemodulesensorfake_LTLIBRARIES = modules/eeze/sensor/fake/module.la 64eezemodulesensorfake_LTLIBRARIES = modules/eeze/sensor/fake/module.la
99modules_eeze_sensor_fake_module_la_SOURCES = \ 65modules_eeze_sensor_fake_module_la_SOURCES = modules/eeze/sensor/fake/fake.c
100modules/eeze/sensor/fake/fake.c 66modules_eeze_sensor_fake_module_la_CPPFLAGS = @EEZE_CFLAGS@
101modules_eeze_sensor_fake_module_la_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS) 67modules_eeze_sensor_fake_module_la_LIBADD = @USE_EEZE_LIBS@
102modules_eeze_sensor_fake_module_la_LIBADD = $(EEZE_COMMON_USER_LIBADD) 68modules_eeze_sensor_fake_module_la_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
103modules_eeze_sensor_fake_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 69modules_eeze_sensor_fake_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
104modules_eeze_sensor_fake_module_la_LIBTOOLFLAGS = --tag=disable-static 70modules_eeze_sensor_fake_module_la_LIBTOOLFLAGS = --tag=disable-static
105endif 71endif
@@ -111,12 +77,14 @@ bin/eeze/eeze_udev_test \
111bin/eeze/eeze_sensor_test 77bin/eeze/eeze_sensor_test
112 78
113bin_eeze_eeze_udev_test_SOURCES = bin/eeze/eeze_udev_test.c 79bin_eeze_eeze_udev_test_SOURCES = bin/eeze/eeze_udev_test.c
114bin_eeze_eeze_udev_test_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS) 80bin_eeze_eeze_udev_test_CPPFLAGS = @EEZE_CFLAGS@
115bin_eeze_eeze_udev_test_LDADD = $(EEZE_COMMON_USER_LDADD) 81bin_eeze_eeze_udev_test_LDADD = @USE_EEZE_LIBS@
82bin_eeze_eeze_udev_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
116 83
117bin_eeze_eeze_sensor_test_SOURCES = bin/eeze/eeze_sensor_test.c 84bin_eeze_eeze_sensor_test_SOURCES = bin/eeze/eeze_sensor_test.c
118bin_eeze_eeze_sensor_test_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS) 85bin_eeze_eeze_sensor_test_CPPFLAGS = @EEZE_CFLAGS@
119bin_eeze_eeze_sensor_test_LDADD = $(EEZE_COMMON_USER_LDADD) 86bin_eeze_eeze_sensor_test_LDADD = @USE_EEZE_LIBS@
87bin_eeze_eeze_sensor_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
120 88
121if HAVE_EEZE_MOUNT 89if HAVE_EEZE_MOUNT
122bin_PROGRAMS += \ 90bin_PROGRAMS += \
@@ -126,22 +94,26 @@ bin/eeze/eeze_disk_ls \
126bin/eeze/eeze_scanner 94bin/eeze/eeze_scanner
127 95
128bin_eeze_eeze_mount_SOURCES = bin/eeze/eeze_mount.c 96bin_eeze_eeze_mount_SOURCES = bin/eeze/eeze_mount.c
129bin_eeze_eeze_mount_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS) 97bin_eeze_eeze_mount_CPPFLAGS = @EEZE_CFLAGS@
130bin_eeze_eeze_mount_LDADD = $(EEZE_COMMON_USER_LDADD) 98bin_eeze_eeze_mount_LDADD = @USE_EEZE_LIBS@
99bin_eeze_eeze_mount_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
131 100
132bin_eeze_eeze_umount_SOURCES = bin/eeze/eeze_umount.c 101bin_eeze_eeze_umount_SOURCES = bin/eeze/eeze_umount.c
133bin_eeze_eeze_umount_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS) 102bin_eeze_eeze_umount_CPPFLAGS = @EEZE_CFLAGS@
134bin_eeze_eeze_umount_LDADD = $(EEZE_COMMON_USER_LDADD) 103bin_eeze_eeze_umount_LDADD = @USE_EEZE_LIBS@
104bin_eeze_eeze_umount_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
135 105
136bin_eeze_eeze_disk_ls_SOURCES = bin/eeze/eeze_disk_ls.c 106bin_eeze_eeze_disk_ls_SOURCES = bin/eeze/eeze_disk_ls.c
137bin_eeze_eeze_disk_ls_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS) 107bin_eeze_eeze_disk_ls_CPPFLAGS = @EEZE_CFLAGS@
138bin_eeze_eeze_disk_ls_LDADD = $(EEZE_COMMON_USER_LDADD) 108bin_eeze_eeze_disk_ls_LDADD = @USE_EEZE_LIBS@
109bin_eeze_eeze_disk_ls_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
139 110
140bin_eeze_eeze_scanner_SOURCES = \ 111bin_eeze_eeze_scanner_SOURCES = \
141bin/eeze/eeze_scanner.c \ 112bin/eeze/eeze_scanner.c \
142bin/eeze/eeze_scanner.h 113bin/eeze/eeze_scanner.h
143bin_eeze_eeze_scanner_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS) 114bin_eeze_eeze_scanner_CPPFLAGS = @EEZE_CFLAGS@
144bin_eeze_eeze_scanner_LDADD = $(EEZE_COMMON_USER_LDADD) 115bin_eeze_eeze_scanner_LDADD = @USE_EEZE_LIBS@
116bin_eeze_eeze_scanner_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
145endif 117endif
146 118
147setuid_root_mode = a=rx,u+xs 119setuid_root_mode = a=rx,u+xs
@@ -158,9 +130,9 @@ check_PROGRAMS += tests/eeze/eeze_suite
158tests_eeze_eeze_suite_SOURCES = tests/eeze/eeze_suite.c 130tests_eeze_eeze_suite_SOURCES = tests/eeze/eeze_suite.c
159tests_eeze_eeze_suite_CPPFLAGS = \ 131tests_eeze_eeze_suite_CPPFLAGS = \
160-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eeze\" \ 132-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eeze\" \
161$(EEZE_COMMON_CPPFLAGS) \ 133@EEZE_CFLAGS@ \
162@CHECK_CFLAGS@ 134@CHECK_CFLAGS@
163tests_eeze_eeze_suite_LDADD = $(EEZE_COMMON_USER_LDADD) @CHECK_LIBS@ 135tests_eeze_eeze_suite_LDADD = @CHECK_LIBS@ @USE_EEZE_LIBS@
164 136tests_eeze_eeze_suite_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
165endif 137endif
166endif 138endif
diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am
index 3ca667bdf9..bcddfd4293 100644
--- a/src/Makefile_Efreet.am
+++ b/src/Makefile_Efreet.am
@@ -7,55 +7,13 @@ lib/efreet/libefreet_mime.la \
7lib/efreet/libefreet_trash.la 7lib/efreet/libefreet_trash.la
8 8
9EFREET_COMMON_CPPFLAGS = \ 9EFREET_COMMON_CPPFLAGS = \
10-I$(top_srcdir)/src/lib/eina \
11-I$(top_builddir)/src/lib/eina \
12-I$(top_srcdir)/src/lib/eo \
13-I$(top_builddir)/src/lib/eo \
14-I$(top_srcdir)/src/lib/ecore \
15-I$(top_builddir)/src/lib/ecore \
16-I$(top_srcdir)/src/lib/ecore_file \
17-I$(top_builddir)/src/lib/ecore_file \
18-I$(top_srcdir)/src/lib/eet \
19-I$(top_builddir)/src/lib/eet \
20-I$(top_srcdir)/src/lib/edbus \
21-I$(top_builddir)/src/lib/edbus \
22-I$(top_srcdir)/src/lib/efreet \
23-I$(top_builddir)/src/lib/efreet \
24-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 10-DPACKAGE_BIN_DIR=\"$(bindir)\" \
25-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
26-DPACKAGE_DATA_DIR=\"$(datadir)/efreet\" \ 12-DPACKAGE_DATA_DIR=\"$(datadir)/efreet\" \
27-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \ 13-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
28-DDATA_DIR=\"$(datadir)\" \ 14-DDATA_DIR=\"$(datadir)\" \
29-DLOCALE_DIR=\"@LOCALE_DIR@\" \ 15-DLOCALE_DIR=\"@LOCALE_DIR@\" \
30-DEFL_EFREET_BUILD \ 16@EFREET_CFLAGS@
31@EFL_COV_CFLAGS@ \
32@EFREET_CFLAGS@ \
33@USE_EVIL_CFLAGS@
34
35EFREET_COMMON_LIBADD = \
36lib/eina/libeina.la \
37lib/eo/libeo.la \
38lib/ecore/libecore.la \
39lib/ecore_file/libecore_file.la \
40lib/eet/libeet.la \
41lib/edbus/libedbus2.la \
42@USE_EVIL_LIBS@ \
43@EFREET_LIBS@ \
44@EFL_COV_LIBS@
45
46EFREET_COMMON_USER_LIBADD = $(EFREET_COMMON_LIBADD) lib/efreet/libefreet.la
47
48EFREET_COMMON_USER_LDADD = \
49lib/efreet/libefreet.la \
50lib/eina/libeina.la \
51lib/eo/libeo.la \
52lib/ecore/libecore.la \
53lib/ecore_file/libecore_file.la \
54lib/eet/libeet.la \
55lib/edbus/libedbus2.la \
56@USE_EVIL_LIBS@ \
57@EFREET_LDFLAGS@ \
58@EFL_COV_LIBS@
59 17
60installed_efreetmainheadersdir = $(includedir)/efreet-@VMAJ@ 18installed_efreetmainheadersdir = $(includedir)/efreet-@VMAJ@
61dist_installed_efreetmainheaders_DATA = \ 19dist_installed_efreetmainheaders_DATA = \
@@ -88,19 +46,22 @@ lib/efreet/efreet_xml.h \
88lib/efreet/efreet_cache_private.h 46lib/efreet/efreet_cache_private.h
89 47
90lib_efreet_libefreet_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 48lib_efreet_libefreet_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
91lib_efreet_libefreet_la_LIBADD = $(EFREET_COMMON_LIBADD) 49lib_efreet_libefreet_la_LIBADD = @EFREET_LIBS@
50lib_efreet_libefreet_la_DEPENDENCIES = @EFREET_INTERNAL_LIBS@
92lib_efreet_libefreet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 51lib_efreet_libefreet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
93 52
94# libefreet_mime.la 53# libefreet_mime.la
95lib_efreet_libefreet_mime_la_SOURCES = lib/efreet/efreet_mime.c 54lib_efreet_libefreet_mime_la_SOURCES = lib/efreet/efreet_mime.c
96lib_efreet_libefreet_mime_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 55lib_efreet_libefreet_mime_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
97lib_efreet_libefreet_mime_la_LIBADD = $(EFREET_COMMON_USER_LIBADD) 56lib_efreet_libefreet_mime_la_LIBADD = @USE_EFREET_LIBS@
57lib_efreet_libefreet_mime_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
98lib_efreet_libefreet_mime_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 58lib_efreet_libefreet_mime_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
99 59
100# libefreet_trash.la 60# libefreet_trash.la
101lib_efreet_libefreet_trash_la_SOURCES = lib/efreet/efreet_trash.c 61lib_efreet_libefreet_trash_la_SOURCES = lib/efreet/efreet_trash.c
102lib_efreet_libefreet_trash_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 62lib_efreet_libefreet_trash_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
103lib_efreet_libefreet_trash_la_LIBADD = $(EFREET_COMMON_USER_LIBADD) 63lib_efreet_libefreet_trash_la_LIBADD = @USE_EFREET_LIBS@
64lib_efreet_libefreet_trash_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
104lib_efreet_libefreet_trash_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 65lib_efreet_libefreet_trash_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
105 66
106 67
@@ -117,7 +78,8 @@ bin/efreet/efreetd_cache.h \
117bin/efreet/efreetd_cache.c 78bin/efreet/efreetd_cache.c
118 79
119bin_efreet_efreetd_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 80bin_efreet_efreetd_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
120bin_efreet_efreetd_LDADD = $(EFREET_COMMON_USER_LDADD) 81bin_efreet_efreetd_LDADD = @USE_EFREET_LIBS@
82bin_efreet_efreetd_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
121 83
122efreetinternal_bindir=$(libdir)/efreet/$(MODULE_ARCH) 84efreetinternal_bindir=$(libdir)/efreet/$(MODULE_ARCH)
123efreetinternal_bin_PROGRAMS = \ 85efreetinternal_bin_PROGRAMS = \
@@ -125,14 +87,14 @@ bin/efreet/efreet_desktop_cache_create \
125bin/efreet/efreet_icon_cache_create 87bin/efreet/efreet_icon_cache_create
126 88
127bin_efreet_efreet_desktop_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 89bin_efreet_efreet_desktop_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
128bin_efreet_efreet_desktop_cache_create_LDADD = $(EFREET_COMMON_USER_LDADD) 90bin_efreet_efreet_desktop_cache_create_LDADD = @USE_EFREET_LIBS@
129bin_efreet_efreet_desktop_cache_create_SOURCES = \ 91bin_efreet_efreet_desktop_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
130bin/efreet/efreet_desktop_cache_create.c 92bin_efreet_efreet_desktop_cache_create_SOURCES = bin/efreet/efreet_desktop_cache_create.c
131 93
132bin_efreet_efreet_icon_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 94bin_efreet_efreet_icon_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
133bin_efreet_efreet_icon_cache_create_LDADD = $(EFREET_COMMON_USER_LDADD) 95bin_efreet_efreet_icon_cache_create_LDADD = @USE_EFREET_LIBS@
134bin_efreet_efreet_icon_cache_create_SOURCES = \ 96bin_efreet_efreet_icon_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
135bin/efreet/efreet_icon_cache_create.c 97bin_efreet_efreet_icon_cache_create_SOURCES = bin/efreet/efreet_icon_cache_create.c
136 98
137### Unit tests 99### Unit tests
138 100
@@ -151,7 +113,10 @@ tests/efreet/compare/efreet_menu_alloc
151# efreet_test 113# efreet_test
152tests_efreet_efreet_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 114tests_efreet_efreet_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
153tests_efreet_efreet_test_LDADD = \ 115tests_efreet_efreet_test_LDADD = \
154$(EFREET_COMMON_USER_LDADD) \ 116@USE_EFREET_LIBS@ \
117lib/efreet/libefreet_mime.la
118tests_efreet_efreet_test_DEPENDENCIES = \
119@USE_EFREET_INTERNAL_LIBS@ \
155lib/efreet/libefreet_mime.la 120lib/efreet/libefreet_mime.la
156 121
157tests_efreet_efreet_test_SOURCES = \ 122tests_efreet_efreet_test_SOURCES = \
@@ -168,38 +133,40 @@ tests/efreet/main.c
168 133
169# efreet_spec_test 134# efreet_spec_test
170tests_efreet_efreet_spec_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 135tests_efreet_efreet_spec_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
171tests_efreet_efreet_spec_test_LDADD = $(EFREET_COMMON_USER_LDADD) 136tests_efreet_efreet_spec_test_LDADD = @USE_EFREET_LIBS@
172tests_efreet_efreet_spec_test_SOURCES = \ 137tests_efreet_efreet_spec_test_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
173tests/efreet/efreet_spec_test.c 138tests_efreet_efreet_spec_test_SOURCES = tests/efreet/efreet_spec_test.c
174 139
175# efreet_cache_test 140# efreet_cache_test
176tests_efreet_efreet_cache_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 141tests_efreet_efreet_cache_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
177tests_efreet_efreet_cache_test_LDADD = $(EFREET_COMMON_USER_LDADD) 142tests_efreet_efreet_cache_test_LDADD = @USE_EFREET_LIBS@
178tests_efreet_efreet_cache_test_SOURCES = \ 143tests_efreet_efreet_cache_test_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
179tests/efreet/ef_cache.c 144tests_efreet_efreet_cache_test_SOURCES = tests/efreet/ef_cache.c
180 145
181# efreet_icon_cache_dump 146# efreet_icon_cache_dump
182tests_efreet_efreet_icon_cache_dump_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 147tests_efreet_efreet_icon_cache_dump_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
183tests_efreet_efreet_icon_cache_dump_LDADD = $(EFREET_COMMON_USER_LDADD) 148tests_efreet_efreet_icon_cache_dump_LDADD = @USE_EFREET_LIBS@
184tests_efreet_efreet_icon_cache_dump_SOURCES = \ 149tests_efreet_efreet_icon_cache_dump_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
185tests/efreet/efreet_icon_cache_dump.c 150tests_efreet_efreet_icon_cache_dump_SOURCES = tests/efreet/efreet_icon_cache_dump.c
186 151
187# efreet_user_dir 152# efreet_user_dir
188tests_efreet_efreet_user_dir_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 153tests_efreet_efreet_user_dir_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
189tests_efreet_efreet_user_dir_LDADD = $(EFREET_COMMON_USER_LDADD) 154tests_efreet_efreet_user_dir_LDADD = @USE_EFREET_LIBS@
190tests_efreet_efreet_user_dir_SOURCES = \ 155tests_efreet_efreet_user_dir_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
191tests/efreet/efreet_user_dir.c 156tests_efreet_efreet_user_dir_SOURCES = tests/efreet/efreet_user_dir.c
192 157
193# efreet_alloc 158# efreet_alloc
194tests_efreet_compare_efreet_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 159tests_efreet_compare_efreet_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
195tests_efreet_compare_efreet_alloc_LDADD = $(EFREET_COMMON_USER_LDADD) 160tests_efreet_compare_efreet_alloc_LDADD = @USE_EFREET_LIBS@
161tests_efreet_compare_efreet_alloc_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
196tests_efreet_compare_efreet_alloc_SOURCES = \ 162tests_efreet_compare_efreet_alloc_SOURCES = \
197tests/efreet/compare/efreet_alloc.c \ 163tests/efreet/compare/efreet_alloc.c \
198tests/efreet/compare/comp.h 164tests/efreet/compare/comp.h
199 165
200# efreet_menu_alloc 166# efreet_menu_alloc
201tests_efreet_compare_efreet_menu_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 167tests_efreet_compare_efreet_menu_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
202tests_efreet_compare_efreet_menu_alloc_LDADD = $(EFREET_COMMON_USER_LDADD) 168tests_efreet_compare_efreet_menu_alloc_LDADD = @USE_EFREET_LIBS@
169tests_efreet_compare_efreet_menu_alloc_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
203tests_efreet_compare_efreet_menu_alloc_SOURCES = \ 170tests_efreet_compare_efreet_menu_alloc_SOURCES = \
204tests/efreet/compare/efreet_menu_alloc.c \ 171tests/efreet/compare/efreet_menu_alloc.c \
205tests/efreet/compare/comp.h 172tests/efreet/compare/comp.h
@@ -230,7 +197,8 @@ tests/efreet/efreet_test_efreet.c \
230tests/efreet/efreet_test_efreet_cache.c 197tests/efreet/efreet_test_efreet_cache.c
231 198
232tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@ 199tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@
233tests_efreet_efreet_suite_LDADD = $(EFREET_COMMON_USER_LDADD) @CHECK_LIBS@ 200tests_efreet_efreet_suite_LDADD = @CHECK_LIBS@ @USE_EFREET_LIBS@
201tests_efreet_efreet_suite_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
234 202
235endif 203endif
236 204
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 51c32cb689..80af55f93f 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -154,28 +154,19 @@ else
154lib_eina_libeina_la_SOURCES += lib/eina/eina_file.c 154lib_eina_libeina_la_SOURCES += lib/eina/eina_file.c
155endif 155endif
156 156
157EINA_MODULE_COMMON_CPPFLAGS = \
158-I$(top_srcdir)/src/lib/eina \
159-I$(top_builddir)/src/lib/eina \
160-DEFL_EINA_BUILD
161
162EINA_MODULE_COMMON_CFLAGS = \ 157EINA_MODULE_COMMON_CFLAGS = \
163@EINA_CFLAGS@ \ 158@EINA_CFLAGS@ \
164@VALGRIND_CFLAGS@ 159@VALGRIND_CFLAGS@
165 160
166EINA_MODULE_COMMON_LIBADD = \
167lib/eina/libeina.la \
168@EINA_LIBS@
169
170if EINA_STATIC_BUILD_CHAINED_POOL 161if EINA_STATIC_BUILD_CHAINED_POOL
171lib_eina_libeina_la_SOURCES += modules/eina/mp/chained_pool/eina_chained_mempool.c 162lib_eina_libeina_la_SOURCES += modules/eina/mp/chained_pool/eina_chained_mempool.c
172else 163else
173einampchainedpooldir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH) 164einampchainedpooldir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH)
174einampchainedpool_LTLIBRARIES = modules/eina/mp/chained_pool/chained_pool_module.la 165einampchainedpool_LTLIBRARIES = modules/eina/mp/chained_pool/chained_pool_module.la
175 166
176modules_eina_mp_chained_pool_chained_pool_module_la_CPPFLAGS = $(EINA_MODULE_COMMON_CPPFLAGS)
177modules_eina_mp_chained_pool_chained_pool_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS) 167modules_eina_mp_chained_pool_chained_pool_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS)
178modules_eina_mp_chained_pool_chained_pool_module_la_LIBADD = $(EINA_MODULE_COMMON_LIBADD) 168modules_eina_mp_chained_pool_chained_pool_module_la_LIBADD = @USE_EINA_LIBS@
169modules_eina_mp_chained_pool_chained_pool_module_la_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
179modules_eina_mp_chained_pool_chained_pool_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 170modules_eina_mp_chained_pool_chained_pool_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
180modules_eina_mp_chained_pool_chained_pool_module_la_LIBTOOLFLAGS = --tag=disable-static 171modules_eina_mp_chained_pool_chained_pool_module_la_LIBTOOLFLAGS = --tag=disable-static
181modules_eina_mp_chained_pool_chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c 172modules_eina_mp_chained_pool_chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
@@ -187,9 +178,9 @@ else
187einamponebigdir = $(libdir)/eina/modules/mp/one_big/$(MODULE_ARCH) 178einamponebigdir = $(libdir)/eina/modules/mp/one_big/$(MODULE_ARCH)
188einamponebig_LTLIBRARIES = modules/eina/mp/one_big/one_big_module.la 179einamponebig_LTLIBRARIES = modules/eina/mp/one_big/one_big_module.la
189 180
190modules_eina_mp_one_big_one_big_module_la_CPPFLAGS = $(EINA_MODULE_COMMON_CPPFLAGS)
191modules_eina_mp_one_big_one_big_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS) 181modules_eina_mp_one_big_one_big_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS)
192modules_eina_mp_one_big_one_big_module_la_LIBADD = $(EINA_MODULE_COMMON_LIBADD) 182modules_eina_mp_one_big_one_big_module_la_LIBADD = @USE_EINA_LIBS@
183modules_eina_mp_one_big_one_big_module_la_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
193modules_eina_mp_one_big_one_big_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 184modules_eina_mp_one_big_one_big_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
194modules_eina_mp_one_big_one_big_module_la_LIBTOOLFLAGS = --tag=disable-static 185modules_eina_mp_one_big_one_big_module_la_LIBTOOLFLAGS = --tag=disable-static
195modules_eina_mp_one_big_one_big_module_la_SOURCES = modules/eina/mp/one_big/eina_one_big.c 186modules_eina_mp_one_big_one_big_module_la_SOURCES = modules/eina/mp/one_big/eina_one_big.c
@@ -201,31 +192,23 @@ else
201einamppassthroughdir = $(libdir)/eina/modules/mp/pass_through/$(MODULE_ARCH) 192einamppassthroughdir = $(libdir)/eina/modules/mp/pass_through/$(MODULE_ARCH)
202einamppassthrough_LTLIBRARIES = modules/eina/mp/pass_through/pass_through_module.la 193einamppassthrough_LTLIBRARIES = modules/eina/mp/pass_through/pass_through_module.la
203 194
204modules_eina_mp_pass_through_pass_through_module_la_CPPFLAGS = $(EINA_MODULE_COMMON_CPPFLAGS)
205modules_eina_mp_pass_through_pass_through_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS) 195modules_eina_mp_pass_through_pass_through_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS)
206modules_eina_mp_pass_through_pass_through_module_la_LIBADD = $(EINA_MODULE_COMMON_LIBADD) 196modules_eina_mp_pass_through_pass_through_module_la_LIBADD = @USE_EINA_LIBS@
197modules_eina_mp_pass_through_pass_through_module_la_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
207modules_eina_mp_pass_through_pass_through_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 198modules_eina_mp_pass_through_pass_through_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
208modules_eina_mp_pass_through_pass_through_module_la_LIBTOOLFLAGS = --tag=disable-static 199modules_eina_mp_pass_through_pass_through_module_la_LIBTOOLFLAGS = --tag=disable-static
209modules_eina_mp_pass_through_pass_through_module_la_SOURCES = modules/eina/mp/pass_through/eina_pass_through.c 200modules_eina_mp_pass_through_pass_through_module_la_SOURCES = modules/eina/mp/pass_through/eina_pass_through.c
210endif 201endif
211 202
212lib_eina_libeina_la_CPPFLAGS = \ 203lib_eina_libeina_la_CPPFLAGS = \
213-I$(top_srcdir)/src/lib/eina \ 204@EINA_CFLAGS@ \
214-I$(top_builddir)/src/lib/eina \
215-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 205-DPACKAGE_BIN_DIR=\"$(bindir)\" \
216-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 206-DPACKAGE_LIB_DIR=\"$(libdir)\" \
217-DPACKAGE_DATA_DIR=\"$(datadir)/eina\" \ 207-DPACKAGE_DATA_DIR=\"$(datadir)/eina\" \
218-DEFL_EINA_BUILD \ 208@VALGRIND_CFLAGS@
219@EFL_COV_CFLAGS@ \ 209
220@EINA_CFLAGS@ \ 210lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @DL_LIBS@
221@VALGRIND_CFLAGS@ \ 211lib_eina_libeina_la_DEPENDENCIES = @EINA_INTERNAL_LIBS@ @DL_INTERNAL_LIBS@
222@USE_EVIL_CFLAGS@
223
224lib_eina_libeina_la_LIBADD = \
225@EINA_LIBS@ \
226@EFL_COV_LIBS@ \
227@USE_EVIL_LIBS@ \
228@DL_LIBS@
229lib_eina_libeina_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 212lib_eina_libeina_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
230 213
231### Script 214### Script
@@ -281,28 +264,16 @@ tests/eina/eina_test_barrier.c
281# tests/eina/eina_test_model.c 264# tests/eina/eina_test_model.c
282 265
283tests_eina_eina_suite_CPPFLAGS = \ 266tests_eina_eina_suite_CPPFLAGS = \
284-I$(top_srcdir)/src/lib/eina \
285-I$(top_builddir)/src/lib/eina \
286-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/tests/eina\" \ 267-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/tests/eina\" \
287@CHECK_CFLAGS@ \ 268@CHECK_CFLAGS@ \
288@EINA_CFLAGS@ 269@EINA_CFLAGS@
289 270tests_eina_eina_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@
290tests_eina_eina_suite_LDADD = \ 271tests_eina_eina_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
291lib/eina/libeina.la \
292@CHECK_LIBS@ \
293@EINA_LDFLAGS@
294 272
295tests_eina_cxx_compile_test_SOURCES = tests/eina/cxx_compile_test.cxx 273tests_eina_cxx_compile_test_SOURCES = tests/eina/cxx_compile_test.cxx
296 274tests_eina_cxx_compile_test_CPPFLAGS = @EINA_CFLAGS@
297tests_eina_cxx_compile_test_CPPFLAGS = \ 275tests_eina_cxx_compile_test_LDADD = @USE_EINA_LIBS@
298-I$(top_srcdir)/src/lib/eina \ 276tests_eina_cxx_compile_test_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
299-I$(top_builddir)/src/lib/eina \
300@CHECK_CFLAGS@ \
301@EINA_CFLAGS@
302
303tests_eina_cxx_compile_test_LDADD = \
304lib/eina/libeina.la \
305@EINA_LDFLAGS@
306 277
307EXTRA_LTLIBRARIES = tests/eina/module_dummy.la 278EXTRA_LTLIBRARIES = tests/eina/module_dummy.la
308 279
@@ -311,19 +282,12 @@ check-local: tests/eina/module_dummy.la
311tests_eina_module_dummy_la_SOURCES = tests/eina/eina_test_module_dummy.c 282tests_eina_module_dummy_la_SOURCES = tests/eina/eina_test_module_dummy.c
312 283
313tests_eina_module_dummy_la_CPPFLAGS = \ 284tests_eina_module_dummy_la_CPPFLAGS = \
314-I$(top_srcdir)/src/lib/eina \
315-I$(top_builddir)/src/lib/eina \
316-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/tests/eina\" \ 285-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/tests/eina\" \
317@CHECK_CFLAGS@ \ 286@CHECK_CFLAGS@ \
318@EINA_CFLAGS@ \ 287@EINA_CFLAGS@
319-DEFL_EINA_BUILD 288tests_eina_module_dummy_la_LIBADD = @USE_EINA_LIBS@
320 289tests_eina_module_dummy_la_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
321tests_eina_module_dummy_la_LIBADD = \
322lib/eina/libeina.la \
323@EINA_LIBS@
324
325tests_eina_module_dummy_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 290tests_eina_module_dummy_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
326
327tests_eina_module_dummy_la_LIBTOOLFLAGS = --tag=disable-static 291tests_eina_module_dummy_la_LIBTOOLFLAGS = --tag=disable-static
328 292
329endif 293endif
diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am
index 40816e65e3..8d4738ad93 100644
--- a/src/Makefile_Eio.am
+++ b/src/Makefile_Eio.am
@@ -26,23 +26,7 @@ lib_eio_libeio_la_SOURCES += lib/eio/eio_monitor_win32.c
26endif 26endif
27endif 27endif
28 28
29lib_eio_libeio_la_CPPFLAGS = \ 29lib_eio_libeio_la_CPPFLAGS = @EIO_CFLAGS@
30-I$(top_srcdir)/src/lib/eina \ 30lib_eio_libeio_la_LIBADD = @EIO_LIBS@
31-I$(top_builddir)/src/lib/eina \ 31lib_eio_libeio_la_DEPENDENCIES = @EIO_INTERNAL_LIBS@
32-I$(top_srcdir)/src/lib/eo \
33-I$(top_srcdir)/src/lib/eet \
34-I$(top_srcdir)/src/lib/ecore \
35-I$(top_srcdir)/src/lib/eio \
36-DEFL_EIO_BUILD \
37@EIO_CFLAGS@ \
38@EFL_COV_CFLAGS@
39
40lib_eio_libeio_la_LIBADD = \
41lib/eina/libeina.la \
42lib/eo/libeo.la \
43lib/eet/libeet.la \
44lib/ecore/libecore.la \
45@EIO_LIBS@ \
46@EFL_COV_LIBS@
47
48lib_eio_libeio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 32lib_eio_libeio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
index 8d07096f30..47bc04b0ad 100644
--- a/src/Makefile_Embryo.am
+++ b/src/Makefile_Embryo.am
@@ -17,20 +17,12 @@ lib/embryo/embryo_time.c \
17lib/embryo/embryo_private.h 17lib/embryo/embryo_private.h
18 18
19lib_embryo_libembryo_la_CPPFLAGS = \ 19lib_embryo_libembryo_la_CPPFLAGS = \
20-I$(top_srcdir)/src/lib/eina \
21-I$(top_builddir)/src/lib/eina \
22-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 20-DPACKAGE_BIN_DIR=\"$(bindir)\" \
23-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 21-DPACKAGE_LIB_DIR=\"$(libdir)\" \
24-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ 22-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
25-DEFL_EMBRYO_BUILD \ 23@EMBRYO_CFLAGS@
26@EMBRYO_CFLAGS@ \ 24lib_embryo_libembryo_la_LIBADD = @EMBRYO_LIBS@
27@USE_EVIL_CFLAGS@ 25lib_embryo_libembryo_la_DEPENDENCIES = @EMBRYO_INTERNAL_LIBS@
28
29lib_embryo_libembryo_la_LIBADD = \
30lib/eina/libeina.la \
31@EMBRYO_LIBS@ \
32@USE_EVIL_LIBS@
33
34lib_embryo_libembryo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 26lib_embryo_libembryo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
35 27
36### Binary 28### Binary
@@ -55,21 +47,14 @@ bin/embryo/embryo_cc_prefix.c \
55bin/embryo/embryo_cc_prefix.h 47bin/embryo/embryo_cc_prefix.h
56 48
57bin_embryo_embryo_cc_CPPFLAGS = \ 49bin_embryo_embryo_cc_CPPFLAGS = \
58-I$(top_srcdir)/src/lib/eina \
59-I$(top_builddir)/src/lib/eina \
60-I$(top_srcdir)/src/lib/embryo \
61-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 50-DPACKAGE_BIN_DIR=\"$(bindir)\" \
62-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 51-DPACKAGE_LIB_DIR=\"$(libdir)\" \
63-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ 52-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
64-DPACKAGE_SRC_DIR=\"`pwd`/$(top_srcdir)\" \ 53-DPACKAGE_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
65@EMBRYO_CFLAGS@ \ 54@EMBRYO_CFLAGS@
66@USE_EVIL_CFLAGS@
67 55
68bin_embryo_embryo_cc_LDADD = \ 56bin_embryo_embryo_cc_LDADD = @USE_EMBRYO_LIBS@
69lib/embryo/libembryo.la \ 57bin_embryo_embryo_cc_DEPENDENCIES = @USE_EMBRYO_INTERNAL_LIBS@
70lib/eina/libeina.la \
71@EMBRYO_LDFLAGS@ \
72@USE_EVIL_LIBS@
73 58
74EXTRA_DIST += \ 59EXTRA_DIST += \
75bin/embryo/embryo_cc_sc5.scp \ 60bin/embryo/embryo_cc_sc5.scp \
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index 45a2dedad0..085f2b4e53 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -3,45 +3,6 @@
3lib_LTLIBRARIES += \ 3lib_LTLIBRARIES += \
4lib/emotion/libemotion.la 4lib/emotion/libemotion.la
5 5
6EMOTION_COMMON_CPPFLAGS = \
7-I$(top_srcdir)/src/lib/eina \
8-I$(top_builddir)/src/lib/eina \
9-I$(top_srcdir)/src/lib/eo \
10-I$(top_builddir)/src/lib/eo \
11-I$(top_srcdir)/src/lib/ecore \
12-I$(top_builddir)/src/lib/ecore \
13-I$(top_srcdir)/src/lib/ecore_x \
14-I$(top_builddir)/src/lib/ecore_x \
15-I$(top_srcdir)/src/lib/ecore_input \
16-I$(top_builddir)/src/lib/ecore_input \
17-I$(top_srcdir)/src/lib/ecore_evas \
18-I$(top_builddir)/src/lib/ecore_evas \
19-I$(top_srcdir)/src/lib/eet \
20-I$(top_builddir)/src/lib/eet \
21-I$(top_srcdir)/src/lib/evas \
22-I$(top_builddir)/src/lib/evas \
23-I$(top_srcdir)/src/lib/eio \
24-I$(top_builddir)/src/lib/eio \
25-I$(top_srcdir)/src/lib/eeze \
26-I$(top_builddir)/src/lib/eeze \
27-I$(top_srcdir)/src/lib/emotion \
28-I$(top_builddir)/src/lib/emotion \
29@EFL_COV_CFLAGS@ \
30@EMOTION_CFLAGS@
31
32EMOTION_COMMON_LDADD = \
33lib/eina/libeina.la \
34lib/eo/libeo.la \
35lib/ecore/libecore.la \
36lib/eet/libeet.la \
37lib/evas/libevas.la \
38lib/eio/libeio.la \
39@EFL_COV_LIBS@
40
41if EMOTION_HAVE_V4L2
42EMOTION_COMMON_LDADD += lib/eeze/libeeze.la
43endif
44
45installed_emotionmainheadersdir = $(includedir)/emotion-@VMAJ@ 6installed_emotionmainheadersdir = $(includedir)/emotion-@VMAJ@
46dist_installed_emotionmainheaders_DATA = lib/emotion/Emotion.h 7dist_installed_emotionmainheaders_DATA = lib/emotion/Emotion.h
47 8
@@ -54,20 +15,14 @@ lib/emotion/emotion_webcam.c \
54lib/emotion/emotion_modules.c \ 15lib/emotion/emotion_modules.c \
55lib/emotion/emotion_main.c 16lib/emotion/emotion_main.c
56 17
57EMOTION_COMMON_LIBADD = $(EMOTION_COMMON_LDADD) @EMOTION_LIBS@
58EMOTION_COMMON_LDADD += @EMOTION_LDFLAGS@
59EMOTION_COMMON_USER_LIBADD = $(EMOTION_COMMON_LIBADD) lib/emotion/libemotion.la
60EMOTION_COMMON_USER_LDADD = $(EMOTION_COMMON_LDADD) lib/emotion/libemotion.la
61
62lib_emotion_libemotion_la_CPPFLAGS = \ 18lib_emotion_libemotion_la_CPPFLAGS = \
63$(EMOTION_COMMON_CPPFLAGS) \
64-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 19-DPACKAGE_BIN_DIR=\"$(bindir)\" \
65-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 20-DPACKAGE_LIB_DIR=\"$(libdir)\" \
66-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \ 21-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
67-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \ 22-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
68-DEFL_EMOTION_BUILD 23@EMOTION_CFLAGS@
69 24lib_emotion_libemotion_la_LIBADD = @EMOTION_LIBS@
70lib_emotion_libemotion_la_LIBADD = $(EMOTION_COMMON_LIBADD) 25lib_emotion_libemotion_la_DEPENDENCIES = @EMOTION_INTERNAL_LIBS@
71lib_emotion_libemotion_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 26lib_emotion_libemotion_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
72 27
73## Modules 28## Modules
@@ -86,11 +41,12 @@ emotionmodulexinedir = $(libdir)/emotion/modules/xine/$(MODULE_ARCH)
86emotionmodulexine_LTLIBRARIES = modules/emotion/xine/module.la 41emotionmodulexine_LTLIBRARIES = modules/emotion/xine/module.la
87modules_emotion_xine_module_la_SOURCES = $(EMOTION_XINE_SOURCES) 42modules_emotion_xine_module_la_SOURCES = $(EMOTION_XINE_SOURCES)
88modules_emotion_xine_module_la_CPPFLAGS = \ 43modules_emotion_xine_module_la_CPPFLAGS = \
89$(EMOTION_COMMON_CPPFLAGS) \ 44@EMOTION_CFLAGS@ \
90@EMOTION_MODULE_XINE_CFLAGS@ 45@EMOTION_MODULE_XINE_CFLAGS@
91modules_emotion_xine_module_la_LIBADD = \ 46modules_emotion_xine_module_la_LIBADD = \
92$(EMOTION_COMMON_USER_LIBADD) \ 47@USE_EMOTION_LIBS@ \
93@EMOTION_MODULE_XINE_LIBS@ 48@EMOTION_MODULE_XINE_LIBS@
49modules_emotion_xine_module_la_DEPENDENCIES = @USE_EMOTION_INTERNAL_LIBS@
94modules_emotion_xine_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 50modules_emotion_xine_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
95modules_emotion_xine_module_la_LIBTOOLFLAGS = --tag=disable-static 51modules_emotion_xine_module_la_LIBTOOLFLAGS = --tag=disable-static
96endif 52endif
@@ -107,28 +63,24 @@ modules/emotion/gstreamer/emotion_sink.c
107 63
108if EMOTION_STATIC_BUILD_GSTREAMER 64if EMOTION_STATIC_BUILD_GSTREAMER
109lib_emotion_libemotion_la_SOURCES += $(EMOTION_GSTREAMER_SOURCES) 65lib_emotion_libemotion_la_SOURCES += $(EMOTION_GSTREAMER_SOURCES)
110if HAVE_ECORE_X
111EMOTION_COMMON_LDADD += \
112lib/ecore_evas/libecore_evas.la \
113lib/ecore_x/libecore_x.la
114endif
115else 66else
116if EMOTION_BUILD_GSTREAMER 67if EMOTION_BUILD_GSTREAMER
117emotionmodulegstreamerdir = $(libdir)/emotion/modules/gstreamer/$(MODULE_ARCH) 68emotionmodulegstreamerdir = $(libdir)/emotion/modules/gstreamer/$(MODULE_ARCH)
118emotionmodulegstreamer_LTLIBRARIES = modules/emotion/gstreamer/module.la 69emotionmodulegstreamer_LTLIBRARIES = modules/emotion/gstreamer/module.la
119modules_emotion_gstreamer_module_la_SOURCES = $(EMOTION_GSTREAMER_SOURCES) 70modules_emotion_gstreamer_module_la_SOURCES = $(EMOTION_GSTREAMER_SOURCES)
120modules_emotion_gstreamer_module_la_CPPFLAGS = \ 71modules_emotion_gstreamer_module_la_CPPFLAGS = \
121$(EMOTION_COMMON_CPPFLAGS) \ 72@EMOTION_CFLAGS@ \
122@EMOTION_MODULE_GSTREAMER_CFLAGS@ 73@EMOTION_MODULE_GSTREAMER_CFLAGS@
123modules_emotion_gstreamer_module_la_LIBADD = \ 74modules_emotion_gstreamer_module_la_LIBADD = \
124$(EMOTION_COMMON_USER_LIBADD) \ 75@USE_EMOTION_LIBS@ \
125@EMOTION_MODULE_GSTREAMER_LIBS@ 76@EMOTION_MODULE_GSTREAMER_LIBS@
77modules_emotion_gstreamer_module_la_DEPENDENCIES = @USE_EMOTION_INTERNAL_LIBS@
126modules_emotion_gstreamer_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 78modules_emotion_gstreamer_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
127modules_emotion_gstreamer_module_la_LIBTOOLFLAGS = --tag=disable-static 79modules_emotion_gstreamer_module_la_LIBTOOLFLAGS = --tag=disable-static
128if HAVE_ECORE_X 80if HAVE_ECORE_X
129modules_emotion_gstreamer_module_la_LIBADD += \ 81modules_emotion_gstreamer_module_la_CPPFLAGS += @ECORE_X_CFLAGS@ @ECORE_EVAS_CFLAGS@
130lib/ecore_evas/libecore_evas.la \ 82modules_emotion_gstreamer_module_la_LIBADD += @USE_ECORE_X_LIBS@ @USE_ECORE_EVAS_LIBS@
131lib/ecore_x/libecore_x.la 83modules_emotion_gstreamer_module_la_DEPENDENCIES += @USE_ECORE_X_INTERNAL_LIBS@ @USE_ECORE_EVAS_INTERNAL_LIBS@
132endif 84endif
133endif 85endif
134endif 86endif
@@ -146,12 +98,12 @@ emotionmodulegenericdir = $(libdir)/emotion/modules/generic/$(MODULE_ARCH)
146emotionmodulegeneric_LTLIBRARIES = modules/emotion/generic/module.la 98emotionmodulegeneric_LTLIBRARIES = modules/emotion/generic/module.la
147modules_emotion_generic_module_la_SOURCES = $(EMOTION_GENERIC_SOURCES) 99modules_emotion_generic_module_la_SOURCES = $(EMOTION_GENERIC_SOURCES)
148modules_emotion_generic_module_la_CPPFLAGS = \ 100modules_emotion_generic_module_la_CPPFLAGS = \
149$(EMOTION_COMMON_CPPFLAGS) \ 101@EMOTION_CFLAGS@ \
150-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 102-DPACKAGE_BIN_DIR=\"$(bindir)\" \
151-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 103-DPACKAGE_LIB_DIR=\"$(libdir)\" \
152-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" 104-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\"
153modules_emotion_generic_module_la_LIBADD = \ 105modules_emotion_generic_module_la_LIBADD = @USE_EMOTION_LIBS@
154$(EMOTION_COMMON_USER_LIBADD) 106modules_emotion_generic_module_la_DEPENDENCIES = @USE_EMOTION_INTERNAL_LIBS@
155modules_emotion_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 107modules_emotion_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
156modules_emotion_generic_module_la_LIBTOOLFLAGS = --tag=disable-static 108modules_emotion_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
157endif 109endif
@@ -170,11 +122,15 @@ emotionedjeexternal_LTLIBRARIES = edje_external/emotion/module.la
170edje_external_emotion_module_la_SOURCES = \ 122edje_external_emotion_module_la_SOURCES = \
171edje_external/emotion/emotion.c 123edje_external/emotion/emotion.c
172edje_external_emotion_module_la_CPPFLAGS = \ 124edje_external_emotion_module_la_CPPFLAGS = \
173$(EMOTION_COMMON_CPPFLAGS) \ 125@EDJE_CFLAGS@ \
174$(EDJE_COMMON_CPPFLAGS) 126@EMOTION_CFLAGS@ \
127-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\"
175edje_external_emotion_module_la_LIBADD = \ 128edje_external_emotion_module_la_LIBADD = \
176$(EMOTION_COMMON_USER_LIBADD) \ 129@USE_EDJE_LIBS@ \
177$(EDJE_COMMON_USER_LIBADD) 130@USE_EMOTION_LIBS@
131edje_external_emotion_module_la_DEPENDENCIES = \
132@USE_EDJE_INTERNAL_LIBS@ \
133@USE_EMOTION_INTERNAL_LIBS@
178edje_external_emotion_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 134edje_external_emotion_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
179edje_external_emotion_module_la_LIBTOOLFLAGS = --tag=disable-static 135edje_external_emotion_module_la_LIBTOOLFLAGS = --tag=disable-static
180 136
@@ -190,18 +146,15 @@ tests_emotion_emotion_test_SOURCES = \
190tests/emotion/emotion_test_main.c 146tests/emotion/emotion_test_main.c
191 147
192tests_emotion_emotion_test_CPPFLAGS = \ 148tests_emotion_emotion_test_CPPFLAGS = \
193$(EMOTION_COMMON_CPPFLAGS) \
194-I$(top_srcdir)/src/lib/edje \
195-I$(top_builddir)/src/lib/edje \
196-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 149-DPACKAGE_BIN_DIR=\"$(bindir)\" \
197-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 150-DPACKAGE_LIB_DIR=\"$(libdir)\" \
198-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \ 151-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
199-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" 152-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
153@EDJE_CFLAGS@ \
154@EMOTION_CFLAGS@
200 155
201tests_emotion_emotion_test_LDADD = \ 156tests_emotion_emotion_test_LDADD = @USE_EDJE_LIBS@ @USE_EMOTION_LIBS@
202$(EMOTION_COMMON_USER_LDADD) \ 157tests_emotion_emotion_test_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ @USE_EMOTION_INTERNAL_LIBS@
203lib/ecore_evas/libecore_evas.la \
204lib/edje/libedje.la
205 158
206tests/emotion/data/theme.edj: tests/emotion/data/theme.edc bin/edje/edje_cc 159tests/emotion/data/theme.edj: tests/emotion/data/theme.edc bin/edje/edje_cc
207 @$(MKDIR_P) tests/emotion/data 160 @$(MKDIR_P) tests/emotion/data
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 9c5795d47f..f2dd3c4eb1 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -11,17 +11,9 @@ lib/eo/eo.c \
11lib/eo/eo_base_class.c \ 11lib/eo/eo_base_class.c \
12lib/eo/eo_private.h 12lib/eo/eo_private.h
13 13
14lib_eo_libeo_la_CPPFLAGS = \ 14lib_eo_libeo_la_CPPFLAGS = -DNDEBUG @EO_CFLAGS@
15-I$(top_srcdir)/src/lib/eina \ 15lib_eo_libeo_la_LIBADD = @EO_LIBS@
16-I$(top_builddir)/src/lib/eina \ 16lib_eo_libeo_la_DEPENDENCIES = @EO_INTERNAL_LIBS@
17-I$(top_srcdir)/src/lib/eo \
18-DNDEBUG \
19-DEFL_EO_BUILD \
20@EFL_COV_CFLAGS@ \
21@EO_CFLAGS@ \
22@USE_EVIL_CFLAGS@
23
24lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@ @EFL_COV_LIBS@
25lib_eo_libeo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 17lib_eo_libeo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
26 18
27### Unit tests 19### Unit tests
@@ -46,17 +38,9 @@ tests/eo/access/access_main.c \
46tests/eo/access/access_simple.c \ 38tests/eo/access/access_simple.c \
47tests/eo/access/access_simple.h \ 39tests/eo/access/access_simple.h \
48tests/eo/access/access_simple_protected.h 40tests/eo/access/access_simple_protected.h
49 41tests_eo_test_access_CPPFLAGS = @EO_CFLAGS@
50tests_eo_test_access_CPPFLAGS = \ 42tests_eo_test_access_LDADD = @USE_EO_LIBS@
51-I$(top_srcdir)/src/lib/eina \ 43tests_eo_test_access_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
52-I$(top_builddir)/src/lib/eina \
53-I$(top_srcdir)/src/lib/eo \
54@CHECK_CFLAGS@ \
55@EO_CFLAGS@
56
57tests_eo_test_access_LDADD = \
58lib/eo/libeo.la \
59@EO_LDFLAGS@
60 44
61tests_eo_test_composite_objects_SOURCES = \ 45tests_eo_test_composite_objects_SOURCES = \
62tests/eo/composite_objects/composite_objects_comp.c \ 46tests/eo/composite_objects/composite_objects_comp.c \
@@ -64,17 +48,9 @@ tests/eo/composite_objects/composite_objects_comp.h \
64tests/eo/composite_objects/composite_objects_main.c \ 48tests/eo/composite_objects/composite_objects_main.c \
65tests/eo/composite_objects/composite_objects_simple.c \ 49tests/eo/composite_objects/composite_objects_simple.c \
66tests/eo/composite_objects/composite_objects_simple.h 50tests/eo/composite_objects/composite_objects_simple.h
67 51tests_eo_test_composite_objects_CPPFLAGS = @EO_CFLAGS@
68tests_eo_test_composite_objects_CPPFLAGS = \ 52tests_eo_test_composite_objects_LDADD = @USE_EO_LIBS@
69-I$(top_srcdir)/src/lib/eina \ 53tests_eo_test_composite_objects_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
70-I$(top_builddir)/src/lib/eina \
71-I$(top_srcdir)/src/lib/eo \
72@CHECK_CFLAGS@ \
73@EO_CFLAGS@
74
75tests_eo_test_composite_objects_LDADD = \
76lib/eo/libeo.la \
77@EO_LDFLAGS@
78 54
79tests_eo_test_constructors_SOURCES = \ 55tests_eo_test_constructors_SOURCES = \
80tests/eo/constructors/constructors_main.c \ 56tests/eo/constructors/constructors_main.c \
@@ -94,17 +70,9 @@ tests/eo/constructors/constructors_simple6.c \
94tests/eo/constructors/constructors_simple6.h \ 70tests/eo/constructors/constructors_simple6.h \
95tests/eo/constructors/constructors_simple7.c \ 71tests/eo/constructors/constructors_simple7.c \
96tests/eo/constructors/constructors_simple7.h 72tests/eo/constructors/constructors_simple7.h
97 73tests_eo_test_constructors_CPPFLAGS = @EO_CFLAGS@
98tests_eo_test_constructors_CPPFLAGS = \ 74tests_eo_test_constructors_LDADD = @USE_EO_LIBS@
99-I$(top_srcdir)/src/lib/eina \ 75tests_eo_test_constructors_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
100-I$(top_builddir)/src/lib/eina \
101-I$(top_srcdir)/src/lib/eo \
102@CHECK_CFLAGS@ \
103@EO_CFLAGS@
104
105tests_eo_test_constructors_LDADD = \
106lib/eo/libeo.la \
107@EO_LDFLAGS@
108 76
109if EFL_ENABLE_TESTS 77if EFL_ENABLE_TESTS
110 78
@@ -116,19 +84,13 @@ tests/eo/suite/eo_suite.h \
116tests/eo/suite/eo_test_class_errors.c \ 84tests/eo/suite/eo_test_class_errors.c \
117tests/eo/suite/eo_test_general.c \ 85tests/eo/suite/eo_test_general.c \
118tests/eo/suite/eo_test_init.c 86tests/eo/suite/eo_test_init.c
119
120tests_eo_eo_suite_CPPFLAGS = \ 87tests_eo_eo_suite_CPPFLAGS = \
121-I$(top_srcdir)/src/lib/eina \
122-I$(top_builddir)/src/lib/eina \
123-I$(top_srcdir)/src/lib/eo \
124-DNDEBUG \ 88-DNDEBUG \
125@CHECK_CFLAGS@ \ 89@CHECK_CFLAGS@ \
126@EO_CFLAGS@ 90@EO_CFLAGS@
127 91
128tests_eo_eo_suite_LDADD = \ 92tests_eo_eo_suite_LDADD = @CHECK_LIBS@ @USE_EO_LIBS@
129lib/eo/libeo.la \ 93tests_eo_eo_suite_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
130@CHECK_LIBS@ \
131@EO_LDFLAGS@
132 94
133endif 95endif
134 96
@@ -142,17 +104,9 @@ tests/eo/function_overrides/function_overrides_inherit3.h \
142tests/eo/function_overrides/function_overrides_main.c \ 104tests/eo/function_overrides/function_overrides_main.c \
143tests/eo/function_overrides/function_overrides_simple.c \ 105tests/eo/function_overrides/function_overrides_simple.c \
144tests/eo/function_overrides/function_overrides_simple.h 106tests/eo/function_overrides/function_overrides_simple.h
145 107tests_eo_test_function_overrides_CPPFLAGS = @EO_CFLAGS@
146tests_eo_test_function_overrides_CPPFLAGS = \ 108tests_eo_test_function_overrides_LDADD = @USE_EO_LIBS@
147-I$(top_srcdir)/src/lib/eina \ 109tests_eo_test_function_overrides_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
148-I$(top_builddir)/src/lib/eina \
149-I$(top_srcdir)/src/lib/eo \
150@CHECK_CFLAGS@ \
151@EO_CFLAGS@
152
153tests_eo_test_function_overrides_LDADD = \
154lib/eo/libeo.la \
155@EO_LDFLAGS@
156 110
157tests_eo_test_interface_SOURCES = \ 111tests_eo_test_interface_SOURCES = \
158tests/eo/interface/interface_interface.c \ 112tests/eo/interface/interface_interface.c \
@@ -162,17 +116,9 @@ tests/eo/interface/interface_interface2.h \
162tests/eo/interface/interface_main.c \ 116tests/eo/interface/interface_main.c \
163tests/eo/interface/interface_simple.c \ 117tests/eo/interface/interface_simple.c \
164tests/eo/interface/interface_simple.h 118tests/eo/interface/interface_simple.h
165 119tests_eo_test_interface_CPPFLAGS = @EO_CFLAGS@
166tests_eo_test_interface_CPPFLAGS = \ 120tests_eo_test_interface_LDADD = @USE_EO_LIBS@
167-I$(top_srcdir)/src/lib/eina \ 121tests_eo_test_interface_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
168-I$(top_builddir)/src/lib/eina \
169-I$(top_srcdir)/src/lib/eo \
170@CHECK_CFLAGS@ \
171@EO_CFLAGS@
172
173tests_eo_test_interface_LDADD = \
174lib/eo/libeo.la \
175@EO_LDFLAGS@
176 122
177tests_eo_test_mixin_SOURCES = \ 123tests_eo_test_mixin_SOURCES = \
178tests/eo/mixin/mixin_inherit.c \ 124tests/eo/mixin/mixin_inherit.c \
@@ -188,32 +134,16 @@ tests/eo/mixin/mixin_mixin4.c \
188tests/eo/mixin/mixin_mixin4.h \ 134tests/eo/mixin/mixin_mixin4.h \
189tests/eo/mixin/mixin_simple.c \ 135tests/eo/mixin/mixin_simple.c \
190tests/eo/mixin/mixin_simple.h 136tests/eo/mixin/mixin_simple.h
191 137tests_eo_test_mixin_CPPFLAGS = @EO_CFLAGS@
192tests_eo_test_mixin_CPPFLAGS = \ 138tests_eo_test_mixin_LDADD = @USE_EO_LIBS@
193-I$(top_srcdir)/src/lib/eina \ 139tests_eo_test_mixin_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
194-I$(top_builddir)/src/lib/eina \
195-I$(top_srcdir)/src/lib/eo \
196@CHECK_CFLAGS@ \
197@EO_CFLAGS@
198
199tests_eo_test_mixin_LDADD = \
200lib/eo/libeo.la \
201@EO_LDFLAGS@
202 140
203tests_eo_test_signals_SOURCES = \ 141tests_eo_test_signals_SOURCES = \
204tests/eo/signals/signals_main.c \ 142tests/eo/signals/signals_main.c \
205tests/eo/signals/signals_simple.c \ 143tests/eo/signals/signals_simple.c \
206tests/eo/signals/signals_simple.h 144tests/eo/signals/signals_simple.h
207 145tests_eo_test_signals_CPPFLAGS = @EO_CFLAGS@
208tests_eo_test_signals_CPPFLAGS = \ 146tests_eo_test_signals_LDADD = @USE_EO_LIBS@
209-I$(top_srcdir)/src/lib/eina \ 147tests_eo_test_signals_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
210-I$(top_builddir)/src/lib/eina \
211-I$(top_srcdir)/src/lib/eo \
212@CHECK_CFLAGS@ \
213@EO_CFLAGS@
214
215tests_eo_test_signals_LDADD = \
216lib/eo/libeo.la \
217@EO_LDFLAGS@
218 148
219EXTRA_DIST += tests/eo/eunit_tests.h 149EXTRA_DIST += tests/eo/eunit_tests.h
diff --git a/src/Makefile_Escape.am b/src/Makefile_Escape.am
index e3934a2ab8..c9399c9c2e 100644
--- a/src/Makefile_Escape.am
+++ b/src/Makefile_Escape.am
@@ -19,9 +19,9 @@ lib/escape/escape_libgen.c \
19lib/escape/escape_mman.c \ 19lib/escape/escape_mman.c \
20lib/escape/escape_unistd.c 20lib/escape/escape_unistd.c
21 21
22lib_escape_libescape_la_CPPFLAGS = \ 22lib_escape_libescape_la_CPPFLAGS = @ESCAPE_CFLAGS@
23-I$(top_srcdir)/src/lib/escape
24lib_escape_libescape_la_LIBADD = @ESCAPE_LIBS@ 23lib_escape_libescape_la_LIBADD = @ESCAPE_LIBS@
24lib_escape_libescape_la_DEPENDENCIES = @ESCAPE_INTERNAL_LIBS@
25lib_escape_libescape_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 25lib_escape_libescape_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
26 26
27endif 27endif
diff --git a/src/Makefile_Ethumb.am b/src/Makefile_Ethumb.am
index 3b0e15daae..b7a8552fa6 100644
--- a/src/Makefile_Ethumb.am
+++ b/src/Makefile_Ethumb.am
@@ -4,38 +4,6 @@ lib_LTLIBRARIES += \
4lib/ethumb/libethumb.la \ 4lib/ethumb/libethumb.la \
5lib/ethumb/client/libethumb_client.la 5lib/ethumb/client/libethumb_client.la
6 6
7ETHUMB_COMMON_CPPFLAGS = \
8-I$(top_srcdir)/src/lib/eina \
9-I$(top_builddir)/src/lib/eina \
10-I$(top_srcdir)/src/lib/eo \
11-I$(top_builddir)/src/lib/eo \
12-I$(top_srcdir)/src/lib/ecore \
13-I$(top_builddir)/src/lib/ecore \
14-I$(top_srcdir)/src/lib/ecore_evas \
15-I$(top_builddir)/src/lib/ecore_evas \
16-I$(top_srcdir)/src/lib/ecore_file \
17-I$(top_builddir)/src/lib/ecore_file \
18-I$(top_srcdir)/src/lib/evas \
19-I$(top_builddir)/src/lib/evas \
20-I$(top_srcdir)/src/lib/edje \
21-I$(top_builddir)/src/lib/edje \
22-I$(top_srcdir)/src/lib/ethumb \
23-I$(top_builddir)/src/lib/ethumb \
24@EFL_COV_CFLAGS@ \
25@ETHUMB_CFLAGS@ \
26@USE_EVIL_CFLAGS@
27
28ETHUMB_COMMON_LDADD = \
29lib/eina/libeina.la \
30lib/eo/libeo.la \
31lib/ecore/libecore.la \
32lib/ecore_evas/libecore_evas.la \
33lib/ecore_file/libecore_file.la \
34lib/evas/libevas.la \
35lib/edje/libedje.la \
36@EFL_COV_LIBS@ \
37@USE_EVIL_LIBS@
38
39installed_ethumbmainheadersdir = $(includedir)/ethumb-@VMAJ@ 7installed_ethumbmainheadersdir = $(includedir)/ethumb-@VMAJ@
40dist_installed_ethumbmainheaders_DATA = \ 8dist_installed_ethumbmainheaders_DATA = \
41lib/ethumb/Ethumb.h \ 9lib/ethumb/Ethumb.h \
@@ -49,38 +17,22 @@ lib/ethumb/md5.h \
49lib/ethumb/ethumb.c \ 17lib/ethumb/ethumb.c \
50lib/ethumb/md5.c 18lib/ethumb/md5.c
51 19
52ETHUMB_COMMON_LIBADD = $(ETHUMB_COMMON_LDADD) @ETHUMB_LIBS@
53ETHUMB_COMMON_LDADD += @ETHUMB_LDFLAGS@
54ETHUMB_COMMON_USER_LIBADD = $(ETHUMB_COMMON_LIBADD) lib/ethumb/libethumb.la
55ETHUMB_COMMON_USER_LDADD = $(ETHUMB_COMMON_LDADD) lib/ethumb/libethumb.la
56
57lib_ethumb_libethumb_la_CPPFLAGS = \ 20lib_ethumb_libethumb_la_CPPFLAGS = \
58$(ETHUMB_COMMON_CPPFLAGS) \
59-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 21-DPACKAGE_BIN_DIR=\"$(bindir)\" \
60-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 22-DPACKAGE_LIB_DIR=\"$(libdir)\" \
61-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \ 23-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
62-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \ 24-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
63-DEFL_ETHUMB_BUILD 25@ETHUMB_CFLAGS@
64 26lib_ethumb_libethumb_la_LIBADD = @ETHUMB_LIBS@
65lib_ethumb_libethumb_la_LIBADD = $(ETHUMB_COMMON_LIBADD) 27lib_ethumb_libethumb_la_DEPENDENCIES = @ETHUMB_INTERNAL_LIBS@
66lib_ethumb_libethumb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 28lib_ethumb_libethumb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
67 29
68 30# TODO: fix directory!
69# libethumb_client.la 31# libethumb_client.la
70lib_ethumb_client_libethumb_client_la_SOURCES = \ 32lib_ethumb_client_libethumb_client_la_SOURCES = lib/ethumb/client/ethumb_client.c
71lib/ethumb/client/ethumb_client.c 33lib_ethumb_client_libethumb_client_la_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
72 34lib_ethumb_client_libethumb_client_la_LIBADD = @ETHUMB_CLIENT_LIBS@
73lib_ethumb_client_libethumb_client_la_CPPFLAGS = \ 35lib_ethumb_client_libethumb_client_la_DEPENDENCIES = @ETHUMB_CLIENT_INTERNAL_LIBS@
74$(ETHUMB_COMMON_CPPFLAGS) \
75-I$(top_srcdir)/src/lib/edbus \
76-I$(top_builddir)/src/lib/edbus \
77-I$(top_srcdir)/src/lib/ethumb/client \
78-I$(top_builddir)/src/lib/ethumb/client \
79-DEFL_ETHUMB_BUILD
80
81lib_ethumb_client_libethumb_client_la_LIBADD = \
82$(ETHUMB_COMMON_USER_LIBADD) \
83lib/edbus/libedbus2.la
84lib_ethumb_client_libethumb_client_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 36lib_ethumb_client_libethumb_client_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
85 37
86## Modules 38## Modules
@@ -91,21 +43,18 @@ ethumbmoduleemotion_LTLIBRARIES = modules/ethumb/emotion/module.la
91modules_ethumb_emotion_module_la_SOURCES = \ 43modules_ethumb_emotion_module_la_SOURCES = \
92modules/ethumb/emotion/emotion.c 44modules/ethumb/emotion/emotion.c
93modules_ethumb_emotion_module_la_CPPFLAGS = \ 45modules_ethumb_emotion_module_la_CPPFLAGS = \
94$(ETHUMB_COMMON_CPPFLAGS) \
95-I$(top_srcdir)/src/lib/eet \
96-I$(top_builddir)/src/lib/eet \
97-I$(top_srcdir)/src/lib/emotion \
98-I$(top_builddir)/src/lib/emotion \
99-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 46-DPACKAGE_BIN_DIR=\"$(bindir)\" \
100-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 47-DPACKAGE_LIB_DIR=\"$(libdir)\" \
101-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \ 48-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
102-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" 49-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
103 50@EMOTION_CFLAGS@ \
51@ETHUMB_CFLAGS@
104modules_ethumb_emotion_module_la_LIBADD = \ 52modules_ethumb_emotion_module_la_LIBADD = \
105$(ETHUMB_COMMON_USER_LIBADD) \ 53@USE_EMOTION_LIBS@ \
106lib/eet/libeet.la \ 54@USE_ETHUMB_LIBS@
107lib/emotion/libemotion.la 55modules_ethumb_emotion_module_la_DEPENDENCIES = \
108 56@USE_EMOTION_INTERNAL_LIBS@ \
57@USE_ETHUMB_INTERNAL_LIBS@
109modules_ethumb_emotion_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 58modules_ethumb_emotion_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
110modules_ethumb_emotion_module_la_LIBTOOLFLAGS = --tag=disable-static 59modules_ethumb_emotion_module_la_LIBTOOLFLAGS = --tag=disable-static
111 60
@@ -132,40 +81,33 @@ ethumbinternal_bin_PROGRAMS = \
132bin/ethumb/ethumbd_slave 81bin/ethumb/ethumbd_slave
133 82
134bin_ethumb_ethumb_SOURCES = bin/ethumb/ethumb.c 83bin_ethumb_ethumb_SOURCES = bin/ethumb/ethumb.c
135bin_ethumb_ethumb_CPPFLAGS = $(ETHUMB_COMMON_CPPFLAGS) 84bin_ethumb_ethumb_CPPFLAGS = @ETHUMB_CFLAGS@
136bin_ethumb_ethumb_LDADD = $(ETHUMB_COMMON_USER_LDADD) 85bin_ethumb_ethumb_LDADD = @USE_ETHUMB_LIBS@
86bin_ethumb_ethumb_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@
137 87
138# TODO: review why ethumd (master) links to libethumb! shouldn't 88# TODO: review why ethumd (master) links to libethumb! shouldn't
139bin_ethumb_ethumbd_SOURCES = \ 89bin_ethumb_ethumbd_SOURCES = \
140bin/ethumb/ethumbd_private.h \ 90bin/ethumb/ethumbd_private.h \
141bin/ethumb/ethumbd.c 91bin/ethumb/ethumbd.c
142bin_ethumb_ethumbd_CPPFLAGS = \ 92bin_ethumb_ethumbd_CPPFLAGS = \
143$(ETHUMB_COMMON_CPPFLAGS) \
144-I$(top_srcdir)/src/lib/edbus \
145-I$(top_builddir)/src/lib/edbus \
146-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 93-DPACKAGE_BIN_DIR=\"$(bindir)\" \
147-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 94-DPACKAGE_LIB_DIR=\"$(libdir)\" \
148-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \ 95-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
149-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" 96-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
150bin_ethumb_ethumbd_LDADD = \ 97@ETHUMB_CLIENT_CFLAGS@
151$(ETHUMB_COMMON_USER_LDADD) \ 98bin_ethumb_ethumbd_LDADD = @USE_ETHUMB_CLIENT_LIBS@
152lib/edbus/libedbus2.la 99bin_ethumb_ethumbd_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
153
154bin_ethumb_ethumbd_client_SOURCES = \
155bin/ethumb/ethumbd_client.c
156bin_ethumb_ethumbd_client_CPPFLAGS = \
157$(ETHUMB_COMMON_CPPFLAGS) \
158-I$(top_srcdir)/src/lib/edbus \
159-I$(top_builddir)/src/lib/edbus \
160-I$(top_srcdir)/src/lib/ethumb/client \
161-I$(top_builddir)/src/lib/ethumb/client
162bin_ethumb_ethumbd_client_LDADD = \
163$(ETHUMB_COMMON_USER_LDADD) \
164lib/ethumb/client/libethumb_client.la \
165lib/edbus/libedbus2.la
166 100
101bin_ethumb_ethumbd_client_SOURCES = bin/ethumb/ethumbd_client.c
102bin_ethumb_ethumbd_client_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
103bin_ethumb_ethumbd_client_LDADD = @USE_ETHUMB_CLIENT_LIBS@
104bin_ethumb_ethumbd_client_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
105
106# slave does not use dbus, it's a simple ethumb application
167bin_ethumb_ethumbd_slave_SOURCES = \ 107bin_ethumb_ethumbd_slave_SOURCES = \
168bin/ethumb/ethumbd_private.h \ 108bin/ethumb/ethumbd_private.h \
169bin/ethumb/ethumbd_slave.c 109bin/ethumb/ethumbd_slave.c
170bin_ethumb_ethumbd_slave_CPPFLAGS = $(ETHUMB_COMMON_CPPFLAGS) 110bin_ethumb_ethumbd_slave_CPPFLAGS = @ETHUMB_CFLAGS@
171bin_ethumb_ethumbd_slave_LDADD = $(ETHUMB_COMMON_USER_LDADD) 111bin_ethumb_ethumbd_slave_LDADD = @USE_ETHUMB_LIBS@
112bin_ethumb_ethumbd_slave_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@
113
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index ac6ba0924b..a180b93128 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -190,26 +190,18 @@ lib/evas/common/evas_text_utils.h \
190lib/evas/common/evas_font_ot.h 190lib/evas/common/evas_font_ot.h
191 191
192lib_evas_libevas_la_CPPFLAGS = \ 192lib_evas_libevas_la_CPPFLAGS = \
193-I$(top_srcdir)/src/lib/evas \ 193-I$(top_srcdir)/src/lib/evas/common \
194-I$(top_srcdir)/src/lib/evas/include \
195-I$(top_srcdir)/src/lib/evas/cserve2 \ 194-I$(top_srcdir)/src/lib/evas/cserve2 \
196-I$(top_srcdir)/src/lib/evas/file \ 195-I$(top_srcdir)/src/lib/evas/file \
196-I$(top_srcdir)/src/lib/evas/include \
197-I$(top_srcdir)/src/static_libs/libunibreak \ 197-I$(top_srcdir)/src/static_libs/libunibreak \
198-I$(top_srcdir)/src/lib/evas/common \
199-I$(top_srcdir)/src/lib/eina \
200-I$(top_builddir)/src/lib/eina \
201-I$(top_srcdir)/src/lib/eo \
202-I$(top_srcdir)/src/lib/eet \
203-DEFL_EVAS_BUILD \
204-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 198-DPACKAGE_BIN_DIR=\"$(bindir)\" \
205-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 199-DPACKAGE_LIB_DIR=\"$(libdir)\" \
206-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \ 200-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \
207-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \ 201-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
208@EFL_COV_CFLAGS@ \
209@EVAS_CFLAGS@ \ 202@EVAS_CFLAGS@ \
210@VALGRIND_CFLAGS@ \ 203@VALGRIND_CFLAGS@ \
211@ALTIVEC_CFLAGS@ \ 204@ALTIVEC_CFLAGS@
212@USE_EVIL_CFLAGS@
213 205
214# SSE3 206# SSE3
215noinst_LTLIBRARIES += lib/evas/common/libevas_op_blend_sse3.la 207noinst_LTLIBRARIES += lib/evas/common/libevas_op_blend_sse3.la
@@ -219,20 +211,19 @@ lib/evas/common/evas_op_blend/op_blend_master_sse3.c
219 211
220lib_evas_common_libevas_op_blend_sse3_la_CPPFLAGS = \ 212lib_evas_common_libevas_op_blend_sse3_la_CPPFLAGS = \
221$(lib_evas_libevas_la_CPPFLAGS) \ 213$(lib_evas_libevas_la_CPPFLAGS) \
222@EFL_COV_CFLAGS@ \
223@SSE3_CFLAGS@ 214@SSE3_CFLAGS@
224 215
225lib_evas_common_libevas_op_blend_sse3_la_LIBADD = @EFL_COV_LIBS@ 216lib_evas_common_libevas_op_blend_sse3_la_LIBADD = @EVAS_LIBS@
217lib_evas_common_libevas_op_blend_sse3_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
226 218
227lib_evas_libevas_la_CXXFLAGS = 219lib_evas_libevas_la_CXXFLAGS =
228 220
229lib_evas_libevas_la_LIBADD = \ 221lib_evas_libevas_la_LIBADD = \
230lib/evas/common/libevas_op_blend_sse3.la \ 222lib/evas/common/libevas_op_blend_sse3.la \
231lib/eina/libeina.la \ 223@EVAS_LIBS@
232lib/eet/libeet.la \ 224lib_evas_libevas_la_DEPENDENCIES = \
233lib/eo/libeo.la \ 225lib/evas/common/libevas_op_blend_sse3.la \
234@EVAS_LIBS@ \ 226@EVAS_INTERNAL_LIBS@
235@EFL_COV_LIBS@
236 227
237lib_evas_libevas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 228lib_evas_libevas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
238 229
@@ -369,15 +360,11 @@ enginesoftwaregenericpkgdir = $(libdir)/evas/modules/engines/software_generic/$(
369enginesoftwaregenericpkg_LTLIBRARIES = modules/evas/engines/software_generic/module.la 360enginesoftwaregenericpkg_LTLIBRARIES = modules/evas/engines/software_generic/module.la
370modules_evas_engines_software_generic_module_la_SOURCES = modules/evas/engines/software_generic/evas_engine.c 361modules_evas_engines_software_generic_module_la_SOURCES = modules/evas/engines/software_generic/evas_engine.c
371modules_evas_engines_software_generic_module_la_CPPFLAGS = \ 362modules_evas_engines_software_generic_module_la_CPPFLAGS = \
372-I$(top_srcdir)/src/lib/eina \
373-I$(top_builddir)/src/lib/eina \
374-I$(top_srcdir)/src/lib/eo \
375-I$(top_srcdir)/src/lib/evas \
376-I$(top_srcdir)/src/lib/evas/include \ 363-I$(top_srcdir)/src/lib/evas/include \
377-I$(top_srcdir)/src/lib/evas/cserve2 \ 364-I$(top_srcdir)/src/lib/evas/cserve2 \
378-DEFL_EVAS_BUILD \
379@EVAS_CFLAGS@ 365@EVAS_CFLAGS@
380modules_evas_engines_software_generic_module_la_LIBADD = lib/evas/libevas.la 366modules_evas_engines_software_generic_module_la_LIBADD = @USE_EVAS_LIBS@
367modules_evas_engines_software_generic_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
381modules_evas_engines_software_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 368modules_evas_engines_software_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
382modules_evas_engines_software_generic_module_la_LIBTOOLFLAGS = --tag=disable-static 369modules_evas_engines_software_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
383endif 370endif
@@ -395,16 +382,11 @@ enginebufferpkgdir = $(libdir)/evas/modules/engines/buffer/$(MODULE_ARCH)
395enginebufferpkg_LTLIBRARIES = modules/evas/engines/buffer/module.la 382enginebufferpkg_LTLIBRARIES = modules/evas/engines/buffer/module.la
396modules_evas_engines_buffer_module_la_SOURCES = $(BUFFER_SOURCES) 383modules_evas_engines_buffer_module_la_SOURCES = $(BUFFER_SOURCES)
397modules_evas_engines_buffer_module_la_CPPFLAGS = \ 384modules_evas_engines_buffer_module_la_CPPFLAGS = \
398-I$(top_srcdir)/src/lib/eina \
399-I$(top_builddir)/src/lib/eina \
400-I$(top_srcdir)/src/lib/eo \
401-I$(top_srcdir)/src/lib/evas \
402-I$(top_srcdir)/src/lib/evas/include \ 385-I$(top_srcdir)/src/lib/evas/include \
403-I$(top_srcdir)/src/lib/evas/cserve2 \ 386-I$(top_srcdir)/src/lib/evas/cserve2 \
404-DEFL_EVAS_BUILD \ 387@EVAS_CFLAGS@
405@EVAS_CFLAGS@ \ 388modules_evas_engines_buffer_module_la_LIBADD = @USE_EVAS_LIBS@
406@USE_EVIL_CFLAGS@ 389modules_evas_engines_buffer_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
407modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la
408modules_evas_engines_buffer_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 390modules_evas_engines_buffer_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
409modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static 391modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static
410endif 392endif
@@ -427,17 +409,14 @@ enginefbpkgdir = $(libdir)/evas/modules/engines/fb/$(MODULE_ARCH)
427enginefbpkg_LTLIBRARIES = modules/evas/engines/fb/module.la 409enginefbpkg_LTLIBRARIES = modules/evas/engines/fb/module.la
428modules_evas_engines_fb_module_la_SOURCES = $(FB_SOURCES) 410modules_evas_engines_fb_module_la_SOURCES = $(FB_SOURCES)
429modules_evas_engines_fb_module_la_CPPFLAGS = \ 411modules_evas_engines_fb_module_la_CPPFLAGS = \
430-I$(top_srcdir)/src/lib/eina \
431-I$(top_builddir)/src/lib/eina \
432-I$(top_srcdir)/src/lib/eo \
433-I$(top_srcdir)/src/lib/evas \
434-I$(top_srcdir)/src/lib/evas/include \ 412-I$(top_srcdir)/src/lib/evas/include \
435-I$(top_srcdir)/src/lib/evas/cserve2 \ 413-I$(top_srcdir)/src/lib/evas/cserve2 \
436@evas_engine_fb_cflags@ \ 414@evas_engine_fb_cflags@ \
437@EVAS_CFLAGS@ 415@EVAS_CFLAGS@
438modules_evas_engines_fb_module_la_LIBADD = \ 416modules_evas_engines_fb_module_la_LIBADD = \
439lib/evas/libevas.la \ 417@USE_EVAS_LIBS@ \
440@evas_engine_fb_libs@ 418@evas_engine_fb_libs@
419modules_evas_engines_fb_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
441modules_evas_engines_fb_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 420modules_evas_engines_fb_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
442modules_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static 421modules_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static
443endif 422endif
@@ -544,21 +523,14 @@ else
544noinst_LTLIBRARIES += modules/evas/engines/gl_common/libevas_engine_gl_common.la 523noinst_LTLIBRARIES += modules/evas/engines/gl_common/libevas_engine_gl_common.la
545modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES) 524modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES)
546modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \ 525modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \
547-I$(top_srcdir)/src/lib/eina \
548-I$(top_builddir)/src/lib/eina \
549-I$(top_srcdir)/src/lib/eo \
550-I$(top_srcdir)/src/lib/eet \
551-I$(top_srcdir)/src/lib/evas \
552-I$(top_srcdir)/src/lib/evas/include \ 526-I$(top_srcdir)/src/lib/evas/include \
553-I$(top_srcdir)/src/lib/evas/cserve2 \ 527-I$(top_srcdir)/src/lib/evas/cserve2 \
554-DEFL_EVAS_BUILD \
555@EVAS_CFLAGS@ 528@EVAS_CFLAGS@
556if BUILD_ENGINE_GL_X11 529if BUILD_ENGINE_GL_X11
557modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_gl_xlib_cflags@ @evas_engine_gl_xcb_cflags@ 530modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_gl_xlib_cflags@ @evas_engine_gl_xcb_cflags@
558endif 531endif
559modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \ 532modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = @USE_EVAS_LIBS@
560lib/eet/libeet.la \ 533modules_evas_engines_gl_common_libevas_engine_gl_common_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
561lib/evas/libevas.la
562modules_evas_engines_gl_common_libevas_engine_gl_common_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 534modules_evas_engines_gl_common_libevas_engine_gl_common_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
563modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBTOOLFLAGS = --tag=disable-static 535modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBTOOLFLAGS = --tag=disable-static
564endif 536endif
@@ -575,32 +547,26 @@ lib_evas_libevas_la_SOURCES += $(GL_COCOA_SOURCES)
575lib_evas_libevas_la_CPPFLAGS += \ 547lib_evas_libevas_la_CPPFLAGS += \
576-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 548-I$(top_srcdir)/src/modules/evas/engines/gl_common \
577@evas_engine_gl_cocoa_cflags@ 549@evas_engine_gl_cocoa_cflags@
578lib_evas_libevas_la_LIBADD += \ 550lib_evas_libevas_la_LIBADD += @evas_engine_gl_cocoa_libs@
579@evas_engine_gl_cocoa_libs@
580else 551else
581engineglcocoapkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH) 552engineglcocoapkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH)
582engineglcocoapkg_LTLIBRARIES = modules/evas/engines/gl_cocoa/module.la 553engineglcocoapkg_LTLIBRARIES = modules/evas/engines/gl_cocoa/module.la
583modules_evas_engines_gl_cocoa_module_la_SOURCES = $(GL_COCOA_SOURCES) 554modules_evas_engines_gl_cocoa_module_la_SOURCES = $(GL_COCOA_SOURCES)
584modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \ 555modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \
585-I$(top_srcdir)/src/lib/eina \
586-I$(top_builddir)/src/lib/eina \
587-I$(top_srcdir)/src/lib/eo \
588-I$(top_srcdir)/src/lib/eet \
589-I$(top_srcdir)/src/lib/evas \
590-I$(top_srcdir)/src/lib/evas/include \ 556-I$(top_srcdir)/src/lib/evas/include \
591-I$(top_srcdir)/src/lib/evas/cserve2 \ 557-I$(top_srcdir)/src/lib/evas/cserve2 \
592-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 558-I$(top_srcdir)/src/modules/evas/engines/gl_common \
593@evas_engine_gl_cocoa_cflags@ \ 559@EVAS_CFLAGS@ \
594@EVAS_CFLAGS@ 560@evas_engine_gl_cocoa_cflags@
595modules_evas_engines_gl_cocoa_module_la_LIBADD = 561modules_evas_engines_gl_cocoa_module_la_LIBADD =
596if ! EVAS_STATIC_BUILD_GL_COMMON 562if ! EVAS_STATIC_BUILD_GL_COMMON
597modules_evas_engines_gl_cocoa_module_la_LIBADD += \ 563modules_evas_engines_gl_cocoa_module_la_LIBADD += \
598modules/evas/engines/gl_common/libevas_engine_gl_common.la 564modules/evas/engines/gl_common/libevas_engine_gl_common.la
599endif 565endif
600modules_evas_engines_gl_cocoa_module_la_LIBADD += \ 566modules_evas_engines_gl_cocoa_module_la_LIBADD += \
601lib/eet/libeet.la \ 567@USE_EVAS_LIBS@ \
602lib/evas/libevas.la \
603@evas_engine_gl_cocoa_libs@ 568@evas_engine_gl_cocoa_libs@
569modules_evas_engines_gl_cocoa_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
604modules_evas_engines_gl_cocoa_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 570modules_evas_engines_gl_cocoa_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
605modules_evas_engines_gl_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static 571modules_evas_engines_gl_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static
606endif 572endif
@@ -616,31 +582,28 @@ lib_evas_libevas_la_SOURCES += $(GL_SDL_SOURCES)
616lib_evas_libevas_la_CPPFLAGS += \ 582lib_evas_libevas_la_CPPFLAGS += \
617-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 583-I$(top_srcdir)/src/modules/evas/engines/gl_common \
618@evas_engine_gl_sdl_cflags@ 584@evas_engine_gl_sdl_cflags@
619lib_evas_libevas_la_LIBADD += \ 585lib_evas_libevas_la_LIBADD += @evas_engine_gl_sdl_libs@
620@evas_engine_gl_sdl_libs@
621else 586else
622engineglsdlpkgdir = $(libdir)/evas/modules/engines/gl_sdl/$(MODULE_ARCH) 587engineglsdlpkgdir = $(libdir)/evas/modules/engines/gl_sdl/$(MODULE_ARCH)
623engineglsdlpkg_LTLIBRARIES = modules/evas/engines/gl_sdl/module.la 588engineglsdlpkg_LTLIBRARIES = modules/evas/engines/gl_sdl/module.la
624modules_evas_engines_gl_sdl_module_la_SOURCES = $(GL_SDL_SOURCES) 589modules_evas_engines_gl_sdl_module_la_SOURCES = $(GL_SDL_SOURCES)
625modules_evas_engines_gl_sdl_module_la_CPPFLAGS = \ 590modules_evas_engines_gl_sdl_module_la_CPPFLAGS = \
626-I$(top_srcdir)/src/lib/eina \
627-I$(top_builddir)/src/lib/eina \
628-I$(top_srcdir)/src/lib/eo \
629-I$(top_srcdir)/src/lib/eet \
630-I$(top_srcdir)/src/lib/evas \
631-I$(top_srcdir)/src/lib/evas/include \ 591-I$(top_srcdir)/src/lib/evas/include \
632-I$(top_srcdir)/src/lib/evas/cserve2 \ 592-I$(top_srcdir)/src/lib/evas/cserve2 \
633-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 593-I$(top_srcdir)/src/modules/evas/engines/gl_common \
634@evas_engine_gl_sdl_cflags@ \ 594@EVAS_CFLAGS@ \
635@EVAS_CFLAGS@ 595@evas_engine_gl_sdl_cflags@
636modules_evas_engines_gl_sdl_module_la_LIBADD = 596modules_evas_engines_gl_sdl_module_la_LIBADD =
637if ! EVAS_STATIC_BUILD_GL_COMMON 597if ! EVAS_STATIC_BUILD_GL_COMMON
638modules_evas_engines_gl_sdl_module_la_LIBADD += \ 598modules_evas_engines_gl_sdl_module_la_LIBADD += \
639modules/evas/engines/gl_common/libevas_engine_gl_common.la 599modules/evas/engines/gl_common/libevas_engine_gl_common.la
640endif 600endif
641modules_evas_engines_gl_sdl_module_la_LIBADD += \ 601modules_evas_engines_gl_sdl_module_la_LIBADD += \
642lib/evas/libevas.la \ 602@USE_EVAS_LIBS@ \
643@evas_engine_gl_sdl_libs@ 603@evas_engine_gl_sdl_libs@
604modules_evas_engines_gl_sdl_module_la_DEPENDENCIES = \
605@USE_EVAS_INTERNAL_LIBS@ \
606modules/evas/engines/gl_common/libevas_engine_gl_common.la
644modules_evas_engines_gl_sdl_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 607modules_evas_engines_gl_sdl_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
645modules_evas_engines_gl_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static 608modules_evas_engines_gl_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static
646endif 609endif
@@ -664,27 +627,24 @@ engineglx11pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH)
664engineglx11pkg_LTLIBRARIES = modules/evas/engines/gl_x11/module.la 627engineglx11pkg_LTLIBRARIES = modules/evas/engines/gl_x11/module.la
665modules_evas_engines_gl_x11_module_la_SOURCES = $(GL_X11_SOURCES) 628modules_evas_engines_gl_x11_module_la_SOURCES = $(GL_X11_SOURCES)
666modules_evas_engines_gl_x11_module_la_CPPFLAGS = \ 629modules_evas_engines_gl_x11_module_la_CPPFLAGS = \
667-I$(top_srcdir)/src/lib/eina \
668-I$(top_builddir)/src/lib/eina \
669-I$(top_srcdir)/src/lib/eo \
670-I$(top_srcdir)/src/lib/eet \
671-I$(top_srcdir)/src/lib/evas \
672-I$(top_srcdir)/src/lib/evas/include \ 630-I$(top_srcdir)/src/lib/evas/include \
673-I$(top_srcdir)/src/lib/evas/cserve2 \ 631-I$(top_srcdir)/src/lib/evas/cserve2 \
674-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 632-I$(top_srcdir)/src/modules/evas/engines/gl_common \
633@EVAS_CFLAGS@ \
675@evas_engine_gl_xlib_cflags@ \ 634@evas_engine_gl_xlib_cflags@ \
676@evas_engine_gl_xcb_cflags@ \ 635@evas_engine_gl_xcb_cflags@
677@EVAS_CFLAGS@
678modules_evas_engines_gl_x11_module_la_LIBADD = 636modules_evas_engines_gl_x11_module_la_LIBADD =
679if ! EVAS_STATIC_BUILD_GL_COMMON 637if ! EVAS_STATIC_BUILD_GL_COMMON
680modules_evas_engines_gl_x11_module_la_LIBADD += \ 638modules_evas_engines_gl_x11_module_la_LIBADD += \
681modules/evas/engines/gl_common/libevas_engine_gl_common.la 639modules/evas/engines/gl_common/libevas_engine_gl_common.la
682endif 640endif
683modules_evas_engines_gl_x11_module_la_LIBADD += \ 641modules_evas_engines_gl_x11_module_la_LIBADD += \
684lib/eet/libeet.la \ 642@USE_EVAS_LIBS@ \
685lib/evas/libevas.la \
686@evas_engine_gl_xlib_libs@ \ 643@evas_engine_gl_xlib_libs@ \
687@evas_engine_gl_xcb_libs@ 644@evas_engine_gl_xcb_libs@
645modules_evas_engines_gl_x11_module_la_DEPENDENCIES = \
646@USE_EVAS_INTERNAL_LIBS@ \
647modules/evas/engines/gl_common/libevas_engine_gl_common.la
688modules_evas_engines_gl_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 648modules_evas_engines_gl_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
689modules_evas_engines_gl_x11_module_la_LIBTOOLFLAGS = --tag=disable-static 649modules_evas_engines_gl_x11_module_la_LIBTOOLFLAGS = --tag=disable-static
690endif 650endif
@@ -706,17 +666,14 @@ enginepsl1ghtpkgdir = $(libdir)/evas/modules/engines/psl1ght/$(MODULE_ARCH)
706enginepsl1ghtpkg_LTLIBRARIES = modules/evas/engines/psl1ght/module.la 666enginepsl1ghtpkg_LTLIBRARIES = modules/evas/engines/psl1ght/module.la
707modules_evas_engines_psl1ght_module_la_SOURCES = $(PSL1GHT_SOURCES) 667modules_evas_engines_psl1ght_module_la_SOURCES = $(PSL1GHT_SOURCES)
708modules_evas_engines_psl1ght_module_la_CPPFLAGS = \ 668modules_evas_engines_psl1ght_module_la_CPPFLAGS = \
709-I$(top_srcdir)/src/lib/eina \
710-I$(top_builddir)/src/lib/eina \
711-I$(top_srcdir)/src/lib/eo \
712-I$(top_srcdir)/src/lib/evas \
713-I$(top_srcdir)/src/lib/evas/include \ 669-I$(top_srcdir)/src/lib/evas/include \
714-I$(top_srcdir)/src/lib/evas/cserve2 \ 670-I$(top_srcdir)/src/lib/evas/cserve2 \
715@evas_engine_psl1ght_cflags@ \ 671@EVAS_CFLAGS@ \
716@EVAS_CFLAGS@ 672@evas_engine_psl1ght_cflags@
717modules_evas_engines_psl1ght_module_la_LIBADD = \ 673modules_evas_engines_psl1ght_module_la_LIBADD = \
718lib/evas/libevas.la \ 674@USE_EVAS_LIBS@ \
719@evas_engine_psl1ght_libs@ 675@evas_engine_psl1ght_libs@
676modules_evas_engines_psl1ght_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
720modules_evas_engines_psl1ght_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 677modules_evas_engines_psl1ght_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
721modules_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static 678modules_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static
722endif 679endif
@@ -740,20 +697,15 @@ enginesoftwareddrawpkgdir = $(libdir)/evas/modules/engines/software_ddraw/$(MODU
740enginesoftwareddrawpkg_LTLIBRARIES = modules/evas/engines/software_ddraw/module.la 697enginesoftwareddrawpkg_LTLIBRARIES = modules/evas/engines/software_ddraw/module.la
741modules_evas_engines_software_ddraw_module_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES) 698modules_evas_engines_software_ddraw_module_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES)
742modules_evas_engines_software_ddraw_module_la_CPPFLAGS = \ 699modules_evas_engines_software_ddraw_module_la_CPPFLAGS = \
743-I$(top_srcdir)/src/lib/eina \
744-I$(top_builddir)/src/lib/eina \
745-I$(top_srcdir)/src/lib/eo \
746-I$(top_srcdir)/src/lib/evas \
747-I$(top_srcdir)/src/lib/evas/include \ 700-I$(top_srcdir)/src/lib/evas/include \
748-I$(top_srcdir)/src/lib/evas/cserve2 \ 701-I$(top_srcdir)/src/lib/evas/cserve2 \
749-DEFL_EVAS_BUILD \
750@evas_engine_software_ddraw_cflags@ \
751@EVAS_CFLAGS@ \ 702@EVAS_CFLAGS@ \
752@USE_EVIL_CFLAGS@ 703@evas_engine_software_ddraw_cflags@
753modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions 704modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions
754modules_evas_engines_software_ddraw_module_la_LIBADD = \ 705modules_evas_engines_software_ddraw_module_la_LIBADD = \
755lib/evas/libevas.la \ 706@USE_EVAS_LIBS@ \
756@evas_engine_software_ddraw_libs@ 707@evas_engine_software_ddraw_libs@
708modules_evas_engines_software_ddraw_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
757modules_evas_engines_software_ddraw_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 709modules_evas_engines_software_ddraw_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
758modules_evas_engines_software_ddraw_module_la_LIBTOOLFLAGS = --tag=disable-static 710modules_evas_engines_software_ddraw_module_la_LIBTOOLFLAGS = --tag=disable-static
759endif 711endif
@@ -776,19 +728,14 @@ enginesoftwaregdipkgdir = $(libdir)/evas/modules/engines/software_gdi/$(MODULE_A
776enginesoftwaregdipkg_LTLIBRARIES = modules/evas/engines/software_gdi/module.la 728enginesoftwaregdipkg_LTLIBRARIES = modules/evas/engines/software_gdi/module.la
777modules_evas_engines_software_gdi_module_la_SOURCES = $(SOFTWARE_GDI_SOURCES) 729modules_evas_engines_software_gdi_module_la_SOURCES = $(SOFTWARE_GDI_SOURCES)
778modules_evas_engines_software_gdi_module_la_CPPFLAGS = \ 730modules_evas_engines_software_gdi_module_la_CPPFLAGS = \
779-I$(top_srcdir)/src/lib/eina \
780-I$(top_builddir)/src/lib/eina \
781-I$(top_srcdir)/src/lib/eo \
782-I$(top_srcdir)/src/lib/evas \
783-I$(top_srcdir)/src/lib/evas/include \ 731-I$(top_srcdir)/src/lib/evas/include \
784-I$(top_srcdir)/src/lib/evas/cserve2 \ 732-I$(top_srcdir)/src/lib/evas/cserve2 \
785-DEFL_EVAS_BUILD \
786@evas_engine_software_gdi_cflags@ \
787@EVAS_CFLAGS@ \ 733@EVAS_CFLAGS@ \
788@USE_EVIL_CFLAGS@ 734@evas_engine_software_gdi_cflags@
789modules_evas_engines_software_gdi_module_la_LIBADD = \ 735modules_evas_engines_software_gdi_module_la_LIBADD = \
790lib/evas/libevas.la \ 736@USE_EVAS_LIBS@ \
791@evas_engine_software_gdi_libs@ 737@evas_engine_software_gdi_libs@
738modules_evas_engines_software_gdi_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
792modules_evas_engines_software_gdi_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 739modules_evas_engines_software_gdi_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
793modules_evas_engines_software_gdi_module_la_LIBTOOLFLAGS = --tag=disable-static 740modules_evas_engines_software_gdi_module_la_LIBTOOLFLAGS = --tag=disable-static
794endif 741endif
@@ -802,10 +749,6 @@ modules/evas/engines/software_x11/evas_engine.h \
802modules/evas/engines/software_x11/evas_x_egl.c \ 749modules/evas/engines/software_x11/evas_x_egl.c \
803modules/evas/engines/software_x11/evas_x_egl.h 750modules/evas/engines/software_x11/evas_x_egl.h
804SOFTWARE_X11_CPPFLAGS = \ 751SOFTWARE_X11_CPPFLAGS = \
805-I$(top_srcdir)/src/lib/eina \
806-I$(top_builddir)/src/lib/eina \
807-I$(top_srcdir)/src/lib/eo \
808-I$(top_srcdir)/src/lib/evas \
809-I$(top_srcdir)/src/lib/evas/include \ 752-I$(top_srcdir)/src/lib/evas/include \
810-I$(top_srcdir)/src/lib/evas/cserve2 \ 753-I$(top_srcdir)/src/lib/evas/cserve2 \
811@EVAS_CFLAGS@ 754@EVAS_CFLAGS@
@@ -849,7 +792,8 @@ enginesoftwarex11pkgdir = $(libdir)/evas/modules/engines/software_x11/$(MODULE_A
849enginesoftwarex11pkg_LTLIBRARIES = modules/evas/engines/software_x11/module.la 792enginesoftwarex11pkg_LTLIBRARIES = modules/evas/engines/software_x11/module.la
850modules_evas_engines_software_x11_module_la_SOURCES = $(SOFTWARE_X11_SOURCES) 793modules_evas_engines_software_x11_module_la_SOURCES = $(SOFTWARE_X11_SOURCES)
851modules_evas_engines_software_x11_module_la_CPPFLAGS = $(SOFTWARE_X11_CPPFLAGS) 794modules_evas_engines_software_x11_module_la_CPPFLAGS = $(SOFTWARE_X11_CPPFLAGS)
852modules_evas_engines_software_x11_module_la_LIBADD = lib/evas/libevas.la $(SOFTWARE_X11_LIBADD) 795modules_evas_engines_software_x11_module_la_LIBADD = @USE_EVAS_LIBS@ $(SOFTWARE_X11_LIBADD)
796modules_evas_engines_software_x11_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
853modules_evas_engines_software_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 797modules_evas_engines_software_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
854modules_evas_engines_software_x11_module_la_LIBTOOLFLAGS = --tag=disable-static 798modules_evas_engines_software_x11_module_la_LIBTOOLFLAGS = --tag=disable-static
855endif 799endif
@@ -872,21 +816,18 @@ enginewaylandeglpkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARC
872enginewaylandeglpkg_LTLIBRARIES = modules/evas/engines/wayland_egl/module.la 816enginewaylandeglpkg_LTLIBRARIES = modules/evas/engines/wayland_egl/module.la
873modules_evas_engines_wayland_egl_module_la_SOURCES = $(WAYLAND_EGL_SOURCES) 817modules_evas_engines_wayland_egl_module_la_SOURCES = $(WAYLAND_EGL_SOURCES)
874modules_evas_engines_wayland_egl_module_la_CPPFLAGS = \ 818modules_evas_engines_wayland_egl_module_la_CPPFLAGS = \
875-I$(top_srcdir)/src/lib/eina \
876-I$(top_builddir)/src/lib/eina \
877-I$(top_srcdir)/src/lib/eo \
878-I$(top_srcdir)/src/lib/eet \
879-I$(top_srcdir)/src/lib/evas \
880-I$(top_srcdir)/src/lib/evas/include \ 819-I$(top_srcdir)/src/lib/evas/include \
881-I$(top_srcdir)/src/lib/evas/cserve2 \ 820-I$(top_srcdir)/src/lib/evas/cserve2 \
882-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 821-I$(top_srcdir)/src/modules/evas/engines/gl_common \
883@evas_engine_wayland_egl_cflags@ \ 822@EVAS_CFLAGS@ \
884@EVAS_CFLAGS@ 823@evas_engine_wayland_egl_cflags@
885modules_evas_engines_wayland_egl_module_la_LIBADD = \ 824modules_evas_engines_wayland_egl_module_la_LIBADD = \
825@USE_EVAS_LIBS@ \
886modules/evas/engines/gl_common/libevas_engine_gl_common.la \ 826modules/evas/engines/gl_common/libevas_engine_gl_common.la \
887lib/eet/libeet.la \
888lib/evas/libevas.la \
889@evas_engine_wayland_egl_libs@ 827@evas_engine_wayland_egl_libs@
828modules_evas_engines_wayland_egl_module_la_DEPENDENCIES = \
829@USE_EVAS_INTERNAL_LIBS@ \
830modules/evas/engines/gl_common/libevas_engine_gl_common.la
890modules_evas_engines_wayland_egl_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 831modules_evas_engines_wayland_egl_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
891modules_evas_engines_wayland_egl_module_la_LIBTOOLFLAGS = --tag=disable-static 832modules_evas_engines_wayland_egl_module_la_LIBTOOLFLAGS = --tag=disable-static
892endif 833endif
@@ -907,17 +848,14 @@ enginewaylandshmpkgdir = $(libdir)/evas/modules/engines/wayland_shm/$(MODULE_ARC
907enginewaylandshmpkg_LTLIBRARIES = modules/evas/engines/wayland_shm/module.la 848enginewaylandshmpkg_LTLIBRARIES = modules/evas/engines/wayland_shm/module.la
908modules_evas_engines_wayland_shm_module_la_SOURCES = $(WAYLAND_SHM_SOURCES) 849modules_evas_engines_wayland_shm_module_la_SOURCES = $(WAYLAND_SHM_SOURCES)
909modules_evas_engines_wayland_shm_module_la_CPPFLAGS = \ 850modules_evas_engines_wayland_shm_module_la_CPPFLAGS = \
910-I$(top_srcdir)/src/lib/eina \
911-I$(top_builddir)/src/lib/eina \
912-I$(top_srcdir)/src/lib/eo \
913-I$(top_srcdir)/src/lib/evas \
914-I$(top_srcdir)/src/lib/evas/include \ 851-I$(top_srcdir)/src/lib/evas/include \
915-I$(top_srcdir)/src/lib/evas/cserve2 \ 852-I$(top_srcdir)/src/lib/evas/cserve2 \
916@evas_engine_wayland_shm_cflags@ \ 853@EVAS_CFLAGS@ \
917@EVAS_CFLAGS@ 854@evas_engine_wayland_shm_cflags@
918modules_evas_engines_wayland_shm_module_la_LIBADD = \ 855modules_evas_engines_wayland_shm_module_la_LIBADD = \
919lib/evas/libevas.la \ 856@USE_EVAS_LIBS@ \
920@evas_engine_wayland_shm_libs@ 857@evas_engine_wayland_shm_libs@
858modules_evas_engines_wayland_shm_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
921modules_evas_engines_wayland_shm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 859modules_evas_engines_wayland_shm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
922modules_evas_engines_wayland_shm_module_la_LIBTOOLFLAGS = --tag=disable-static 860modules_evas_engines_wayland_shm_module_la_LIBTOOLFLAGS = --tag=disable-static
923endif 861endif
@@ -935,17 +873,13 @@ loaderbmppkgdir = $(libdir)/evas/modules/loaders/bmp/$(MODULE_ARCH)
935loaderbmppkg_LTLIBRARIES = modules/evas/loaders/bmp/module.la 873loaderbmppkg_LTLIBRARIES = modules/evas/loaders/bmp/module.la
936modules_evas_loaders_bmp_module_la_SOURCES = modules/evas/loaders/bmp/evas_image_load_bmp.c 874modules_evas_loaders_bmp_module_la_SOURCES = modules/evas/loaders/bmp/evas_image_load_bmp.c
937modules_evas_loaders_bmp_module_la_CPPFLAGS = \ 875modules_evas_loaders_bmp_module_la_CPPFLAGS = \
938-I$(top_srcdir)/src/lib/eina \
939-I$(top_builddir)/src/lib/eina \
940-I$(top_srcdir)/src/lib/eo \
941-I$(top_srcdir)/src/lib/evas \
942-I$(top_srcdir)/src/lib/evas/include \ 876-I$(top_srcdir)/src/lib/evas/include \
943-DEFL_EVAS_BUILD \ 877@EVAS_CFLAGS@ \
944@evas_image_loader_bmp_cflags@ \ 878@evas_image_loader_bmp_cflags@
945@EVAS_CFLAGS@
946modules_evas_loaders_bmp_module_la_LIBADD = \ 879modules_evas_loaders_bmp_module_la_LIBADD = \
947lib/evas/libevas.la \ 880@USE_EVAS_LIBS@ \
948@evas_image_loader_bmp_libs@ 881@evas_image_loader_bmp_libs@
882modules_evas_loaders_bmp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
949modules_evas_loaders_bmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 883modules_evas_loaders_bmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
950modules_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static 884modules_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static
951endif 885endif
@@ -961,19 +895,13 @@ loadereetpkgdir = $(libdir)/evas/modules/loaders/eet/$(MODULE_ARCH)
961loadereetpkg_LTLIBRARIES = modules/evas/loaders/eet/module.la 895loadereetpkg_LTLIBRARIES = modules/evas/loaders/eet/module.la
962modules_evas_loaders_eet_module_la_SOURCES = modules/evas/loaders/eet/evas_image_load_eet.c 896modules_evas_loaders_eet_module_la_SOURCES = modules/evas/loaders/eet/evas_image_load_eet.c
963modules_evas_loaders_eet_module_la_CPPFLAGS = \ 897modules_evas_loaders_eet_module_la_CPPFLAGS = \
964-I$(top_srcdir)/src/lib/eina \
965-I$(top_builddir)/src/lib/eina \
966-I$(top_srcdir)/src/lib/eo \
967-I$(top_srcdir)/src/lib/eet \
968-I$(top_srcdir)/src/lib/evas \
969-I$(top_srcdir)/src/lib/evas/include \ 898-I$(top_srcdir)/src/lib/evas/include \
970-DEFL_EVAS_BUILD \ 899@EVAS_CFLAGS@ \
971@evas_image_loader_eet_cflags@ \ 900@evas_image_loader_eet_cflags@
972@EVAS_CFLAGS@
973modules_evas_loaders_eet_module_la_LIBADD = \ 901modules_evas_loaders_eet_module_la_LIBADD = \
974lib/evas/libevas.la \ 902@USE_EVAS_LIBS@ \
975lib/evas/libeet.la \
976@evas_image_loader_eet_libs@ 903@evas_image_loader_eet_libs@
904modules_evas_loaders_eet_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
977modules_evas_loaders_eet_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 905modules_evas_loaders_eet_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
978modules_evas_loaders_eet_module_la_LIBTOOLFLAGS = --tag=disable-static 906modules_evas_loaders_eet_module_la_LIBTOOLFLAGS = --tag=disable-static
979endif 907endif
@@ -989,17 +917,13 @@ loadergenericpkgdir = $(libdir)/evas/modules/loaders/generic/$(MODULE_ARCH)
989loadergenericpkg_LTLIBRARIES = modules/evas/loaders/generic/module.la 917loadergenericpkg_LTLIBRARIES = modules/evas/loaders/generic/module.la
990modules_evas_loaders_generic_module_la_SOURCES = modules/evas/loaders/generic/evas_image_load_generic.c 918modules_evas_loaders_generic_module_la_SOURCES = modules/evas/loaders/generic/evas_image_load_generic.c
991modules_evas_loaders_generic_module_la_CPPFLAGS = \ 919modules_evas_loaders_generic_module_la_CPPFLAGS = \
992-I$(top_srcdir)/src/lib/eina \
993-I$(top_builddir)/src/lib/eina \
994-I$(top_srcdir)/src/lib/eo \
995-I$(top_srcdir)/src/lib/evas \
996-I$(top_srcdir)/src/lib/evas/include \ 920-I$(top_srcdir)/src/lib/evas/include \
997-DEFL_EVAS_BUILD \ 921@EVAS_CFLAGS@ \
998@evas_image_loader_generic_cflags@ \ 922@evas_image_loader_generic_cflags@
999@EVAS_CFLAGS@
1000modules_evas_loaders_generic_module_la_LIBADD = \ 923modules_evas_loaders_generic_module_la_LIBADD = \
1001lib/evas/libevas.la \ 924@USE_EVAS_LIBS@ \
1002@evas_image_loader_generic_libs@ 925@evas_image_loader_generic_libs@
926modules_evas_loaders_generic_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
1003modules_evas_loaders_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 927modules_evas_loaders_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
1004modules_evas_loaders_generic_module_la_LIBTOOLFLAGS = --tag=disable-static 928modules_evas_loaders_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
1005endif 929endif
@@ -1015,17 +939,13 @@ loadergifpkgdir = $(libdir)/evas/modules/loaders/gif/$(MODULE_ARCH)
1015loadergifpkg_LTLIBRARIES = modules/evas/loaders/gif/module.la 939loadergifpkg_LTLIBRARIES = modules/evas/loaders/gif/module.la
1016modules_evas_loaders_gif_module_la_SOURCES = modules/evas/loaders/gif/evas_image_load_gif.c 940modules_evas_loaders_gif_module_la_SOURCES = modules/evas/loaders/gif/evas_image_load_gif.c
1017modules_evas_loaders_gif_module_la_CPPFLAGS = \ 941modules_evas_loaders_gif_module_la_CPPFLAGS = \
1018-I$(top_srcdir)/src/lib/eina \
1019-I$(top_builddir)/src/lib/eina \
1020-I$(top_srcdir)/src/lib/eo \
1021-I$(top_srcdir)/src/lib/evas \
1022-I$(top_srcdir)/src/lib/evas/include \ 942-I$(top_srcdir)/src/lib/evas/include \
1023-DEFL_EVAS_BUILD \ 943@EVAS_CFLAGS@ \
1024@evas_image_loader_gif_cflags@ \ 944@evas_image_loader_gif_cflags@
1025@EVAS_CFLAGS@
1026modules_evas_loaders_gif_module_la_LIBADD = \ 945modules_evas_loaders_gif_module_la_LIBADD = \
1027lib/evas/libevas.la \ 946@USE_EVAS_LIBS@ \
1028@evas_image_loader_gif_libs@ 947@evas_image_loader_gif_libs@
948modules_evas_loaders_gif_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
1029modules_evas_loaders_gif_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 949modules_evas_loaders_gif_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
1030modules_evas_loaders_gif_module_la_LIBTOOLFLAGS = --tag=disable-static 950modules_evas_loaders_gif_module_la_LIBTOOLFLAGS = --tag=disable-static
1031endif 951endif
@@ -1041,17 +961,13 @@ loadericopkgdir = $(libdir)/evas/modules/loaders/ico/$(MODULE_ARCH)
1041loadericopkg_LTLIBRARIES = modules/evas/loaders/ico/module.la 961loadericopkg_LTLIBRARIES = modules/evas/loaders/ico/module.la
1042modules_evas_loaders_ico_module_la_SOURCES = modules/evas/loaders/ico/evas_image_load_ico.c 962modules_evas_loaders_ico_module_la_SOURCES = modules/evas/loaders/ico/evas_image_load_ico.c
1043modules_evas_loaders_ico_module_la_CPPFLAGS = \ 963modules_evas_loaders_ico_module_la_CPPFLAGS = \
1044-I$(top_srcdir)/src/lib/eina \
1045-I$(top_builddir)/src/lib/eina \
1046-I$(top_srcdir)/src/lib/eo \
1047-I$(top_srcdir)/src/lib/evas \
1048-I$(top_srcdir)/src/lib/evas/include \ 964-I$(top_srcdir)/src/lib/evas/include \
1049-DEFL_EVAS_BUILD \ 965@EVAS_CFLAGS@ \
1050@evas_image_loader_ico_cflags@ \ 966@evas_image_loader_ico_cflags@
1051@EVAS_CFLAGS@
1052modules_evas_loaders_ico_module_la_LIBADD = \ 967modules_evas_loaders_ico_module_la_LIBADD = \
1053lib/evas/libevas.la \ 968@USE_EVAS_LIBS@ \
1054@evas_image_loader_ico_libs@ 969@evas_image_loader_ico_libs@
970modules_evas_loaders_ico_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
1055modules_evas_loaders_ico_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 971modules_evas_loaders_ico_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
1056modules_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static 972modules_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static
1057endif 973endif
@@ -1070,17 +986,13 @@ loaderjpegpkgdir = $(libdir)/evas/modules/loaders/jpeg/$(MODULE_ARCH)
1070loaderjpegpkg_LTLIBRARIES = modules/evas/loaders/jpeg/module.la 986loaderjpegpkg_LTLIBRARIES = modules/evas/loaders/jpeg/module.la
1071modules_evas_loaders_jpeg_module_la_SOURCES = modules/evas/loaders/jpeg/evas_image_load_jpeg.c 987modules_evas_loaders_jpeg_module_la_SOURCES = modules/evas/loaders/jpeg/evas_image_load_jpeg.c
1072modules_evas_loaders_jpeg_module_la_CPPFLAGS = \ 988modules_evas_loaders_jpeg_module_la_CPPFLAGS = \
1073-I$(top_srcdir)/src/lib/eina \
1074-I$(top_builddir)/src/lib/eina \
1075-I$(top_srcdir)/src/lib/eo \
1076-I$(top_srcdir)/src/lib/evas \
1077-I$(top_srcdir)/src/lib/evas/include \ 989-I$(top_srcdir)/src/lib/evas/include \
1078-DEFL_EVAS_BUILD \ 990@EVAS_CFLAGS@ \
1079@evas_image_loader_jpeg_cflags@ \ 991@evas_image_loader_jpeg_cflags@
1080@EVAS_CFLAGS@
1081modules_evas_loaders_jpeg_module_la_LIBADD = \ 992modules_evas_loaders_jpeg_module_la_LIBADD = \
1082lib/evas/libevas.la \ 993@USE_EVAS_LIBS@ \
1083@evas_image_loader_jpeg_libs@ 994@evas_image_loader_jpeg_libs@
995modules_evas_loaders_jpeg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
1084modules_evas_loaders_jpeg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 996modules_evas_loaders_jpeg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
1085modules_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static 997modules_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static
1086if BUILD_SAVER_JPEG 998if BUILD_SAVER_JPEG
@@ -1088,16 +1000,13 @@ saverjpegpkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH)
1088saverjpegpkg_LTLIBRARIES = modules/evas/savers/jpeg/module.la 1000saverjpegpkg_LTLIBRARIES = modules/evas/savers/jpeg/module.la
1089modules_evas_savers_jpeg_module_la_SOURCES = modules/evas/savers/jpeg/evas_image_save_jpeg.c 1001modules_evas_savers_jpeg_module_la_SOURCES = modules/evas/savers/jpeg/evas_image_save_jpeg.c
1090modules_evas_savers_jpeg_module_la_CPPFLAGS = \ 1002modules_evas_savers_jpeg_module_la_CPPFLAGS = \
1091-I$(top_srcdir)/src/lib/eina \
1092-I$(top_builddir)/src/lib/eina \
1093-I$(top_srcdir)/src/lib/eo \
1094-I$(top_srcdir)/src/lib/evas \
1095-I$(top_srcdir)/src/lib/evas/include \ 1003-I$(top_srcdir)/src/lib/evas/include \
1096@evas_image_loader_jpeg_cflags@ \ 1004@EVAS_CFLAGS@ \
1097