aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Efreet.am
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-07-05 17:26:42 -0400
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2018-07-06 15:51:59 +0200
commit36fc0ce77ee61c3ebb2529a0f05fcdf0b6986725 (patch)
treedbfb6603249738549c6eee10bb739b8fb61fd443 /src/Makefile_Efreet.am
parentecore-con/proxy_helper: fix in-tree run path (diff)
downloadefl-36fc0ce77ee61c3ebb2529a0f05fcdf0b6986725.tar.gz
efreet: simplify and fix efreetd launch
this previously used an entire eina prefix to determine where to find efreetd, when a simpler approach would have been to just pass the directory where it's being installed this also inhibited running the correct efreetd during in-tree builds and tests, as it was using the install prefix instead of the in-tree wrapper script @fix fix https://phab.enlightenment.org/T6713 Differential Revision: https://phab.enlightenment.org/D6516
Diffstat (limited to 'src/Makefile_Efreet.am')
-rw-r--r--src/Makefile_Efreet.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am
index f955cec33e..8912919892 100644
--- a/src/Makefile_Efreet.am
+++ b/src/Makefile_Efreet.am
@@ -11,6 +11,7 @@ EFREET_COMMON_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/efreet\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
-DDATA_DIR=\"$(datadir)\" \
-DLOCALE_DIR=\"@LOCALE_DIR@\" \
@EFREET_CFLAGS@
@@ -43,7 +44,9 @@ lib/efreet/efreet_uri.c \
lib/efreet/efreet_cache.c \
lib/efreet/efreet_private.h \
lib/efreet/efreet_xml.h \
-lib/efreet/efreet_cache_private.h
+lib/efreet/efreet_cache_private.h \
+static_libs/buildsystem/buildsystem.h \
+static_libs/buildsystem/buildsystem_autotools.c
lib_efreet_libefreet_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
lib_efreet_libefreet_la_LIBADD = @EFREET_LIBS@ @EVIL_LIBS@