kikadf
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Allow to define path for eldbus-codegen binary 

Since the geolocation and music-control changes we need eldbus-codegen to
generate some files. Not all setups have this in their normal $PATH so let
allow these setups to set the correct path during configure. This allows our
Jenkins setup as well as others to work again.
This commit is contained in:
Stefan Schmidt 2015-04-08 18:20:29 +02:00
parent a5012da244
commit 20fef454f6
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -910,6 +910,8 @@ define([CHECK_MODULE_WL_DRM],
])
AM_CONDITIONAL([HAVE_WL_DRM], [test "x${WL_DRM}" = "xtrue"])
EFL_WITH_BIN([eldbus], [eldbus_codegen], [eldbus-codegen])
AC_E_OPTIONAL_MODULE([ibar], true)
AC_E_OPTIONAL_MODULE([clock], true)
AC_E_OPTIONAL_MODULE([pager], true)
@ -1116,6 +1118,7 @@ Summary:
* prefix..........: $(txt_strip $prefix)
* CFLAGS..........: $(txt_strip $CFLAGS)
* LDFLAGS.........: $(txt_strip $LDFLAGS)
* eldbus_codegen..: ${eldbus_codegen}
SUMMARY_EOF
if test "$have_systemd_user_session" = "yes"; then

2
src/modules/Makefile_geolocation.mk
View File

@ -24,7 +24,7 @@ MAINTAINERCLEANFILES += $(GEO_GEN)
src/modules/geolocation/e_mod_main.c: $(GEO_GEN)
$(GEO_GEN): src/modules/geolocation/org.freedesktop.GeoClue2.xml
@cd $(top_builddir)/src/modules/geolocation && \
eldbus-codegen $(abs_top_srcdir)/src/modules/geolocation/org.freedesktop.GeoClue2.xml
@eldbus_codegen@ $(abs_top_srcdir)/src/modules/geolocation/org.freedesktop.GeoClue2.xml
src_modules_geolocation_module_la_LIBADD = $(MOD_LIBS)
src_modules_geolocation_module_la_CPPFLAGS = -I$(top_builddir)/src/modules/geolocation $(MOD_CPPFLAGS)

2
src/modules/Makefile_music_control.mk
View File

@ -18,7 +18,7 @@ MAINTAINERCLEANFILES += $(MUSIC_GEN)
src/modules/music-control/e_mod_main.c: $(MUSIC_GEN)
$(MUSIC_GEN): src/modules/music-control/introspect.xml
@cd $(top_builddir)/src/modules/music-control && \
eldbus-codegen $(abs_top_srcdir)/src/modules/music-control/introspect.xml
@eldbus_codegen@ $(abs_top_srcdir)/src/modules/music-control/introspect.xml
music_controlpkgdir = $(MDIR)/music-control/$(MODULE_ARCH)
music_controlpkg_LTLIBRARIES = src/modules/music-control/module.la